diff options
author | Andrei Dinu <andrei.adrianx.dinu@intel.com> | 2013-02-26 14:25:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-28 23:15:46 +0000 |
commit | 146bff9f23e7a9fca31f32cc490fc00493d415bd (patch) | |
tree | 0a7569cd4299540c94ff361ff84bbde6e63ae890 /meta/recipes-core/dbus/dbus-glib-0.100.2 | |
parent | a810e45a2363647727f7186723c6ccd8024d77ff (diff) | |
download | poky-146bff9f23e7a9fca31f32cc490fc00493d415bd.tar.gz |
dbus-glib : upgrade to 1.100.2
(From OE-Core rev: eb43cd15cc0ceffd6b7fa14919646007d6ba99c2)
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus/dbus-glib-0.100.2')
3 files changed, 78 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch new file mode 100644 index 0000000000..fbb4967828 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch | |||
@@ -0,0 +1,15 @@ | |||
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.100.2/obsolete_automake_macros.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch new file mode 100644 index 0000000000..40e3b12b5d --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59003] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd dbus-glib-0.100/configure.ac dbus-glib-0.100/configure.ac | ||
5 | --- dbus-glib-0.100/configure.ac 2012-06-25 19:26:39.000000000 +0300 | ||
6 | +++ dbus-glib-0.100/configure.ac 2013-01-03 04:53:22.314976758 +0200 | ||
7 | @@ -8,7 +8,7 @@ | ||
8 | |||
9 | AM_INIT_AUTOMAKE([1.9]) | ||
10 | |||
11 | -AM_CONFIG_HEADER(config.h) | ||
12 | +AC_CONFIG_HEADERS(config.h) | ||
13 | |||
14 | # Honor aclocal flags | ||
15 | ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" | ||
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch new file mode 100644 index 0000000000..2e8e178bb7 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch | |||
@@ -0,0 +1,48 @@ | |||
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) \ | ||