From 7227aafcce68a372170e0fca68b3020387156c02 Mon Sep 17 00:00:00 2001 From: Qing He Date: Wed, 17 Nov 2010 12:37:14 +0800 Subject: dbus-glib: upgrade to version 0.88 from 0.86 Signed-off-by: Qing He --- .../recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch | 17 ----------------- meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch | 12 ------------ .../recipes-core/dbus/dbus-glib-0.88/fix_asneeded.patch | 17 +++++++++++++++++ meta/recipes-core/dbus/dbus-glib-0.88/no-examples.patch | 12 ++++++++++++ meta/recipes-core/dbus/dbus-glib_0.86.bb | 3 --- meta/recipes-core/dbus/dbus-glib_0.88.bb | 3 +++ 6 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch delete mode 100644 meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch create mode 100644 meta/recipes-core/dbus/dbus-glib-0.88/fix_asneeded.patch create mode 100644 meta/recipes-core/dbus/dbus-glib-0.88/no-examples.patch delete mode 100644 meta/recipes-core/dbus/dbus-glib_0.86.bb create mode 100644 meta/recipes-core/dbus/dbus-glib_0.88.bb (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch b/meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch deleted file mode 100644 index 306555768..000000000 --- a/meta/recipes-core/dbus/dbus-glib-0.86/fix_asneeded.patch +++ /dev/null @@ -1,17 +0,0 @@ -# not sure the reason for changing link order. Disable it for now, but keep for a while -# -# comment added by Kevin Tian , 2010-07-10 - -Index: dbus-glib-0.82/dbus/Makefile.am -=================================================================== ---- dbus-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100 -+++ dbus-glib-0.82/dbus/Makefile.am 2009-12-11 09:27:20.000000000 +0000 -@@ -105,7 +105,7 @@ - - dbus_bash_completion_helper_SOURCES = \ - dbus-bash-completion-helper.c --dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la -+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la -lexpat - - - EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in diff --git a/meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch deleted file mode 100644 index 32609b9b9..000000000 --- a/meta/recipes-core/dbus/dbus-glib-0.86/no-examples.patch +++ /dev/null @@ -1,12 +0,0 @@ -# disable compiling examples -# -# comment added by Kevin Tian , 2010-07-10 - ---- 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.88/fix_asneeded.patch b/meta/recipes-core/dbus/dbus-glib-0.88/fix_asneeded.patch new file mode 100644 index 000000000..306555768 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib-0.88/fix_asneeded.patch @@ -0,0 +1,17 @@ +# not sure the reason for changing link order. Disable it for now, but keep for a while +# +# comment added by Kevin Tian , 2010-07-10 + +Index: dbus-glib-0.82/dbus/Makefile.am +=================================================================== +--- dbus-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100 ++++ dbus-glib-0.82/dbus/Makefile.am 2009-12-11 09:27:20.000000000 +0000 +@@ -105,7 +105,7 @@ + + dbus_bash_completion_helper_SOURCES = \ + dbus-bash-completion-helper.c +-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la ++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la -lexpat + + + EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in diff --git a/meta/recipes-core/dbus/dbus-glib-0.88/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.88/no-examples.patch new file mode 100644 index 000000000..32609b9b9 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib-0.88/no-examples.patch @@ -0,0 +1,12 @@ +# disable compiling examples +# +# comment added by Kevin Tian , 2010-07-10 + +--- 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.86.bb b/meta/recipes-core/dbus/dbus-glib_0.86.bb deleted file mode 100644 index 000146ab7..000000000 --- a/meta/recipes-core/dbus/dbus-glib_0.86.bb +++ /dev/null @@ -1,3 +0,0 @@ -require dbus-glib.inc - -PR = "r0" diff --git a/meta/recipes-core/dbus/dbus-glib_0.88.bb b/meta/recipes-core/dbus/dbus-glib_0.88.bb new file mode 100644 index 000000000..000146ab7 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-glib_0.88.bb @@ -0,0 +1,3 @@ +require dbus-glib.inc + +PR = "r0" -- cgit v1.2.3