1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

dbud-glib: upgrade to 0.86

[dbus-glib-Ptches]
  REMOVE    _run-with-tmp-session-bus.patch_: test is not built by default
  DISABLE   _fix_asneeded.patch_: not sure why we need change expat link order. Disable it
                                  but keep for a while
  KEEP      _no-examples.patch_: don't build examples

[dbus-glib-recipe]
  - remove native and old recipes
  - remove tweak on dbus-glib-bindings.h, since it will be generated correctly after passing
    correct config options linking to native dbus-binding-tool and dbus-bus-introspect.xml
  - remove preferred versions in poky-fixed-revisions.inc with similar reason as dbus

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
This commit is contained in:
Kevin Tian
2010-07-11 16:02:56 +08:00
committed by Richard Purdie
parent 67eeb71308
commit 41acb50c3b
8 changed files with 17 additions and 51 deletions
@@ -17,8 +17,6 @@ PREFERRED_VERSION_gtk+ ?= "2.20.1"
PREFERRED_VERSION_librsvg ?= "2.26.3"
PREFERRED_VERSION_dbus-glib ?= "0.82"
PREFERRED_VERSION_dbus-glib-native ?= "0.82"
PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
@@ -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/<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
@@ -1,3 +1,7 @@
# not sure the reason for changing link order. Disable it for now, but keep for a while
#
# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
Index: dbus-glib-0.82/dbus/Makefile.am
===================================================================
--- dbus-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100
@@ -1,3 +1,7 @@
# disable compiling examples
#
# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
--- 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 @@
@@ -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
}
+6 -3
View File
@@ -3,16 +3,19 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
LICENSE = "AFL2.1 | GPLv2+"
SECTION = "base"
DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
file://fix_asneeded.patch \
file://no-examples.patch"
inherit autotools pkgconfig gettext
EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
FILES_${PN} = "${libdir}/lib*.so.*"
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \
--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
BBCLASSEXTEND = "native"
-9
View File
@@ -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/
}
EXTRA_OECONF += "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
+3
View File
@@ -0,0 +1,3 @@
require dbus-glib.inc
PR = "r0"