From 2d03f3e79b9371c37cfa25a4dcae699f42a9d953 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 21 Nov 2006 14:28:13 +0000 Subject: [PATCH] dbus: Add missing files git-svn-id: https://svn.o-hand.com/repos/poky/trunk@930 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/dbus/dbus/fix-segfault.patch | 11 +++++++++++ meta/packages/dbus/dbus/no-static.patch | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 meta/packages/dbus/dbus/fix-segfault.patch create mode 100644 meta/packages/dbus/dbus/no-static.patch diff --git a/meta/packages/dbus/dbus/fix-segfault.patch b/meta/packages/dbus/dbus/fix-segfault.patch new file mode 100644 index 0000000..de5bcff --- /dev/null +++ b/meta/packages/dbus/dbus/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/meta/packages/dbus/dbus/no-static.patch b/meta/packages/dbus/dbus/no-static.patch new file mode 100644 index 0000000..a28a582 --- /dev/null +++ b/meta/packages/dbus/dbus/no-static.patch @@ -0,0 +1,22 @@ +--- dbus-0.23.4/bus/Makefile.am.old 2006-02-04 11:51:26.000000000 +0000 ++++ dbus-0.23.4/bus/Makefile.am 2006-02-04 11:51:27.000000000 +0000 +@@ -63,7 +63,7 @@ + dbus_daemon_1_LDADD= \ + $(EFENCE) \ + $(DBUS_BUS_LIBS) \ +- $(top_builddir)/dbus/libdbus-convenience.la ++ $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la + + ## note that TESTS has special meaning (stuff to use in make check) + ## so if adding tests not to be run in make check, don't add them to +--- dbus-0.23.4/dbus/Makefile.am.old 2006-02-04 13:27:03.000000000 +0000 ++++ dbus-0.23.4/dbus/Makefile.am 2006-02-04 13:27:04.000000000 +0000 +@@ -144,7 +144,7 @@ + libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) + ## don't export symbols that start with "_" (we use this + ## convention for internal symbols) +-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" ++#libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" + + ## note that TESTS has special meaning (stuff to use in make check) + ## so if adding tests not to be run in make check, don't add them to -- 2.7.4