From a851da82c8d641472cff755874cc329bc730e017 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Thu, 23 Aug 2012 14:45:02 +0300 Subject: dbus-glib: upgrade to 0.100 test-service-glib-include-glib-only.patch: removed - no more compiling errors --- .../dbus/dbus-glib-0.100/no-examples.patch | 15 +++++++ .../dbus-glib-0.100/test-install-makefile.patch | 48 ++++++++++++++++++++++ .../dbus/dbus-glib-0.98/no-examples.patch | 15 ------- .../dbus-glib-0.98/test-install-makefile.patch | 48 ---------------------- .../test-service-glib-include-glib-only.patch | 20 --------- meta/recipes-core/dbus/dbus-glib.inc | 1 - meta/recipes-core/dbus/dbus-glib_0.100.bb | 6 +++ meta/recipes-core/dbus/dbus-glib_0.98.bb | 6 --- 8 files changed, 69 insertions(+), 90 deletions(-) create mode 100644 meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch create mode 100644 meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch delete mode 100644 meta/recipes-core/dbus/dbus-glib-0.98/no-examples.patch delete mode 100644 meta/recipes-core/dbus/dbus-glib-0.98/test-install-makefile.patch delete mode 100644 meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch create mode 100644 meta/recipes-core/dbus/dbus-glib_0.100.bb delete mode 100644 meta/recipes-core/dbus/dbus-glib_0.98.bb (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch new file mode 100644 index 0000000000..fbb4967828 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch @@ -0,0 +1,15 @@ +Disable compiling examples + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Kevin Tian +Signed-off-by: Scott Garman + +--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 ++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = . examples ++SUBDIRS = . + + INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" + diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch new file mode 100644 index 0000000000..2e8e178bb7 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch @@ -0,0 +1,48 @@ +Change Makefile.am to install regression tests for test package purpose. + +Upstream-Status: Inappropriate [test not install is for purpose from upstream] + +Signed-off-by: Yao Zhao + +diff --git a/test/Makefile.am b/test/Makefile.am +index 7ba11a8..249f0e7 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -13,7 +13,8 @@ else + TEST_BINARIES= + endif + +-noinst_PROGRAMS= $(TEST_BINARIES) ++testdir = $(datadir)/@PACKAGE@/tests ++test_PROGRAMS= $(TEST_BINARIES) + + test_service_SOURCES= \ + test-service.c +diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am +index 3cb2c39..e6de67d 100644 +--- a/test/interfaces/Makefile.am ++++ b/test/interfaces/Makefile.am +@@ -39,7 +39,8 @@ if DBUS_BUILD_TESTS + + ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we + ## build even when not doing "make check" +-noinst_PROGRAMS = test-service test-client ++testdir = $(datadir)/@PACKAGE@/tests/interfaces ++test_PROGRAMS = test-service test-client + + test_service_SOURCES = \ + test-interfaces.c \ +diff --git a/test/core/Makefile.am b/test/core/Makefile.am +index ef6cb26..9786c3a 100644 +--- a/test/core/Makefile.am ++++ b/test/core/Makefile.am +@@ -46,7 +46,8 @@ endif + + ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we + ## build even when not doing "make check" +-noinst_PROGRAMS = \ ++testdir = $(datadir)/@PACKAGE@/tests/core ++test_PROGRAMS = \ + test-dbus-glib \ + test-service-glib \ + $(THREAD_APPS) \ 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 @@ -Disable compiling examples - -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Kevin Tian -Signed-off-by: Scott Garman - ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = . examples -+SUBDIRS = . - - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" - 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 @@ -Change Makefile.am to install regression tests for test package purpose. - -Upstream-Status: Inappropriate [test not install is for purpose from upstream] - -Signed-off-by: Yao Zhao - -diff --git a/test/Makefile.am b/test/Makefile.am -index 7ba11a8..249f0e7 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -13,7 +13,8 @@ else - TEST_BINARIES= - endif - --noinst_PROGRAMS= $(TEST_BINARIES) -+testdir = $(datadir)/@PACKAGE@/tests -+test_PROGRAMS= $(TEST_BINARIES) - - test_service_SOURCES= \ - test-service.c -diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am -index 3cb2c39..e6de67d 100644 ---- a/test/interfaces/Makefile.am -+++ b/test/interfaces/Makefile.am -@@ -39,7 +39,8 @@ if DBUS_BUILD_TESTS - - ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we - ## build even when not doing "make check" --noinst_PROGRAMS = test-service test-client -+testdir = $(datadir)/@PACKAGE@/tests/interfaces -+test_PROGRAMS = test-service test-client - - test_service_SOURCES = \ - test-interfaces.c \ -diff --git a/test/core/Makefile.am b/test/core/Makefile.am -index ef6cb26..9786c3a 100644 ---- a/test/core/Makefile.am -+++ b/test/core/Makefile.am -@@ -46,7 +46,8 @@ endif - - ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we - ## build even when not doing "make check" --noinst_PROGRAMS = \ -+testdir = $(datadir)/@PACKAGE@/tests/core -+test_PROGRAMS = \ - test-dbus-glib \ - test-service-glib \ - $(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 @@ -Fix the compiling error that not include glib.h directly. - -upstream bugzilla link: https://bugs.freedesktop.org/show_bug.cgi?id=52210 -Upstream-Status: Submitted - -Signed-off-by: Yao Zhao - -diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c -index 3355890..7291f35 100644 ---- a/test/core/test-service-glib.c -+++ b/test/core/test-service-glib.c -@@ -11,7 +11,7 @@ - #include - #include - #include --#include -+#include - - #include "my-object.h" - #include "my-object-subclass.h" diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index a8e6d420f7..3469a4f2b1 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -12,7 +12,6 @@ DEPENDS_virtclass-native = "glib-2.0-native dbus-native" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ file://no-examples.patch \ - file://test-service-glib-include-glib-only.patch \ file://test-install-makefile.patch \ " diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.bb b/meta/recipes-core/dbus/dbus-glib_0.100.bb new file mode 100644 index 0000000000..f96d04e3cc --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib_0.100.bb @@ -0,0 +1,6 @@ +require dbus-glib.inc + +PR = "r0" + +SRC_URI[md5sum] = "d33959a9c0c6a158f5ac6d640316e89e" +SRC_URI[sha256sum] = "80ddf7584a659590103817798dd95d7e451d666f385e5e95a83abf85c46d4605" diff --git a/meta/recipes-core/dbus/dbus-glib_0.98.bb b/meta/recipes-core/dbus/dbus-glib_0.98.bb deleted file mode 100644 index e2c6a0ccf1..0000000000 --- a/meta/recipes-core/dbus/dbus-glib_0.98.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dbus-glib.inc - -PR = "r1" - -SRC_URI[md5sum] = "3f7f117dc7c8d899d9acfdcbf9253fb8" -SRC_URI[sha256sum] = "297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111" -- cgit 1.2.3-korg