diff options
Diffstat (limited to 'packages/dbus')
33 files changed, 270 insertions, 55 deletions
diff --git a/packages/dbus/dbus-0.6x/fix-segfault.patch b/packages/dbus/dbus-0.6x/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.6x/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); diff --git a/packages/dbus/dbus-0.90/.mtn2git_empty b/packages/dbus/dbus-0.91/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dbus/dbus-0.90/.mtn2git_empty +++ b/packages/dbus/dbus-0.91/.mtn2git_empty diff --git a/packages/dbus/dbus-0.90/dbus-1.init b/packages/dbus/dbus-0.91/dbus-1.init index 60440b7223..60440b7223 100644 --- a/packages/dbus/dbus-0.90/dbus-1.init +++ b/packages/dbus/dbus-0.91/dbus-1.init diff --git a/packages/dbus/dbus-0.91/fix-segfault.patch b/packages/dbus/dbus-0.91/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.91/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); diff --git a/packages/dbus/dbus-python/.mtn2git_empty b/packages/dbus/dbus-0.92/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dbus/dbus-python/.mtn2git_empty +++ b/packages/dbus/dbus-0.92/.mtn2git_empty diff --git a/packages/dbus/dbus-0.92/dbus-1.init b/packages/dbus/dbus-0.92/dbus-1.init new file mode 100644 index 0000000000..60440b7223 --- /dev/null +++ b/packages/dbus/dbus-0.92/dbus-1.init @@ -0,0 +1,86 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters <walters@debian.org> + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus-1 +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus-1 ]; then + . /etc/default/dbus-1 +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + restart|force-reload) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/dbus/dbus-0.92/fix-install-daemon.patch b/packages/dbus/dbus-0.92/fix-install-daemon.patch new file mode 100644 index 0000000000..0cfe5db650 --- /dev/null +++ b/packages/dbus/dbus-0.92/fix-install-daemon.patch @@ -0,0 +1,11 @@ +--- dbus-0.92/bus/Makefile.am.orig 2006-08-20 14:37:07.393810316 +0200 ++++ dbus-0.92/bus/Makefile.am 2006-08-20 14:38:01.509274554 +0200 +@@ -107,7 +107,7 @@ + $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ + chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ + fi +- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) ++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus + $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/packages/dbus/dbus-0.92/fix-segfault.patch b/packages/dbus/dbus-0.92/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/packages/dbus/dbus-0.92/fix-segfault.patch @@ -0,0 +1,11 @@ +--- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 ++++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 +@@ -1294,7 +1294,7 @@ + _dbus_string_get_length (&block->replacement) - block->padding, + &fixups)) + goto oom; +- ++printf("%s(%d)""got here", __FILE__, __LINE__); + #if RECURSIVE_MARSHAL_WRITE_TRACE + _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, + _dbus_string_get_length (&block->replacement) - block->padding); diff --git a/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb new file mode 100644 index 0000000000..81a15c9b35 --- /dev/null +++ b/packages/dbus/dbus-glib-native_0.71.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" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ + file://cross.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" +DEPENDS = "glib-2.0-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/dbus-glib-0.70-fix-includes.patch b/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch deleted file mode 100644 index 68edc54038..0000000000 --- a/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- dbus-glib-0.70/dbus/Makefile.am.fix_includes 2006-07-17 13:00:39.000000000 -0400 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-17 20:09:00.000000000 -0400 -@@ -38,13 +38,13 @@ - dbus-gvalue.c \ - dbus-gvalue.h \ - dbus-gthread.c \ -- dbus-glib.h \ -- dbus-glib-lowlevel.h \ -- dbus-glib-error-enum.h \ - $(DBUS_GLIB_INTERNALS) - - libdbus_glib_HEADERS = \ -- dbus-gtype-specialized.h -+ dbus-gtype-specialized.h \ -+ dbus-glib.h \ -+ dbus-glib-lowlevel.h \ -+ dbus-glib-error-enum.h - - libdbus_glibdir = $(includedir)/dbus-1.0/dbus - - diff --git a/packages/dbus/dbus-glib_0.70.bb b/packages/dbus/dbus-glib_0.71.bb index 304e7aca48..6bb69ba316 100644 --- a/packages/dbus/dbus-glib_0.70.bb +++ b/packages/dbus/dbus-glib_0.71.bb @@ -7,7 +7,6 @@ DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ file://cross.patch;patch=1 \ - file://dbus-glib-0.70-fix-includes.patch;patch=1 \ file://no-examples.patch;patch=1 \ file://no-introspect.patch;patch=1" diff --git a/packages/dbus/dbus-native_0.34.bb b/packages/dbus/dbus-native_0.34.bb index 916f7ad8e2..e293ecb551 100644 --- a/packages/dbus/dbus-native_0.34.bb +++ b/packages/dbus/dbus-native_0.34.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.50.bb b/packages/dbus/dbus-native_0.50.bb index 9e661dbccf..39ea2ae0b7 100644 --- a/packages/dbus/dbus-native_0.50.bb +++ b/packages/dbus/dbus-native_0.50.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.60.bb b/packages/dbus/dbus-native_0.60.bb index 9e661dbccf..39ea2ae0b7 100644 --- a/packages/dbus/dbus-native_0.60.bb +++ b/packages/dbus/dbus-native_0.60.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.61.bb b/packages/dbus/dbus-native_0.61.bb index 9e661dbccf..39ea2ae0b7 100644 --- a/packages/dbus/dbus-native_0.61.bb +++ b/packages/dbus/dbus-native_0.61.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.62.bb b/packages/dbus/dbus-native_0.62.bb index c91231f6f9..ab9a35c5dd 100644 --- a/packages/dbus/dbus-native_0.62.bb +++ b/packages/dbus/dbus-native_0.62.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc SRC_URI_EXTRA="" diff --git a/packages/dbus/dbus-native_0.91.bb b/packages/dbus/dbus-native_0.91.bb new file mode 100644 index 0000000000..e176787d91 --- /dev/null +++ b/packages/dbus/dbus-native_0.91.bb @@ -0,0 +1,26 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" + +S = "${WORKDIR}/dbus-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus" +DEPENDS = "glib-2.0-native" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1" + +inherit autotools pkgconfig gettext native + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + +do_stage () { + oe_runmake install + autotools_stage_all +} diff --git a/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch b/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch deleted file mode 100644 index 17b78d938a..0000000000 --- a/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- dbus-python-0.70/setup.py.fix-binary-modules-dir 2006-07-17 20:30:07.000000000 -0400 -+++ dbus-python-0.70/setup.py 2006-07-17 20:30:22.000000000 -0400 -@@ -92,12 +92,12 @@ - "dbus/_util", - ], - ext_modules=[ -- Extension("dbus_bindings", ["dbus/dbus_bindings.pyx"], -+ Extension("dbus/dbus_bindings", ["dbus/dbus_bindings.pyx"], - include_dirs=dbus_includes, - libraries=["dbus-1"], - - ), -- Extension("dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"], -+ Extension("dbus/dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"], - include_dirs=dbus_glib_includes, - libraries=["dbus-glib-1", "dbus-1", "glib-2.0"], - define_macros=[ - diff --git a/packages/dbus/dbus-python_0.70.bb b/packages/dbus/dbus-python_0.71.bb index 7bfbc931ed..7c80a1be3c 100644 --- a/packages/dbus/dbus-python_0.70.bb +++ b/packages/dbus/dbus-python_0.71.bb @@ -9,7 +9,6 @@ PR = "r0" DEPENDS = "python-native" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-python-${PV}.tar.gz \ - file://cross.patch;patch=1 \ - file://dbus-python-0.70-fix-binary-modules-dir.patch;patch=1" + file://cross.patch;patch=1" inherit distutils diff --git a/packages/dbus/dbus_0.20.bb b/packages/dbus/dbus_0.20.bb index 0a08862f10..6d0a777fef 100644 --- a/packages/dbus/dbus_0.20.bb +++ b/packages/dbus/dbus_0.20.bb @@ -2,6 +2,7 @@ SECTION = "base" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" LICENSE = "GPL" SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \ diff --git a/packages/dbus/dbus_0.21.bb b/packages/dbus/dbus_0.21.bb index abd234712f..d7b164e8cc 100644 --- a/packages/dbus/dbus_0.21.bb +++ b/packages/dbus/dbus_0.21.bb @@ -3,6 +3,7 @@ PR = "r4" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" LICENSE = "GPL" SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \ diff --git a/packages/dbus/dbus_0.22.bb b/packages/dbus/dbus_0.22.bb index 424c27908b..8eacbeca27 100644 --- a/packages/dbus/dbus_0.22.bb +++ b/packages/dbus/dbus_0.22.bb @@ -4,6 +4,7 @@ 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" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.1-osso5.bb b/packages/dbus/dbus_0.23.1-osso5.bb index b2fc9c44ac..1cb72cb792 100644 --- a/packages/dbus/dbus_0.23.1-osso5.bb +++ b/packages/dbus/dbus_0.23.1-osso5.bb @@ -5,6 +5,7 @@ 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" +PROVIDES = "dbus-glib" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/d/${PN}/${PN}_${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb index dc3f6f2e72..6fd86ae1aa 100644 --- a/packages/dbus/dbus_0.23.4.bb +++ b/packages/dbus/dbus_0.23.4.bb @@ -4,6 +4,7 @@ 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" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.bb b/packages/dbus/dbus_0.23.bb index c0faeec1a6..de224f307e 100644 --- a/packages/dbus/dbus_0.23.bb +++ b/packages/dbus/dbus_0.23.bb @@ -4,6 +4,7 @@ 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" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.34.bb b/packages/dbus/dbus_0.34.bb index a1d19897cc..2a9989fe3b 100644 --- a/packages/dbus/dbus_0.34.bb +++ b/packages/dbus/dbus_0.34.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" diff --git a/packages/dbus/dbus_0.50.bb b/packages/dbus/dbus_0.50.bb index a1d19897cc..2a9989fe3b 100644 --- a/packages/dbus/dbus_0.50.bb +++ b/packages/dbus/dbus_0.50.bb @@ -1,4 +1,4 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" diff --git a/packages/dbus/dbus_0.60.bb b/packages/dbus/dbus_0.60.bb index f8e16815e7..57a1c10242 100644 --- a/packages/dbus/dbus_0.60.bb +++ b/packages/dbus/dbus_0.60.bb @@ -1,7 +1,8 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/dbus/dbus_0.61.bb b/packages/dbus/dbus_0.61.bb index f8e16815e7..57a1c10242 100644 --- a/packages/dbus/dbus_0.61.bb +++ b/packages/dbus/dbus_0.61.bb @@ -1,7 +1,8 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/dbus/dbus_0.62.bb b/packages/dbus/dbus_0.62.bb index f8e16815e7..57a1c10242 100644 --- a/packages/dbus/dbus_0.62.bb +++ b/packages/dbus/dbus_0.62.bb @@ -1,7 +1,8 @@ -include dbus_${PV}.inc +require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/dbus/dbus_0.62.inc b/packages/dbus/dbus_0.62.inc index c1dcc0e4a3..3b0f24f408 100644 --- a/packages/dbus/dbus_0.62.inc +++ b/packages/dbus/dbus_0.62.inc @@ -1,15 +1,19 @@ SECTION = "base" -PR = "r0" +PR = "r1" 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" + +FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" + SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ file://dbus-1.init \ file://no-examples.patch;patch=1 \ + file://fix-segfault.patch;patch=1 \ ${SRC_URI_EXTRA}" inherit autotools pkgconfig update-rc.d gettext diff --git a/packages/dbus/dbus_0.90.bb b/packages/dbus/dbus_0.91.bb index e48b09e4ff..9eec6c86c7 100644 --- a/packages/dbus/dbus_0.90.bb +++ b/packages/dbus/dbus_0.91.bb @@ -1,7 +1,7 @@ DEFAULT_PREFERENCE="-1" SECTION = "base" -PR = "r0" +PR = "r1" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" @@ -10,7 +10,8 @@ DEPENDS = "expat glib-2.0 virtual/libintl" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ - file://dbus-1.init" + file://dbus-1.init \ + file://fix-segfault.patch;patch=1" inherit autotools pkgconfig update-rc.d gettext diff --git a/packages/dbus/dbus_0.92.bb b/packages/dbus/dbus_0.92.bb new file mode 100644 index 0000000000..a4ab61322f --- /dev/null +++ b/packages/dbus/dbus_0.92.bb @@ -0,0 +1,64 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "base" +PR = "r1" +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" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init \ + file://fix-segfault.patch;patch=1 \ + file://fix-install-daemon.patch;patch=1" + +inherit autotools pkgconfig update-rc.d gettext + +INITSCRIPT_NAME = "dbus-1" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" + +FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include" + +pkg_postinst_dbus() { +#!/bin/sh + +# can't do adduser stuff offline +if [ "x$D" != "x" ]; then + exit 1 +fi + +MESSAGEUSER=messagebus +MESSAGEHOME=/var/run/dbus + +mkdir -p $MESSAGEHOME || true +chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +} + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + +do_stage () { + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ + install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_dbus', 'dbus-1', d) +} |