diff options
author | Richard Purdie <richard@openedhand.com> | 2005-09-02 13:00:13 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-09-02 13:00:13 +0000 |
commit | 255a4ed2bfbf928d5c12d74e48b3759de7241e0d (patch) | |
tree | 81db022dbcfa024e01599370de88039b22f1f0d8 /openembedded/packages/dbus/dbus-0.36 | |
parent | 6de1ae1e2e610b0120a0fcd914f39dfa27ce1e9e (diff) | |
download | openembedded-core-255a4ed2bfbf928d5c12d74e48b3759de7241e0d.tar.gz openembedded-core-255a4ed2bfbf928d5c12d74e48b3759de7241e0d.tar.bz2 openembedded-core-255a4ed2bfbf928d5c12d74e48b3759de7241e0d.tar.xz openembedded-core-255a4ed2bfbf928d5c12d74e48b3759de7241e0d.zip |
Remove gtk xsettings patch. Add dbus 0.36
git-svn-id: https://svn.o-hand.com/repos/poky@16 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/dbus/dbus-0.36')
6 files changed, 169 insertions, 0 deletions
diff --git a/openembedded/packages/dbus/dbus-0.36/cross.patch b/openembedded/packages/dbus/dbus-0.36/cross.patch new file mode 100644 index 000000000..6d1d9d8e7 --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.36/cross.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- dbus-0.20/configure.in~cross ++++ dbus-0.20/configure.in +@@ -466,6 +466,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/openembedded/packages/dbus/dbus-0.36/dbus-1.init b/openembedded/packages/dbus/dbus-0.36/dbus-1.init new file mode 100644 index 000000000..adefe7c5b --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.36/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-1 +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/openembedded/packages/dbus/dbus-0.36/no-bindings.patch b/openembedded/packages/dbus/dbus-0.36/no-bindings.patch new file mode 100644 index 000000000..12ba00ff7 --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.36/no-bindings.patch @@ -0,0 +1,12 @@ +--- dbus-0.34/tools/Makefile.am.old 2005-06-27 21:48:44.000000000 +0100 ++++ dbus-0.34/tools/Makefile.am 2005-06-27 21:49:04.000000000 +0100 +@@ -6,9 +6,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)/glib/dbus-binding-tool +- $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml +- + BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml + + else diff --git a/openembedded/packages/dbus/dbus-0.36/no-examples.patch b/openembedded/packages/dbus/dbus-0.36/no-examples.patch new file mode 100644 index 000000000..531646cfb --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.36/no-examples.patch @@ -0,0 +1,10 @@ +Index: dbus-0.36/glib/Makefile.am +=================================================================== +--- dbus-0.36.orig/glib/Makefile.am 2005-08-04 15:49:30.000000000 +0000 ++++ dbus-0.36/glib/Makefile.am 2005-09-02 12:42:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-SUBDIRS = . examples ++#SUBDIRS = . examples + + INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" + diff --git a/openembedded/packages/dbus/dbus-0.36/no-introspect.patch b/openembedded/packages/dbus/dbus-0.36/no-introspect.patch new file mode 100644 index 000000000..822afccf0 --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.36/no-introspect.patch @@ -0,0 +1,16 @@ +Index: dbus-0.36/tools/Makefile.am +=================================================================== +--- dbus-0.36.orig/tools/Makefile.am 2005-07-08 16:25:28.000000000 +0000 ++++ dbus-0.36/tools/Makefile.am 2005-09-02 12:26:02.000000000 +0000 +@@ -21,11 +21,6 @@ + GTK_TOOLS= + endif + +-if HAVE_GLIB +-dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon dbus-launch dbus-send $(top_builddir)/bus/dbus-daemon Makefile +- DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml +-endif +- + bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS) + + dbus_send_SOURCES= \ diff --git a/openembedded/packages/dbus/dbus-0.36/tmpdir.patch b/openembedded/packages/dbus/dbus-0.36/tmpdir.patch new file mode 100644 index 000000000..838b903f0 --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.36/tmpdir.patch @@ -0,0 +1,30 @@ +--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 ++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 +@@ -1047,15 +1048,18 @@ + AC_SUBST(ABSOLUTE_TOP_BUILDDIR) + + #### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++#if ! test -z "$TMPDIR" ; then ++# DEFAULT_SOCKET_DIR=$TMPDIR ++#elif ! test -z "$TEMP" ; then ++# DEFAULT_SOCKET_DIR=$TEMP ++#elif ! test -z "$TMP" ; then ++# DEFAULT_SOCKET_DIR=$TMP ++#else ++# DEFAULT_SOCKET_DIR=/tmp ++#fi ++ ++# checks disabled to avoid expanding this at build time ++DEFAULT_SOCKET_DIR=/tmp + + if ! test -z "$with_test_socket_dir" ; then + TEST_SOCKET_DIR="$with_test_socket_dir" |