From 16cbf4ea61c3c1c4b8bd384e27e2bc14cd98c512 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sun, 30 Sep 2007 21:03:23 +0000 Subject: packages/dbus/dbus-glib_0.74.bb : add updated version from poky, remove older version This will fix networkmanager --- packages/dbus/dbus-glib-0.72/.mtn2git_empty | 0 packages/dbus/dbus-glib-0.72/cross.patch | 12 --------- packages/dbus/dbus-glib-0.72/no-introspect.patch | 19 -------------- packages/dbus/dbus-glib-0.74/.mtn2git_empty | 0 packages/dbus/dbus-glib-0.74/no-examples.patch | 8 ++++++ packages/dbus/dbus-glib-0.74/no-introspect.patch | 14 +++++++++++ packages/dbus/dbus-glib-native-0.72/.mtn2git_empty | 0 .../run-with-tmp-session-bus.patch | 23 ----------------- packages/dbus/dbus-glib-native-0.74/.mtn2git_empty | 0 .../run-with-tmp-session-bus.patch | 23 +++++++++++++++++ packages/dbus/dbus-glib-native_0.71.bb | 22 ---------------- packages/dbus/dbus-glib-native_0.72.bb | 23 ----------------- packages/dbus/dbus-glib-native_0.74.bb | 21 ++++++++++++++++ packages/dbus/dbus-glib/.mtn2git_empty | 0 packages/dbus/dbus-glib/cross.patch | 15 ----------- packages/dbus/dbus-glib/no-examples.patch | 8 ------ packages/dbus/dbus-glib/no-introspect.patch | 17 ------------- packages/dbus/dbus-glib_0.71.bb | 29 ---------------------- packages/dbus/dbus-glib_0.72.bb | 29 ---------------------- packages/dbus/dbus-glib_0.74.bb | 28 +++++++++++++++++++++ 20 files changed, 94 insertions(+), 197 deletions(-) delete mode 100644 packages/dbus/dbus-glib-0.72/.mtn2git_empty delete mode 100644 packages/dbus/dbus-glib-0.72/cross.patch delete mode 100644 packages/dbus/dbus-glib-0.72/no-introspect.patch create mode 100644 packages/dbus/dbus-glib-0.74/.mtn2git_empty create mode 100644 packages/dbus/dbus-glib-0.74/no-examples.patch create mode 100644 packages/dbus/dbus-glib-0.74/no-introspect.patch delete mode 100644 packages/dbus/dbus-glib-native-0.72/.mtn2git_empty delete mode 100644 packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch create mode 100644 packages/dbus/dbus-glib-native-0.74/.mtn2git_empty create mode 100644 packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch delete mode 100644 packages/dbus/dbus-glib-native_0.71.bb delete mode 100644 packages/dbus/dbus-glib-native_0.72.bb create mode 100644 packages/dbus/dbus-glib-native_0.74.bb delete mode 100644 packages/dbus/dbus-glib/.mtn2git_empty delete mode 100644 packages/dbus/dbus-glib/cross.patch delete mode 100644 packages/dbus/dbus-glib/no-examples.patch delete mode 100644 packages/dbus/dbus-glib/no-introspect.patch delete mode 100644 packages/dbus/dbus-glib_0.71.bb delete mode 100644 packages/dbus/dbus-glib_0.72.bb create mode 100644 packages/dbus/dbus-glib_0.74.bb diff --git a/packages/dbus/dbus-glib-0.72/.mtn2git_empty b/packages/dbus/dbus-glib-0.72/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/dbus/dbus-glib-0.72/cross.patch b/packages/dbus/dbus-glib-0.72/cross.patch deleted file mode 100644 index b3f41c8507..0000000000 --- a/packages/dbus/dbus-glib-0.72/cross.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: dbus-glib-0.72/configure.ac -=================================================================== ---- dbus-glib-0.72.orig/configure.ac 2006-10-27 10:05:05.000000000 +0200 -+++ dbus-glib-0.72/configure.ac 2006-10-27 10:05:48.000000000 +0200 -@@ -571,6 +571,7 @@ - exit (0); - ]])], - [have_abstract_sockets=yes], -+ [have_abstract_sockets=no], - [have_abstract_sockets=no]) - AC_LANG_POP(C) - AC_MSG_RESULT($have_abstract_sockets) diff --git a/packages/dbus/dbus-glib-0.72/no-introspect.patch b/packages/dbus/dbus-glib-0.72/no-introspect.patch deleted file mode 100644 index 607f0acc9c..0000000000 --- a/packages/dbus/dbus-glib-0.72/no-introspect.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: dbus-glib-0.72/tools/Makefile.am -=================================================================== ---- dbus-glib-0.72.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200 -+++ dbus-glib-0.72/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200 -@@ -3,14 +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 -- - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - --dbus-bus-introspect.xml: -- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml -- - EXTRA_DIST = run-with-tmp-session-bus.sh session.conf - - CLEANFILES = \ diff --git a/packages/dbus/dbus-glib-0.74/.mtn2git_empty b/packages/dbus/dbus-glib-0.74/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbus/dbus-glib-0.74/no-examples.patch b/packages/dbus/dbus-glib-0.74/no-examples.patch new file mode 100644 index 0000000000..483153db74 --- /dev/null +++ b/packages/dbus/dbus-glib-0.74/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/packages/dbus/dbus-glib-0.74/no-introspect.patch b/packages/dbus/dbus-glib-0.74/no-introspect.patch new file mode 100644 index 0000000000..9115801f71 --- /dev/null +++ b/packages/dbus/dbus-glib-0.74/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/packages/dbus/dbus-glib-native-0.72/.mtn2git_empty b/packages/dbus/dbus-glib-native-0.72/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch b/packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch deleted file mode 100644 index ba117d0309..0000000000 --- a/packages/dbus/dbus-glib-native-0.72/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/packages/dbus/dbus-glib-native-0.74/.mtn2git_empty b/packages/dbus/dbus-glib-native-0.74/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch b/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch new file mode 100644 index 0000000000..ba117d0309 --- /dev/null +++ b/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch @@ -0,0 +1,23 @@ +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/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb deleted file mode 100644 index 1f5d71da91..0000000000 --- a/packages/dbus/dbus-glib-native_0.71.bb +++ /dev/null @@ -1,22 +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://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ - file://cross.patch;patch=1 \ - 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" -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/packages/dbus/dbus-glib-native_0.72.bb b/packages/dbus/dbus-glib-native_0.72.bb deleted file mode 100644 index 90ecc4e9fe..0000000000 --- a/packages/dbus/dbus-glib-native_0.72.bb +++ /dev/null @@ -1,23 +0,0 @@ -SECTION = "base" -PR = "r1" -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://cross.patch;patch=1 \ - 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 - install -m 0755 dbus/.libs/dbus-binding-tool ${STAGING_BINDIR}/ -} diff --git a/packages/dbus/dbus-glib-native_0.74.bb b/packages/dbus/dbus-glib-native_0.74.bb new file mode 100644 index 0000000000..d76cc043d4 --- /dev/null +++ b/packages/dbus/dbus-glib-native_0.74.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/packages/dbus/dbus-glib/.mtn2git_empty b/packages/dbus/dbus-glib/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/dbus/dbus-glib/cross.patch b/packages/dbus/dbus-glib/cross.patch deleted file mode 100644 index 6d1d9d8e7e..0000000000 --- a/packages/dbus/dbus-glib/cross.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- dbus-0.20/configure.in~cross -+++ dbus-0.20/configure.in -@@ -466,6 +466,7 @@ - exit (0); - ]])], - [have_abstract_sockets=yes], -+ [have_abstract_sockets=no], - [have_abstract_sockets=no]) - AC_LANG_POP(C) - AC_MSG_RESULT($have_abstract_sockets) diff --git a/packages/dbus/dbus-glib/no-examples.patch b/packages/dbus/dbus-glib/no-examples.patch deleted file mode 100644 index 483153db74..0000000000 --- a/packages/dbus/dbus-glib/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/packages/dbus/dbus-glib/no-introspect.patch b/packages/dbus/dbus-glib/no-introspect.patch deleted file mode 100644 index 7057a63020..0000000000 --- a/packages/dbus/dbus-glib/no-introspect.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- dbus-glib-0.70/tools/Makefile.am.orig 2006-07-23 15:53:06.000000000 +0200 -+++ dbus-glib-0.70/tools/Makefile.am 2006-07-23 15:53:53.000000000 +0200 -@@ -3,14 +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 --output=dbus-glib-bindings.h dbus-bus-introspect.xml -- - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - --dbus-bus-introspect.xml: -- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml -- - EXTRA_DIST = run-with-tmp-session-bus.sh - - CLEANFILES = \ diff --git a/packages/dbus/dbus-glib_0.71.bb b/packages/dbus/dbus-glib_0.71.bb deleted file mode 100644 index 26bc851098..0000000000 --- a/packages/dbus/dbus-glib_0.71.bb +++ /dev/null @@ -1,29 +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://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ - file://cross.patch;patch=1 \ - 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_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/ - install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/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/packages/dbus/dbus-glib_0.72.bb b/packages/dbus/dbus-glib_0.72.bb deleted file mode 100644 index 641f0263a2..0000000000 --- a/packages/dbus/dbus-glib_0.72.bb +++ /dev/null @@ -1,29 +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://cross.patch;patch=1 \ - 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_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/ - install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/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/packages/dbus/dbus-glib_0.74.bb b/packages/dbus/dbus-glib_0.74.bb new file mode 100644 index 0000000000..3754abb708 --- /dev/null +++ b/packages/dbus/dbus-glib_0.74.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_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/ + install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/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