diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-11-21 14:28:13 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-11-21 14:28:13 +0000 |
| commit | 4c9521de57092b816a332a1801ab625182a58371 (patch) | |
| tree | de49f6c7df5ab9ab1688cbfdb2ec8be88b53cb81 /meta | |
| parent | 0405bf5645e53ae375fd54e8f95b140b374421e0 (diff) | |
| download | poky-4c9521de57092b816a332a1801ab625182a58371.tar.gz | |
dbus: Add missing files
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@930 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/dbus/dbus/fix-segfault.patch | 11 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus/no-static.patch | 22 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/packages/dbus/dbus/fix-segfault.patch b/meta/packages/dbus/dbus/fix-segfault.patch new file mode 100644 index 0000000000..de5bcff774 --- /dev/null +++ b/meta/packages/dbus/dbus/fix-segfault.patch | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | --- /tmp/dbus-marshal-recursive.c 2006-07-28 14:58:08.000000000 +0200 | ||
| 2 | +++ dbus-0.90/dbus/dbus-marshal-recursive.c 2006-07-28 14:58:18.724411000 +0200 | ||
| 3 | @@ -1294,7 +1294,7 @@ | ||
| 4 | _dbus_string_get_length (&block->replacement) - block->padding, | ||
| 5 | &fixups)) | ||
| 6 | goto oom; | ||
| 7 | - | ||
| 8 | +printf("%s(%d)""got here", __FILE__, __LINE__); | ||
| 9 | #if RECURSIVE_MARSHAL_WRITE_TRACE | ||
| 10 | _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding, | ||
| 11 | _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 0000000000..a28a582681 --- /dev/null +++ b/meta/packages/dbus/dbus/no-static.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | --- dbus-0.23.4/bus/Makefile.am.old 2006-02-04 11:51:26.000000000 +0000 | ||
| 2 | +++ dbus-0.23.4/bus/Makefile.am 2006-02-04 11:51:27.000000000 +0000 | ||
| 3 | @@ -63,7 +63,7 @@ | ||
| 4 | dbus_daemon_1_LDADD= \ | ||
| 5 | $(EFENCE) \ | ||
| 6 | $(DBUS_BUS_LIBS) \ | ||
| 7 | - $(top_builddir)/dbus/libdbus-convenience.la | ||
| 8 | + $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la | ||
| 9 | |||
| 10 | ## note that TESTS has special meaning (stuff to use in make check) | ||
| 11 | ## so if adding tests not to be run in make check, don't add them to | ||
| 12 | --- dbus-0.23.4/dbus/Makefile.am.old 2006-02-04 13:27:03.000000000 +0000 | ||
| 13 | +++ dbus-0.23.4/dbus/Makefile.am 2006-02-04 13:27:04.000000000 +0000 | ||
| 14 | @@ -144,7 +144,7 @@ | ||
| 15 | libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) | ||
| 16 | ## don't export symbols that start with "_" (we use this | ||
| 17 | ## convention for internal symbols) | ||
| 18 | -libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" | ||
| 19 | +#libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" | ||
| 20 | |||
| 21 | ## note that TESTS has special meaning (stuff to use in make check) | ||
| 22 | ## so if adding tests not to be run in make check, don't add them to | ||