From 41acb50c3bed5f040d309e04be528af899cb42ab Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Sun, 11 Jul 2010 16:02:56 +0800 Subject: 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 --- meta/conf/distro/include/poky-fixed-revisions.inc | 2 -- .../dbus/dbus-glib-0.82/fix_asneeded.patch | 13 ------------ .../packages/dbus/dbus-glib-0.82/no-examples.patch | 8 -------- .../dbus-glib-0.82/run-with-tmp-session-bus.patch | 24 ---------------------- .../dbus/dbus-glib-0.86/fix_asneeded.patch | 17 +++++++++++++++ .../packages/dbus/dbus-glib-0.86/no-examples.patch | 12 +++++++++++ meta/packages/dbus/dbus-glib-native_0.82.bb | 13 ------------ meta/packages/dbus/dbus-glib.inc | 9 +++++--- meta/packages/dbus/dbus-glib_0.82.bb | 9 -------- meta/packages/dbus/dbus-glib_0.86.bb | 3 +++ 10 files changed, 38 insertions(+), 72 deletions(-) delete mode 100644 meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch delete mode 100644 meta/packages/dbus/dbus-glib-0.82/no-examples.patch delete mode 100644 meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch create mode 100644 meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch create mode 100644 meta/packages/dbus/dbus-glib-0.86/no-examples.patch delete mode 100644 meta/packages/dbus/dbus-glib-native_0.82.bb delete mode 100644 meta/packages/dbus/dbus-glib_0.82.bb create mode 100644 meta/packages/dbus/dbus-glib_0.86.bb 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" 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" diff --git a/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch deleted file mode 100644 index eba4375db2..0000000000 --- a/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: dbus-glib-0.82/dbus/Makefile.am -=================================================================== ---- dbus-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100 -+++ dbus-glib-0.82/dbus/Makefile.am 2009-12-11 09:27:20.000000000 +0000 -@@ -105,7 +105,7 @@ - - dbus_bash_completion_helper_SOURCES = \ - dbus-bash-completion-helper.c --dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la -+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la -lexpat - - - EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in diff --git a/meta/packages/dbus/dbus-glib-0.82/no-examples.patch b/meta/packages/dbus/dbus-glib-0.82/no-examples.patch deleted file mode 100644 index 483153db74..0000000000 --- a/meta/packages/dbus/dbus-glib-0.82/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.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 @@ -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-0.86/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch new file mode 100644 index 0000000000..3065557683 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.86/fix_asneeded.patch @@ -0,0 +1,17 @@ +# not sure the reason for changing link order. Disable it for now, but keep for a while +# +# comment added by Kevin Tian , 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 ++++ dbus-glib-0.82/dbus/Makefile.am 2009-12-11 09:27:20.000000000 +0000 +@@ -105,7 +105,7 @@ + + dbus_bash_completion_helper_SOURCES = \ + dbus-bash-completion-helper.c +-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la ++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la -lexpat + + + EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in diff --git a/meta/packages/dbus/dbus-glib-0.86/no-examples.patch b/meta/packages/dbus/dbus-glib-0.86/no-examples.patch new file mode 100644 index 0000000000..32609b9b9c --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.86/no-examples.patch @@ -0,0 +1,12 @@ +# disable compiling examples +# +# comment added by Kevin Tian , 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 @@ +-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-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 @@ -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 -} 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" 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" 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 @@ -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" 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 @@ +require dbus-glib.inc + +PR = "r0" -- cgit v1.2.3-54-g00ecf