summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-08-25 09:23:52 +0200
committerWolfram Sang <w.sang@pengutronix.de>2010-08-25 09:23:52 +0200
commit047a7f18ad19f43005697c42a461a442f1027222 (patch)
tree2236b7ec33b4d7e33253a49e217cdb277508e867
parent782e978b018bf6c380864c40e696791492f3317f (diff)
downloadptxdist-047a7f18ad19f43005697c42a461a442f1027222.tar.gz
ptxdist-047a7f18ad19f43005697c42a461a442f1027222.tar.xz
[dbus] annotate patches
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-rw-r--r--patches/dbus-1.2.24/0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch1
-rw-r--r--patches/dbus-1.2.24/0003-make-dbus-1.pc-relocatable.patch2
2 files changed, 3 insertions, 0 deletions
diff --git a/patches/dbus-1.2.24/0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch b/patches/dbus-1.2.24/0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch
index cccaa3fb9..375e0749a 100644
--- a/patches/dbus-1.2.24/0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch
+++ b/patches/dbus-1.2.24/0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch
@@ -14,6 +14,7 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
# 20091211 rsc: mailed to dbus mailing list
+# 20100825 wsa: better version mainline: http://cgit.freedesktop.org/dbus/dbus/commit/?id=085e7730b88a0c4a42a325c3ed4dd99f0b67185b
bus/config-parser-trivial.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/patches/dbus-1.2.24/0003-make-dbus-1.pc-relocatable.patch b/patches/dbus-1.2.24/0003-make-dbus-1.pc-relocatable.patch
index 6a3f7fc56..b31e333f5 100644
--- a/patches/dbus-1.2.24/0003-make-dbus-1.pc-relocatable.patch
+++ b/patches/dbus-1.2.24/0003-make-dbus-1.pc-relocatable.patch
@@ -7,6 +7,8 @@ Don't use expanded paths in dbus-1.pc.in
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
+# 20100825 wsa: according to mol not necessary for mainline.
+
configure.in | 3 +++
dbus-1.pc.in | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)