From 41acb50c3bed5f040d309e04be528af899cb42ab Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Sun, 11 Jul 2010 16:02:56 +0800 Subject: dbud-glib: upgrade to 0.86 [dbus-glib-Ptches] REMOVE _run-with-tmp-session-bus.patch_: test is not built by default DISABLE _fix_asneeded.patch_: not sure why we need change expat link order. Disable it but keep for a while KEEP _no-examples.patch_: don't build examples [dbus-glib-recipe] - remove native and old recipes - remove tweak on dbus-glib-bindings.h, since it will be generated correctly after passing correct config options linking to native dbus-binding-tool and dbus-bus-introspect.xml - remove preferred versions in poky-fixed-revisions.inc with similar reason as dbus Signed-off-by: Kevin Tian --- meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch | 17 +++++++++++++++++ meta/packages/dbus/dbus-glib-0.86/no-examples.patch | 12 ++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch create mode 100644 meta/packages/dbus/dbus-glib-0.86/no-examples.patch (limited to 'meta/packages/dbus/dbus-glib-0.86') diff --git a/meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch new file mode 100644 index 000000000..306555768 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.86/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/packages/dbus/dbus-glib-0.86/no-examples.patch b/meta/packages/dbus/dbus-glib-0.86/no-examples.patch new file mode 100644 index 000000000..32609b9b9 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.86/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\" + -- cgit v1.2.3