From 641e45bd5f6eb04f05aa51f828a5d60d0e82a78d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 27 Jun 2008 16:29:35 +0000 Subject: dbus-glib: added 0.76 (from Poky) --- packages/dbus/dbus-glib-0.76/.mtn2git_empty | 0 packages/dbus/dbus-glib-0.76/no-examples.patch | 8 +++++++ packages/dbus/dbus-glib-0.76/no-introspect.patch | 14 +++++++++++ packages/dbus/dbus-glib-native-0.76/.mtn2git_empty | 0 .../run-with-tmp-session-bus.patch | 24 +++++++++++++++++++ packages/dbus/dbus-glib-native_0.76.bb | 21 ++++++++++++++++ packages/dbus/dbus-glib_0.76.bb | 28 ++++++++++++++++++++++ 7 files changed, 95 insertions(+) create mode 100644 packages/dbus/dbus-glib-0.76/.mtn2git_empty create mode 100644 packages/dbus/dbus-glib-0.76/no-examples.patch create mode 100644 packages/dbus/dbus-glib-0.76/no-introspect.patch create mode 100644 packages/dbus/dbus-glib-native-0.76/.mtn2git_empty create mode 100644 packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch create mode 100644 packages/dbus/dbus-glib-native_0.76.bb create mode 100644 packages/dbus/dbus-glib_0.76.bb diff --git a/packages/dbus/dbus-glib-0.76/.mtn2git_empty b/packages/dbus/dbus-glib-0.76/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbus/dbus-glib-0.76/no-examples.patch b/packages/dbus/dbus-glib-0.76/no-examples.patch new file mode 100644 index 0000000000..483153db74 --- /dev/null +++ b/packages/dbus/dbus-glib-0.76/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.76/no-introspect.patch b/packages/dbus/dbus-glib-0.76/no-introspect.patch new file mode 100644 index 0000000000..9115801f71 --- /dev/null +++ b/packages/dbus/dbus-glib-0.76/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.76/.mtn2git_empty b/packages/dbus/dbus-glib-native-0.76/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch b/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch new file mode 100644 index 0000000000..a04f404f75 --- /dev/null +++ b/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch @@ -0,0 +1,24 @@ +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/packages/dbus/dbus-glib-native_0.76.bb b/packages/dbus/dbus-glib-native_0.76.bb new file mode 100644 index 0000000000..d76cc043d4 --- /dev/null +++ b/packages/dbus/dbus-glib-native_0.76.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_0.76.bb b/packages/dbus/dbus-glib_0.76.bb new file mode 100644 index 0000000000..0a34c738c3 --- /dev/null +++ b/packages/dbus/dbus-glib_0.76.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_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ + install -m 0644 ${STAGING_DATADIR_NATIVE}/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 1.2.3-korg