From 4d650a79c62ad0c84868ab4ba4a7361b7d2b530e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 13 Jun 2008 16:09:11 +0000 Subject: dbus-glib: upgrade to 0.76 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4644 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/include/poky-fixed-revisions.inc | 4 ++-- .../packages/dbus/dbus-glib-0.74/no-examples.patch | 8 ------- .../dbus/dbus-glib-0.74/no-introspect.patch | 14 ----------- .../packages/dbus/dbus-glib-0.76/no-examples.patch | 8 +++++++ .../dbus/dbus-glib-0.76/no-introspect.patch | 14 +++++++++++ .../run-with-tmp-session-bus.patch | 23 ------------------ .../run-with-tmp-session-bus.patch | 24 +++++++++++++++++++ meta/packages/dbus/dbus-glib-native_0.74.bb | 21 ---------------- meta/packages/dbus/dbus-glib-native_0.76.bb | 21 ++++++++++++++++ meta/packages/dbus/dbus-glib_0.74.bb | 28 ---------------------- meta/packages/dbus/dbus-glib_0.76.bb | 28 ++++++++++++++++++++++ 11 files changed, 97 insertions(+), 96 deletions(-) delete mode 100644 meta/packages/dbus/dbus-glib-0.74/no-examples.patch delete mode 100644 meta/packages/dbus/dbus-glib-0.74/no-introspect.patch create mode 100644 meta/packages/dbus/dbus-glib-0.76/no-examples.patch create mode 100644 meta/packages/dbus/dbus-glib-0.76/no-introspect.patch delete mode 100644 meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch create mode 100644 meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch delete mode 100644 meta/packages/dbus/dbus-glib-native_0.74.bb create mode 100644 meta/packages/dbus/dbus-glib-native_0.76.bb delete mode 100644 meta/packages/dbus/dbus-glib_0.74.bb create mode 100644 meta/packages/dbus/dbus-glib_0.76.bb diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 306e17f83..9a7eb0ac8 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -147,8 +147,8 @@ PREFERRED_VERSION_gtk+ ?= "2.12.7" PREFERRED_VERSION_dbus ?= "1.1.20" PREFERRED_VERSION_dbus-native ?= "1.1.20" -PREFERRED_VERSION_dbus-glib ?= "0.74" -PREFERRED_VERSION_dbus-glib-native ?= "0.74" +PREFERRED_VERSION_dbus-glib ?= "0.76" +PREFERRED_VERSION_dbus-glib-native ?= "0.76" PREFERRED_VERSION_gnome-vfs ?= "2.22.0" PREFERRED_VERSION_libgnomecanvas ?= "2.20.0" PREFERRED_VERSION_gnome-keyring ?= "2.20" diff --git a/meta/packages/dbus/dbus-glib-0.74/no-examples.patch b/meta/packages/dbus/dbus-glib-0.74/no-examples.patch deleted file mode 100644 index 483153db7..000000000 --- a/meta/packages/dbus/dbus-glib-0.74/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.74/no-introspect.patch b/meta/packages/dbus/dbus-glib-0.74/no-introspect.patch deleted file mode 100644 index 9115801f7..000000000 --- a/meta/packages/dbus/dbus-glib-0.74/no-introspect.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: dbus-glib-0.73/tools/Makefile.am -=================================================================== ---- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200 -+++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200 -@@ -3,9 +3,6 @@ - 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 -- - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - - if USE_INTROSPECT_XML diff --git a/meta/packages/dbus/dbus-glib-0.76/no-examples.patch b/meta/packages/dbus/dbus-glib-0.76/no-examples.patch new file mode 100644 index 000000000..483153db7 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.76/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.76/no-introspect.patch b/meta/packages/dbus/dbus-glib-0.76/no-introspect.patch new file mode 100644 index 000000000..9115801f7 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.76/no-introspect.patch @@ -0,0 +1,14 @@ +Index: dbus-glib-0.73/tools/Makefile.am +=================================================================== +--- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200 ++++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200 +@@ -3,9 +3,6 @@ + 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 +- + BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml + + if USE_INTROSPECT_XML diff --git a/meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch deleted file mode 100644 index ba117d030..000000000 --- a/meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: dbus-glib-0.72/tools/run-with-tmp-session-bus.sh -=================================================================== ---- dbus-glib-0.72.orig/tools/run-with-tmp-session-bus.sh 2006-09-27 14:27:25.000000000 +0200 -+++ dbus-glib-0.72/tools/run-with-tmp-session-bus.sh 2006-10-27 10:13:57.000000000 +0200 -@@ -30,16 +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/dbus/session.conf | \ - sed -e 's/.*$/'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ - sed -e 's/ $CONFIG_FILE - - echo "Created configuration file $CONFIG_FILE" >&2 - --export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH - ## the libtool script found by the path search should already do this, but --export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH -+export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH - - unset DBUS_SESSION_BUS_ADDRESS - unset DBUS_SESSION_BUS_PID diff --git a/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch new file mode 100644 index 000000000..a04f404f7 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-native-0.76/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.74.bb b/meta/packages/dbus/dbus-glib-native_0.74.bb deleted file mode 100644 index d76cc043d..000000000 --- a/meta/packages/dbus/dbus-glib-native_0.74.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "base" -PR = "r0" -HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -DESCRIPTION = "message bus system for applications to talk to one another" -LICENSE = "GPL" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ - file://run-with-tmp-session-bus.patch;patch=1" - -inherit autotools pkgconfig gettext native - -S = "${WORKDIR}/dbus-glib-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib-${PV}" -DEPENDS = "glib-2.0-native dbus-native" - -do_stage() { - oe_runmake install - install -d ${STAGING_DATADIR}/dbus - install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus - install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus -} diff --git a/meta/packages/dbus/dbus-glib-native_0.76.bb b/meta/packages/dbus/dbus-glib-native_0.76.bb new file mode 100644 index 000000000..d76cc043d --- /dev/null +++ b/meta/packages/dbus/dbus-glib-native_0.76.bb @@ -0,0 +1,21 @@ +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ + file://run-with-tmp-session-bus.patch;patch=1" + +inherit autotools pkgconfig gettext native + +S = "${WORKDIR}/dbus-glib-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib-${PV}" +DEPENDS = "glib-2.0-native dbus-native" + +do_stage() { + oe_runmake install + install -d ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus + install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus +} diff --git a/meta/packages/dbus/dbus-glib_0.74.bb b/meta/packages/dbus/dbus-glib_0.74.bb deleted file mode 100644 index 0a34c738c..000000000 --- a/meta/packages/dbus/dbus-glib_0.74.bb +++ /dev/null @@ -1,28 +0,0 @@ -SECTION = "base" -PR = "r0" -HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -DESCRIPTION = "message bus system for applications to talk to one another" -LICENSE = "GPL" -DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ - file://no-examples.patch;patch=1 \ - file://no-introspect.patch;patch=1" - -inherit autotools pkgconfig gettext - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" - -do_configure_prepend() { - install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ - install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ -} - -do_stage () { - oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR} - - autotools_stage_includes -} - -FILES_${PN}-dev += "${bindir}/dbus-binding-tool" diff --git a/meta/packages/dbus/dbus-glib_0.76.bb b/meta/packages/dbus/dbus-glib_0.76.bb new file mode 100644 index 000000000..0a34c738c --- /dev/null +++ b/meta/packages/dbus/dbus-glib_0.76.bb @@ -0,0 +1,28 @@ +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ + file://no-examples.patch;patch=1 \ + file://no-introspect.patch;patch=1" + +inherit autotools pkgconfig gettext + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" + +do_configure_prepend() { + install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ + install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ +} + +do_stage () { + oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR} + + autotools_stage_includes +} + +FILES_${PN}-dev += "${bindir}/dbus-binding-tool" -- cgit v1.2.3