summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-02-27 09:29:07 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-02-27 09:29:07 +0000
commit2b7440932f8a953c3a062497ed861e0d82852102 (patch)
treea7e5c024139209d48af45dc39d16b9c6c096d961 /sys-apps
parentRemove old versions. (diff)
downloadgentoo-2-2b7440932f8a953c3a062497ed861e0d82852102.tar.gz
gentoo-2-2b7440932f8a953c3a062497ed861e0d82852102.tar.bz2
gentoo-2-2b7440932f8a953c3a062497ed861e0d82852102.zip
Clean up patch #352442
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/dbus/Manifest2
-rw-r--r--sys-apps/dbus/files/dbus-1.4.0-asneeded.patch15
2 files changed, 7 insertions, 10 deletions
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index e967e7b42aa3..f803cd95b886 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,5 +1,5 @@
AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fbe164dc4f4e2e4d4b4cdeaf8cef2b5 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2
-AUX dbus-1.4.0-asneeded.patch 4157 RMD160 f6fd613ff90d5570f4dabeca0738df4c3249ed49 SHA1 ceddf63bb4a3213f68117b36af415a7c69443e6a SHA256 c37d068b6923947f769682677cacbad13b267458b2de242e160b8ab261aa9b96
+AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1be5 SHA1 a15445bcc5d811276c681b543d0bcd14df9db32f SHA256 f785afd7943b3220ebcf2603b1c059a2dec46bdbfba376e60d8373ba3f933562
AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
DIST dbus-1.4.1.tar.gz 1850139 RMD160 090740469872b31c24aafb4e4d40e690184b1580 SHA1 112279ff58305027294fe0eb5bee600f68cf0b50 SHA256 caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd
DIST dbus-1.4.6.tar.gz 1835214 RMD160 c751630654225b729512d7a996e5ad70dbfc59fc SHA1 e87520518dfa0bfc4b8791105673e48f993874d7 SHA256 753e1e64df2de518ec93bdee9a813a85b3c147a363615412818c3c095cb8a567
diff --git a/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch b/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
index 1b6dd6c2e2cd..baa71294dc71 100644
--- a/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
+++ b/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
@@ -1,8 +1,7 @@
http://bugs.freedesktop.org/show_bug.cgi?id=23162
-diff -ru ../dbus-1.4.0/dbus/Makefile.am ./dbus/Makefile.am
---- ../dbus-1.4.0/dbus/Makefile.am 2010-08-31 23:44:19.000000000 +0200
-+++ ./dbus/Makefile.am 2010-09-12 22:49:08.191226651 +0200
+--- dbus/Makefile.am
++++ dbus/Makefile.am
@@ -277,7 +277,7 @@
dbus_test_SOURCES= \
dbus-test-main.c
@@ -12,9 +11,8 @@ diff -ru ../dbus-1.4.0/dbus/Makefile.am ./dbus/Makefile.am
dbus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
## mop up the gcov files
-diff -ru ../dbus-1.4.0/test/Makefile.am ./test/Makefile.am
---- ../dbus-1.4.0/test/Makefile.am 2010-08-31 23:44:19.000000000 +0200
-+++ ./test/Makefile.am 2010-09-12 22:51:44.021632252 +0200
+--- test/Makefile.am
++++ test/Makefile.am
@@ -63,17 +63,17 @@
# When any programs are not linked to libdbus-internal, fix this.
@@ -38,9 +36,8 @@ diff -ru ../dbus-1.4.0/test/Makefile.am ./test/Makefile.am
shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
spawn_test_LDADD=$(TEST_LIBS)
spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
-diff -ru ../dbus-1.4.0/test/name-test/Makefile.am ./test/name-test/Makefile.am
---- ../dbus-1.4.0/test/name-test/Makefile.am 2010-08-31 23:44:19.000000000 +0200
-+++ ./test/name-test/Makefile.am 2010-09-12 22:53:29.046971038 +0200
+--- test/name-test/Makefile.am
++++ test/name-test/Makefile.am
@@ -22,46 +22,46 @@
test_pending_call_dispatch_SOURCES = \
test-pending-call-dispatch.c