diff options
Diffstat (limited to 'meta/recipes-core/dbus/dbus-glib-0.98')
3 files changed, 0 insertions, 83 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib-0.98/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.98/no-examples.patch deleted file mode 100644 index fbb4967828..0000000000 --- a/meta/recipes-core/dbus/dbus-glib-0.98/no-examples.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Disable compiling examples | ||
2 | |||
3 | Upstream-Status: Inappropriate [disable feature] | ||
4 | |||
5 | Signed-off-by: Kevin Tian <kevin.tian@intel.com> | ||
6 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
7 | |||
8 | --- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 | ||
9 | +++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 | ||
10 | @@ -1,4 +1,4 @@ | ||
11 | -SUBDIRS = . examples | ||
12 | +SUBDIRS = . | ||
13 | |||
14 | INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" | ||
15 | |||
diff --git a/meta/recipes-core/dbus/dbus-glib-0.98/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib-0.98/test-install-makefile.patch deleted file mode 100644 index 2e8e178bb7..0000000000 --- a/meta/recipes-core/dbus/dbus-glib-0.98/test-install-makefile.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | Change Makefile.am to install regression tests for test package purpose. | ||
2 | |||
3 | Upstream-Status: Inappropriate [test not install is for purpose from upstream] | ||
4 | |||
5 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
6 | |||
7 | diff --git a/test/Makefile.am b/test/Makefile.am | ||
8 | index 7ba11a8..249f0e7 100644 | ||
9 | --- a/test/Makefile.am | ||
10 | +++ b/test/Makefile.am | ||
11 | @@ -13,7 +13,8 @@ else | ||
12 | TEST_BINARIES= | ||
13 | endif | ||
14 | |||
15 | -noinst_PROGRAMS= $(TEST_BINARIES) | ||
16 | +testdir = $(datadir)/@PACKAGE@/tests | ||
17 | +test_PROGRAMS= $(TEST_BINARIES) | ||
18 | |||
19 | test_service_SOURCES= \ | ||
20 | test-service.c | ||
21 | diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am | ||
22 | index 3cb2c39..e6de67d 100644 | ||
23 | --- a/test/interfaces/Makefile.am | ||
24 | +++ b/test/interfaces/Makefile.am | ||
25 | @@ -39,7 +39,8 @@ if DBUS_BUILD_TESTS | ||
26 | |||
27 | ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we | ||
28 | ## build even when not doing "make check" | ||
29 | -noinst_PROGRAMS = test-service test-client | ||
30 | +testdir = $(datadir)/@PACKAGE@/tests/interfaces | ||
31 | +test_PROGRAMS = test-service test-client | ||
32 | |||
33 | test_service_SOURCES = \ | ||
34 | test-interfaces.c \ | ||
35 | diff --git a/test/core/Makefile.am b/test/core/Makefile.am | ||
36 | index ef6cb26..9786c3a 100644 | ||
37 | --- a/test/core/Makefile.am | ||
38 | +++ b/test/core/Makefile.am | ||
39 | @@ -46,7 +46,8 @@ endif | ||
40 | |||
41 | ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we | ||
42 | ## build even when not doing "make check" | ||
43 | -noinst_PROGRAMS = \ | ||
44 | +testdir = $(datadir)/@PACKAGE@/tests/core | ||
45 | +test_PROGRAMS = \ | ||
46 | test-dbus-glib \ | ||
47 | test-service-glib \ | ||
48 | $(THREAD_APPS) \ | ||
diff --git a/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch deleted file mode 100644 index 27780e71da..0000000000 --- a/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Fix the compiling error that not include glib.h directly. | ||
2 | |||
3 | upstream bugzilla link: https://bugs.freedesktop.org/show_bug.cgi?id=52210 | ||
4 | Upstream-Status: Submitted | ||
5 | |||
6 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
7 | |||
8 | diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c | ||
9 | index 3355890..7291f35 100644 | ||
10 | --- a/test/core/test-service-glib.c | ||
11 | +++ b/test/core/test-service-glib.c | ||
12 | @@ -11,7 +11,7 @@ | ||
13 | #include <string.h> | ||
14 | #include <glib/gi18n.h> | ||
15 | #include <glib-object.h> | ||
16 | -#include <glib/gquark.h> | ||
17 | +#include <glib.h> | ||
18 | |||
19 | #include "my-object.h" | ||
20 | #include "my-object-subclass.h" | ||