summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2006-04-12 10:46:59 +0000
committerDaniel Black <dragonheart@gentoo.org>2006-04-12 10:46:59 +0000
commit1953b7a13c9ceab8b8dd478c9ec6bd698bcb7c5c (patch)
treef154ede4bcefb8fb140bc24012f02f720a98a1be /app-admin/conky
parentStable on alpha as per bug #117434 (diff)
downloadgentoo-2-1953b7a13c9ceab8b8dd478c9ec6bd698bcb7c5c.tar.gz
gentoo-2-1953b7a13c9ceab8b8dd478c9ec6bd698bcb7c5c.tar.bz2
gentoo-2-1953b7a13c9ceab8b8dd478c9ec6bd698bcb7c5c.zip
patch for missing symbol (bug #129639)
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'app-admin/conky')
-rw-r--r--app-admin/conky/ChangeLog6
-rw-r--r--app-admin/conky/Manifest19
-rw-r--r--app-admin/conky/conky-1.4.1.ebuild8
-rw-r--r--app-admin/conky/files/conky-sigaction.patch14
4 files changed, 32 insertions, 15 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index a2b192f33b2c..71bd842b8c19 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/conky
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.26 2006/04/11 20:34:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.27 2006/04/12 10:46:59 dragonheart Exp $
+
+ 12 Apr 2006; Daniel Black <dragonheart@gentoo.org>
+ +files/conky-sigaction.patch, conky-1.4.1.ebuild:
+ patch for missing symbol (bug #129639) thanks to Thomas Cort and Brenden.
*conky-1.4.1 (11 Apr 2006)
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 899dd4a08035..1a8629199129 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 471a24f5e13479ccc064dd7ede578288 ChangeLog 4732
RMD160 913a203cb9f320e7c396baf4475f1d2c0c81129f ChangeLog 4732
SHA256 b02f53833b7740b8ff47a9f984315741e2a7aefa9231da0d3d62a3ada2421763 ChangeLog 4732
@@ -13,15 +10,18 @@ SHA256 b59fc2bfcf438818650a43063a569d69e927cb040f52bb24c812bd22b4c37222 conky-1.
MD5 c3175ce58ebe987a364225b0e57247d1 conky-1.4.0-r1.ebuild 2557
RMD160 5dd5357a15f8b6b8ede0aa42e7d06bb454bb032c conky-1.4.0-r1.ebuild 2557
SHA256 0006c6fbe8f4921b95e91471d35d0f88d8818fb99240c16296e6a740249e5462 conky-1.4.0-r1.ebuild 2557
-MD5 a2a9958eb6b4e27e1167cda0a8958e77 conky-1.4.1.ebuild 2595
-RMD160 2b8666bcfd4b7119c487eda68673e97478fbdb46 conky-1.4.1.ebuild 2595
-SHA256 0f8a22d1b3830892fdebdf329b06eb1fce300333a56e76b2d691c14b4a2797c2 conky-1.4.1.ebuild 2595
+MD5 92599ce7ad348f57e7d5eacddcb3beda conky-1.4.1.ebuild 2677
+RMD160 9b85f450f018c814444522b14e52d037df295992 conky-1.4.1.ebuild 2677
+SHA256 fc54936cc7907c0ae0f5bac6d38c82f285ec3031a9bb54b4ce0db37153a0cebb conky-1.4.1.ebuild 2677
MD5 d9296cc5c3fc007026e784f5825b153e files/conky-1.3.4-arraybounds.patch 1560
RMD160 dcb1c9b195a03e19b2e477dbc149228930588b52 files/conky-1.3.4-arraybounds.patch 1560
SHA256 4d1eb88c938305b680e4880a8b0f34264b72d4083ce660ef8afdaead8a752710 files/conky-1.3.4-arraybounds.patch 1560
MD5 3f930afeab86d38688b8c7fe8a610bc7 files/conky-1.3.4-miscbug.patch 2591
RMD160 dd4495070c8c5acc6ba60328536325b126e8ef92 files/conky-1.3.4-miscbug.patch 2591
SHA256 5ebd3da731900f6db25c6cc1a3dbbb71d33e458b9f4d9b3fb1771bb7abdc218b files/conky-1.3.4-miscbug.patch 2591
+MD5 2ecd81682f750b475c15c805a96b497f files/conky-sigaction.patch 408
+RMD160 17519cf444661e3c227103fed5b3c1f611f98f8d files/conky-sigaction.patch 408
+SHA256 59cd8f7a8634f6ec89370db16dff6c75156ada06459bc4725514e8f328546335 files/conky-sigaction.patch 408
MD5 c5c1fb804afb4bd1255b602c8894a317 files/digest-conky-1.3.4-r2 64
RMD160 9f59088f6ea3f519eb67f2ae7e798fb72e7366e6 files/digest-conky-1.3.4-r2 64
SHA256 c2ba6df2c3b68c39c7ba6ab81d23388e515bf9c9095bd0e6ed9df03c36625312 files/digest-conky-1.3.4-r2 64
@@ -40,10 +40,3 @@ SHA256 6952b4756e2d59d34d00896b6e1a53d6514993dd0b53312c9b464ac9ba91b4b8 files/po
MD5 32bd4230c3ee12a8d5502d4bd57a9a3d metadata.xml 588
RMD160 b40ff9a4903b330dcef016836e32f78709f10d0a metadata.xml 588
SHA256 6cf91473c528b64d87041a3088f4930e270349ebdebd3c6dca06dc4943370b5a metadata.xml 588
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEPBTomdTrptrqvGERAocIAJ0b+Df3w7mA9Ge4eRGbmT98oqAP9gCeJw5A
-IQhnN6181SMlDSgeU+GeRTk=
-=0Trp
------END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.4.1.ebuild b/app-admin/conky/conky-1.4.1.ebuild
index 898aaba3a703..4680cbb73a82 100644
--- a/app-admin/conky/conky-1.4.1.ebuild
+++ b/app-admin/conky/conky-1.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.1.ebuild,v 1.1 2006/04/11 20:34:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.1.ebuild,v 1.2 2006/04/12 10:46:59 dragonheart Exp $
inherit eutils
@@ -50,6 +50,12 @@ DEPEND="
sys-apps/grep
sys-apps/sed"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/conky-sigaction.patch
+}
+
src_compile() {
local mymake
diff --git a/app-admin/conky/files/conky-sigaction.patch b/app-admin/conky/files/conky-sigaction.patch
new file mode 100644
index 000000000000..5443b7974da9
--- /dev/null
+++ b/app-admin/conky/files/conky-sigaction.patch
@@ -0,0 +1,14 @@
+Index: src/libmpdclient.c
+===================================================================
+--- src/libmpdclient.c (revision 618)
++++ src/libmpdclient.c (working copy)
+@@ -216,9 +216,6 @@
+ sapipe.sa_handler = mpd_signalHandler;
+ // sapipe.sa_mask = 0;
+ sapipe.sa_flags = 0;
+-#ifdef __linux__
+- sapipe.sa_restorer = NULL;
+-#endif /* __linux__ */
+ sigaction(SIGPIPE,&sapipe,NULL);
+
+ /* connect stuff */