diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-12-11 09:33:21 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-12-11 09:33:21 +0000 |
| commit | 1805dbd8496df246385f42f1edfde8abf763dc17 (patch) | |
| tree | 534d2203e1861a336aa484671becf65e9f06e1a5 /meta/packages/dbus/dbus-glib-0.82 | |
| parent | 12691f24e578323d9d6903db3989b343cb59a899 (diff) | |
| download | openembedded-core-1805dbd8496df246385f42f1edfde8abf763dc17.tar.gz openembedded-core-1805dbd8496df246385f42f1edfde8abf763dc17.tar.bz2 openembedded-core-1805dbd8496df246385f42f1edfde8abf763dc17.tar.xz openembedded-core-1805dbd8496df246385f42f1edfde8abf763dc17.zip | |
dbus-glib: 0.78 -> 0.82
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/dbus/dbus-glib-0.82')
3 files changed, 45 insertions, 0 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 new file mode 100644 index 000000000..eba4375db --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..483153db7 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.82/no-examples.patch @@ -0,0 +1,8 @@ +--- 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 new file mode 100644 index 000000000..a04f404f7 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch @@ -0,0 +1,24 @@ +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 |