diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2006-10-27 09:03:57 +0000 |
---|---|---|
committer | Philipp Zabel <philipp.zabel@gmail.com> | 2006-10-27 09:03:57 +0000 |
commit | 6167e546c495443fa4f0cc2a2aa0cd4fa6a57818 (patch) | |
tree | f3fc986f109f706e2ffac1fb54e3d3355d9f2fe7 | |
parent | 1e188e5d610e693cbbd8d8716907ceb1897bf8c3 (diff) |
dbus-glib: add 0.72
-rw-r--r-- | packages/dbus/dbus-glib-0.72/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/dbus/dbus-glib-0.72/cross.patch | 12 | ||||
-rw-r--r-- | packages/dbus/dbus-glib-0.72/no-introspect.patch | 19 | ||||
-rw-r--r-- | packages/dbus/dbus-glib-native-0.72/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch | 23 | ||||
-rw-r--r-- | packages/dbus/dbus-glib-native_0.72.bb | 22 | ||||
-rw-r--r-- | packages/dbus/dbus-glib_0.72.bb | 29 |
7 files changed, 105 insertions, 0 deletions
diff --git a/packages/dbus/dbus-glib-0.72/.mtn2git_empty b/packages/dbus/dbus-glib-0.72/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbus/dbus-glib-0.72/.mtn2git_empty diff --git a/packages/dbus/dbus-glib-0.72/cross.patch b/packages/dbus/dbus-glib-0.72/cross.patch new file mode 100644 index 0000000000..b3f41c8507 --- /dev/null +++ b/packages/dbus/dbus-glib-0.72/cross.patch @@ -0,0 +1,12 @@ +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/no-introspect.patch b/packages/dbus/dbus-glib-0.72/no-introspect.patch new file mode 100644 index 0000000000..607f0acc9c --- /dev/null +++ b/packages/dbus/dbus-glib-0.72/no-introspect.patch @@ -0,0 +1,19 @@ +Index: dbus-glib-0.72/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 @@ + 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 + +-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 = \ diff --git a/packages/dbus/dbus-glib-native-0.72/.mtn2git_empty b/packages/dbus/dbus-glib-native-0.72/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbus/dbus-glib-native-0.72/.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.72/run-with-tmp-session-bus.patch new file mode 100644 index 0000000000..ba117d0309 --- /dev/null +++ b/packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch @@ -0,0 +1,23 @@ +Index: dbus-glib-0.72/tools/run-with-tmp-session-bus.sh +=================================================================== +--- dbus-glib-0.72.orig/tools/run-with-tmp-session-bus.sh 2006-09-27 14:27:25.000000000 +0200 ++++ dbus-glib-0.72/tools/run-with-tmp-session-bus.sh 2006-10-27 10:13:57.000000000 +0200 +@@ -30,16 +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/dbus/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 + +-export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH + ## the libtool script found by the path search should already do this, but +-export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH ++export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH + + unset DBUS_SESSION_BUS_ADDRESS + unset DBUS_SESSION_BUS_PID diff --git a/packages/dbus/dbus-glib-native_0.72.bb b/packages/dbus/dbus-glib-native_0.72.bb new file mode 100644 index 0000000000..842ddeb159 --- /dev/null +++ b/packages/dbus/dbus-glib-native_0.72.bb @@ -0,0 +1,22 @@ +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://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-${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.72.bb b/packages/dbus/dbus-glib_0.72.bb new file mode 100644 index 0000000000..641f0263a2 --- /dev/null +++ b/packages/dbus/dbus-glib_0.72.bb @@ -0,0 +1,29 @@ +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://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" |