From 1805dbd8496df246385f42f1edfde8abf763dc17 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 11 Dec 2009 09:33:21 +0000 Subject: dbus-glib: 0.78 -> 0.82 Signed-off-by: Richard Purdie --- .../dbus/dbus-glib-0.78/fix_asneeded.patch | 13 ------------ .../dbus/dbus-glib-0.78/native-binding-tool.patch | 19 ----------------- .../packages/dbus/dbus-glib-0.78/no-examples.patch | 8 -------- .../dbus-glib-0.78/run-with-tmp-session-bus.patch | 24 ---------------------- .../dbus/dbus-glib-0.82/fix_asneeded.patch | 13 ++++++++++++ .../packages/dbus/dbus-glib-0.82/no-examples.patch | 8 ++++++++ .../dbus-glib-0.82/run-with-tmp-session-bus.patch | 24 ++++++++++++++++++++++ meta/packages/dbus/dbus-glib-native_0.78.bb | 13 ------------ meta/packages/dbus/dbus-glib-native_0.82.bb | 13 ++++++++++++ meta/packages/dbus/dbus-glib_0.78.bb | 9 -------- meta/packages/dbus/dbus-glib_0.82.bb | 9 ++++++++ 11 files changed, 67 insertions(+), 86 deletions(-) delete mode 100644 meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch delete mode 100644 meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch delete mode 100644 meta/packages/dbus/dbus-glib-0.78/no-examples.patch delete mode 100644 meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch create mode 100644 meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch create mode 100644 meta/packages/dbus/dbus-glib-0.82/no-examples.patch create mode 100644 meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch delete mode 100644 meta/packages/dbus/dbus-glib-native_0.78.bb create mode 100644 meta/packages/dbus/dbus-glib-native_0.82.bb delete mode 100644 meta/packages/dbus/dbus-glib_0.78.bb create mode 100644 meta/packages/dbus/dbus-glib_0.82.bb (limited to 'meta/packages') diff --git a/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch deleted file mode 100644 index a0aaec372..000000000 --- a/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: dbus-glib-0.78/dbus/Makefile.am -=================================================================== ---- dbus-glib-0.78.orig/dbus/Makefile.am 2009-01-15 15:14:29.000000000 +0000 -+++ dbus-glib-0.78/dbus/Makefile.am 2009-01-15 15:14:46.000000000 +0000 -@@ -104,7 +104,7 @@ - - dbus_bash_completion_helper_SOURCES = \ - dbus-bash-completion-helper.c --dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la -+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la 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.78/native-binding-tool.patch b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch deleted file mode 100644 index 1bdac5a39..000000000 --- a/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch +++ /dev/null @@ -1,19 +0,0 @@ -Use the dbus-binding-tool from PATH, not the generated one. - -RP - 12/1/09 - -Index: dbus-glib-0.76/tools/Makefile.am -=================================================================== ---- dbus-glib-0.76.orig/tools/Makefile.am 2009-01-12 10:11:02.000000000 +0000 -+++ dbus-glib-0.76/tools/Makefile.am 2009-01-12 10:12:01.000000000 +0000 -@@ -3,8 +3,8 @@ - nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h - libdbus_glibdir = $(includedir)/dbus-1.0/dbus - --dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) -- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml -+dbus-glib-bindings.h: dbus-bus-introspect.xml -+ dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml - - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - diff --git a/meta/packages/dbus/dbus-glib-0.78/no-examples.patch b/meta/packages/dbus/dbus-glib-0.78/no-examples.patch deleted file mode 100644 index 483153db7..000000000 --- a/meta/packages/dbus/dbus-glib-0.78/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.78/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch deleted file mode 100644 index a04f404f7..000000000 --- a/meta/packages/dbus/dbus-glib-0.78/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/.*$/'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ - sed -e 's/ $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 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/.*$/'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ + sed -e 's/ $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 diff --git a/meta/packages/dbus/dbus-glib-native_0.78.bb b/meta/packages/dbus/dbus-glib-native_0.78.bb deleted file mode 100644 index 8395fced0..000000000 --- a/meta/packages/dbus/dbus-glib-native_0.78.bb +++ /dev/null @@ -1,13 +0,0 @@ -require dbus-glib.inc -inherit native - -DEPENDS = "glib-2.0-native dbus-native" - -PR = "r0" - -SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1" - -do_install_append() { - install -d ${D}${datadir}/dbus - install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus -} diff --git a/meta/packages/dbus/dbus-glib-native_0.82.bb b/meta/packages/dbus/dbus-glib-native_0.82.bb new file mode 100644 index 000000000..8395fced0 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-native_0.82.bb @@ -0,0 +1,13 @@ +require dbus-glib.inc +inherit native + +DEPENDS = "glib-2.0-native dbus-native" + +PR = "r0" + +SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1" + +do_install_append() { + install -d ${D}${datadir}/dbus + install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus +} diff --git a/meta/packages/dbus/dbus-glib_0.78.bb b/meta/packages/dbus/dbus-glib_0.78.bb deleted file mode 100644 index f7a176055..000000000 --- a/meta/packages/dbus/dbus-glib_0.78.bb +++ /dev/null @@ -1,9 +0,0 @@ -require dbus-glib.inc - -PR = "r0" - -do_configure_prepend() { - cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ -} - -SRC_URI += "file://native-binding-tool.patch;patch=1" diff --git a/meta/packages/dbus/dbus-glib_0.82.bb b/meta/packages/dbus/dbus-glib_0.82.bb new file mode 100644 index 000000000..f54023684 --- /dev/null +++ b/meta/packages/dbus/dbus-glib_0.82.bb @@ -0,0 +1,9 @@ +require dbus-glib.inc + +PR = "r0" + +do_configure_prepend() { + cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ +} + +EXTRA_OECONF += "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" -- cgit v1.2.3