packages/dbus/dbus-glib_0.74.bb : add updated version from poky, remove

older version
This will fix networkmanager

diff --git a/packages/dbus/dbus-glib-0.72/cross.patch b/packages/dbus/dbus-glib-0.72/cross.patch
deleted file mode 100644 (file)
index b3f41c8..0000000
--- 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/.mtn2git_empty b/packages/dbus/dbus-glib-0.74/.mtn2git_empty
similarity index 100%
rename from packages/dbus/dbus-glib-0.72/.mtn2git_empty
rename to packages/dbus/dbus-glib-0.74/.mtn2git_empty

diff --git a/packages/dbus/dbus-glib/no-examples.patch b/packages/dbus/dbus-glib-0.74/no-examples.patch
similarity index 100%
rename from packages/dbus/dbus-glib/no-examples.patch
rename to packages/dbus/dbus-glib-0.74/no-examples.patch

diff --git a/packages/dbus/dbus-glib-0.72/no-introspect.patch b/packages/dbus/dbus-glib-0.74/no-introspect.patch
similarity index 52%
rename from packages/dbus/dbus-glib-0.72/no-introspect.patch
rename to packages/dbus/dbus-glib-0.74/no-introspect.patch
index 607f0ac..9115801 100644 (file)
--- a/packages/dbus/dbus-glib-0.72/no-introspect.patch
+++ b/packages/dbus/dbus-glib-0.74/no-introspect.patch
@@ -1,8 +1,8 @@
-Index: dbus-glib-0.72/tools/Makefile.am
+Index: dbus-glib-0.73/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 @@
+--- 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
  
@@ -11,9 +11,4 @@ Index: dbus-glib-0.72/tools/Makefile.am
 -
  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 =                          \
+ if USE_INTROSPECT_XML

diff --git a/packages/dbus/dbus-glib-native-0.72/.mtn2git_empty b/packages/dbus/dbus-glib-native-0.74/.mtn2git_empty
similarity index 100%
rename from packages/dbus/dbus-glib-native-0.72/.mtn2git_empty
rename to packages/dbus/dbus-glib-native-0.74/.mtn2git_empty

diff --git a/packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch b/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch
similarity index 100%
rename from packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch
rename to packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch

diff --git a/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb
deleted file mode 100644 (file)
index 1f5d71d..0000000
--- 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.74.bb
similarity index 87%
rename from packages/dbus/dbus-glib-native_0.72.bb
rename to packages/dbus/dbus-glib-native_0.74.bb
index 90ecc4e..d76cc04 100644 (file)
--- a/packages/dbus/dbus-glib-native_0.72.bb
+++ b/packages/dbus/dbus-glib-native_0.74.bb
@@ -1,11 +1,10 @@
 SECTION = "base"
-PR = "r1"
+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://cross.patch;patch=1 \
           file://run-with-tmp-session-bus.patch;patch=1"
 
 inherit autotools pkgconfig gettext native
@@ -19,5 +18,4 @@ do_stage() {
         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/.mtn2git_empty b/packages/dbus/dbus-glib/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/dbus/dbus-glib/cross.patch b/packages/dbus/dbus-glib/cross.patch
deleted file mode 100644 (file)
index 6d1d9d8..0000000
--- 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-introspect.patch b/packages/dbus/dbus-glib/no-introspect.patch
deleted file mode 100644 (file)
index 7057a63..0000000
--- 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 (file)
index 26bc851..0000000
--- 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.74.bb
similarity index 96%
rename from packages/dbus/dbus-glib_0.72.bb
rename to packages/dbus/dbus-glib_0.74.bb
index 641f026..3754abb 100644 (file)
--- a/packages/dbus/dbus-glib_0.72.bb
+++ b/packages/dbus/dbus-glib_0.74.bb
@@ -6,7 +6,6 @@ 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"