summaryrefslogtreecommitdiffstats
path: root/meta/packages/dbus/dbus-glib-0.86
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-11 16:02:56 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-13 15:21:45 +0100
commit41acb50c3bed5f040d309e04be528af899cb42ab (patch)
tree770d6aa86df35e224b570bf082ef174433f1216d /meta/packages/dbus/dbus-glib-0.86
parent67eeb71308e8307a99d12417dfb0fe8f016814da (diff)
downloadpoky-41acb50c3bed5f040d309e04be528af899cb42ab.tar.gz
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 <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/dbus/dbus-glib-0.86')
-rw-r--r--meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch17
-rw-r--r--meta/packages/dbus/dbus-glib-0.86/no-examples.patch12
2 files changed, 29 insertions, 0 deletions
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 0000000000..3065557683
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch
@@ -0,0 +1,17 @@
1# not sure the reason for changing link order. Disable it for now, but keep for a while
2#
3# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
4
5Index: dbus-glib-0.82/dbus/Makefile.am
6===================================================================
7--- dbus-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100
8+++ dbus-glib-0.82/dbus/Makefile.am 2009-12-11 09:27:20.000000000 +0000
9@@ -105,7 +105,7 @@
10
11 dbus_bash_completion_helper_SOURCES = \
12 dbus-bash-completion-helper.c
13-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la
14+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la -lexpat
15
16
17 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 0000000000..32609b9b9c
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.86/no-examples.patch
@@ -0,0 +1,12 @@
1# disable compiling examples
2#
3# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
4
5--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
6+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
7@@ -1,4 +1,4 @@
8-SUBDIRS = . examples
9+SUBDIRS = .
10
11 INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
12