summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-11 16:02:56 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-13 15:21:45 +0100
commit41acb50c3bed5f040d309e04be528af899cb42ab (patch)
tree770d6aa86df35e224b570bf082ef174433f1216d /meta
parent67eeb71308e8307a99d12417dfb0fe8f016814da (diff)
downloadpoky-41acb50c3bed5f040d309e04be528af899cb42ab.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch24
-rw-r--r--meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch (renamed from meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch)4
-rw-r--r--meta/packages/dbus/dbus-glib-0.86/no-examples.patch (renamed from meta/packages/dbus/dbus-glib-0.82/no-examples.patch)4
-rw-r--r--meta/packages/dbus/dbus-glib-native_0.82.bb13
-rw-r--r--meta/packages/dbus/dbus-glib.inc9
-rw-r--r--meta/packages/dbus/dbus-glib_0.82.bb9
-rw-r--r--meta/packages/dbus/dbus-glib_0.86.bb3
8 files changed, 17 insertions, 51 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index b5f3886358..a1968aaef7 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -17,8 +17,6 @@ PREFERRED_VERSION_gtk+ ?= "2.20.1"
17 17
18PREFERRED_VERSION_librsvg ?= "2.26.3" 18PREFERRED_VERSION_librsvg ?= "2.26.3"
19 19
20PREFERRED_VERSION_dbus-glib ?= "0.82"
21PREFERRED_VERSION_dbus-glib-native ?= "0.82"
22PREFERRED_VERSION_gnome-vfs ?= "2.22.0" 20PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
23PREFERRED_VERSION_libgnomecanvas ?= "2.20.0" 21PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
24 22
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
deleted file mode 100644
index a04f404f75..0000000000
--- a/meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
2===================================================================
3--- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100
4+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100
5@@ -30,17 +30,15 @@
6 echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
7
8 ## create a configuration file based on the standard session.conf
9-cat $DBUS_TOP_SRCDIR/tools/session.conf | \
10+cat $datadir/tools/session.conf | \
11 sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
12 sed -e 's/<include.*$//g' \
13 > $CONFIG_FILE
14
15 echo "Created configuration file $CONFIG_FILE" >&2
16
17-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
18-export PATH
19 ## the libtool script found by the path search should already do this, but
20-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
21+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
22 export PATH
23 unset DBUS_SESSION_BUS_ADDRESS
24 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.86/fix_asneeded.patch
index eba4375db2..3065557683 100644
--- a/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch
+++ b/meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch
@@ -1,3 +1,7 @@
1# not sure the reason for changing link order. Disable it for now, but keep for a while
2#
3# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
4
1Index: dbus-glib-0.82/dbus/Makefile.am 5Index: dbus-glib-0.82/dbus/Makefile.am
2=================================================================== 6===================================================================
3--- dbus-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100 7--- dbus-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100
diff --git a/meta/packages/dbus/dbus-glib-0.82/no-examples.patch b/meta/packages/dbus/dbus-glib-0.86/no-examples.patch
index 483153db74..32609b9b9c 100644
--- a/meta/packages/dbus/dbus-glib-0.82/no-examples.patch
+++ b/meta/packages/dbus/dbus-glib-0.86/no-examples.patch
@@ -1,3 +1,7 @@
1# disable compiling examples
2#
3# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
4
1--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 5--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
2+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 6+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
3@@ -1,4 +1,4 @@ 7@@ -1,4 +1,4 @@
diff --git a/meta/packages/dbus/dbus-glib-native_0.82.bb b/meta/packages/dbus/dbus-glib-native_0.82.bb
deleted file mode 100644
index 8395fced0c..0000000000
--- a/meta/packages/dbus/dbus-glib-native_0.82.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require dbus-glib.inc
2inherit native
3
4DEPENDS = "glib-2.0-native dbus-native"
5
6PR = "r0"
7
8SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1"
9
10do_install_append() {
11 install -d ${D}${datadir}/dbus
12 install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus
13}
diff --git a/meta/packages/dbus/dbus-glib.inc b/meta/packages/dbus/dbus-glib.inc
index 051b0bc84d..a39dae3dbc 100644
--- a/meta/packages/dbus/dbus-glib.inc
+++ b/meta/packages/dbus/dbus-glib.inc
@@ -3,16 +3,19 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
3LICENSE = "AFL2.1 | GPLv2+" 3LICENSE = "AFL2.1 | GPLv2+"
4SECTION = "base" 4SECTION = "base"
5DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" 5DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
6DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
6 7
7SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ 8SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
8 file://fix_asneeded.patch \
9 file://no-examples.patch" 9 file://no-examples.patch"
10 10
11inherit autotools pkgconfig gettext 11inherit autotools pkgconfig gettext
12 12
13EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
14
15FILES_${PN} = "${libdir}/lib*.so.*" 13FILES_${PN} = "${libdir}/lib*.so.*"
16FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" 14FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
17FILES_${PN}-dev += "${bindir}/dbus-binding-tool" 15FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
18 16
17EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \
18 --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
19EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
20
21BBCLASSEXTEND = "native"
diff --git a/meta/packages/dbus/dbus-glib_0.82.bb b/meta/packages/dbus/dbus-glib_0.82.bb
deleted file mode 100644
index f54023684b..0000000000
--- a/meta/packages/dbus/dbus-glib_0.82.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require dbus-glib.inc
2
3PR = "r0"
4
5do_configure_prepend() {
6 cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
7}
8
9EXTRA_OECONF += "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
diff --git a/meta/packages/dbus/dbus-glib_0.86.bb b/meta/packages/dbus/dbus-glib_0.86.bb
new file mode 100644
index 0000000000..000146ab7e
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib_0.86.bb
@@ -0,0 +1,3 @@
1require dbus-glib.inc
2
3PR = "r0"