summaryrefslogtreecommitdiffstats
path: root/meta/packages/dbus/dbus-glib-0.78
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-15 15:17:54 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-15 15:17:54 +0000
commitb10b195b8ceabbb3f2ac1620ac4663792978b9ff (patch)
tree1f12a5fe31842d1995f45b528b746a4519c4f8bd /meta/packages/dbus/dbus-glib-0.78
parent932fc6a37ddba80d6e52b55db4442df437d1cb61 (diff)
downloadpoky-b10b195b8ceabbb3f2ac1620ac4663792978b9ff.tar.gz
dbus-glib: 0.76 -> 0.78
Diffstat (limited to 'meta/packages/dbus/dbus-glib-0.78')
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch13
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch19
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/no-examples.patch8
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch24
4 files changed, 64 insertions, 0 deletions
diff --git a/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
new file mode 100644
index 0000000000..a0aaec3720
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
@@ -0,0 +1,13 @@
1Index: dbus-glib-0.78/dbus/Makefile.am
2===================================================================
3--- dbus-glib-0.78.orig/dbus/Makefile.am 2009-01-15 15:14:29.000000000 +0000
4+++ dbus-glib-0.78/dbus/Makefile.am 2009-01-15 15:14:46.000000000 +0000
5@@ -104,7 +104,7 @@
6
7 dbus_bash_completion_helper_SOURCES = \
8 dbus-bash-completion-helper.c
9-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la
10+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la libdbus-glib-1.la -lexpat
11
12
13 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.78/native-binding-tool.patch b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
new file mode 100644
index 0000000000..1bdac5a390
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
@@ -0,0 +1,19 @@
1Use the dbus-binding-tool from PATH, not the generated one.
2
3RP - 12/1/09
4
5Index: dbus-glib-0.76/tools/Makefile.am
6===================================================================
7--- dbus-glib-0.76.orig/tools/Makefile.am 2009-01-12 10:11:02.000000000 +0000
8+++ dbus-glib-0.76/tools/Makefile.am 2009-01-12 10:12:01.000000000 +0000
9@@ -3,8 +3,8 @@
10 nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
11 libdbus_glibdir = $(includedir)/dbus-1.0/dbus
12
13-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
14- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
15+dbus-glib-bindings.h: dbus-bus-introspect.xml
16+ dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
17
18 BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
19
diff --git a/meta/packages/dbus/dbus-glib-0.78/no-examples.patch b/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
new file mode 100644
index 0000000000..483153db74
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
@@ -0,0 +1,8 @@
1--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
2+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
3@@ -1,4 +1,4 @@
4-SUBDIRS = . examples
5+SUBDIRS = .
6
7 INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
8
diff --git a/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
new file mode 100644
index 0000000000..a04f404f75
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
@@ -0,0 +1,24 @@
1Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
2===================================================================
3--- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100
4+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100
5@@ -30,17 +30,15 @@
6 echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
7
8 ## create a configuration file based on the standard session.conf
9-cat $DBUS_TOP_SRCDIR/tools/session.conf | \
10+cat $datadir/tools/session.conf | \
11 sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
12 sed -e 's/<include.*$//g' \
13 > $CONFIG_FILE
14
15 echo "Created configuration file $CONFIG_FILE" >&2
16
17-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
18-export PATH
19 ## the libtool script found by the path search should already do this, but
20-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
21+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
22 export PATH
23 unset DBUS_SESSION_BUS_ADDRESS
24 unset DBUS_SESSION_BUS_PID