summaryrefslogtreecommitdiff
path: root/meta/packages/dbus/dbus-glib-0.82
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.82
parent67eeb71308e8307a99d12417dfb0fe8f016814da (diff)
downloadopenembedded-core-41acb50c3bed5f040d309e04be528af899cb42ab.tar.gz
openembedded-core-41acb50c3bed5f040d309e04be528af899cb42ab.tar.bz2
openembedded-core-41acb50c3bed5f040d309e04be528af899cb42ab.tar.xz
openembedded-core-41acb50c3bed5f040d309e04be528af899cb42ab.zip
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.82')
-rw-r--r--meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch13
-rw-r--r--meta/packages/dbus/dbus-glib-0.82/no-examples.patch8
-rw-r--r--meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch24
3 files changed, 0 insertions, 45 deletions
diff --git a/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch
deleted file mode 100644
index eba4375db..000000000
--- a/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.82/no-examples.patch b/meta/packages/dbus/dbus-glib-0.82/no-examples.patch
deleted file mode 100644
index 483153db7..000000000
--- a/meta/packages/dbus/dbus-glib-0.82/no-examples.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch
deleted file mode 100644
index a04f404f7..000000000
--- a/meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
-===================================================================
---- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100
-+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100
-@@ -30,17 +30,15 @@
- echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
-
- ## create a configuration file based on the standard session.conf
--cat $DBUS_TOP_SRCDIR/tools/session.conf | \
-+cat $datadir/tools/session.conf | \
- sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
- sed -e 's/<include.*$//g' \
- > $CONFIG_FILE
-
- echo "Created configuration file $CONFIG_FILE" >&2
-
--PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
--export PATH
- ## the libtool script found by the path search should already do this, but
--LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
-+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
- export PATH
- unset DBUS_SESSION_BUS_ADDRESS
- unset DBUS_SESSION_BUS_PID