diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2010-08-15 20:04:40 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2010-08-15 20:04:40 +0000 |
| commit | 10c6a1410facdc3ca9945007e268206a9e06461a (patch) | |
| tree | 262cf10c80050b2889e5c7029415ceac6bbcb0fd /app-admin/conky | |
| parent | Stable on amd64 wrt bug #332045 (diff) | |
| download | historical-10c6a1410facdc3ca9945007e268206a9e06461a.tar.gz historical-10c6a1410facdc3ca9945007e268206a9e06461a.tar.bz2 historical-10c6a1410facdc3ca9945007e268206a9e06461a.zip | |
Add missing patch. Fixes bug #332885, thanks to Neeraj Bhunwal for reporting.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/conky/Manifest | 3 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.8.0-ibm-x.patch | 27 |
3 files changed, 35 insertions, 2 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 4d037e6cd802..155e3ba6752f 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/conky # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.139 2010/08/13 19:30:33 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.140 2010/08/15 20:04:39 billie Exp $ + + 15 Aug 2010; Daniel Pielmeier <billie@gentoo.org> + +files/conky-1.8.0-ibm-x.patch: + Add missing patch. Fixes bug #332885, thanks to Neeraj Bhunwal for + reporting. 13 Aug 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild: Add patch to fix bug #331171. Thanks to Marián Čavojský for the report diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 25488619d247..1558555e06a9 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,4 +1,5 @@ AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a71ebef25 SHA1 d44055c6b4878b189cd5555747611d444cca3b25 SHA256 41ba5c1934992116b792e399064e1d517b7715b5338b8f9d782a0c7dfd96ea52 +AUX conky-1.8.0-ibm-x.patch 723 RMD160 7e3ba5540539232ad96b6882432974c02cf687f8 SHA1 2524266b71ea934e65528c0614496ba05c56f5f1 SHA256 80feec0984fde9e2d114d6fbfdf587fa2163042d1661b07e45516ccf6f4564b1 AUX conky-1.8.0-if-existing.patch 827 RMD160 f04dd3c6423239118b28fb3d6e2a97ddc2a5f599 SHA1 88833bcad141c3a461d6e85739c9f7b318cd45dd SHA256 6a5b0bc9058f4a97cc9377110c4b5350197945fc1f7e7b100619c16438196493 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59 DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb SHA1 3f4e5cc13651fbf94892b079d447a8549818809e SHA256 b3c0a1b0ff90579d48df542a6070adbe67d3926d6d0c66ee12b52b2d5a2c675c @@ -6,5 +7,5 @@ DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 EBUILD conky-1.7.2-r2.ebuild 4115 RMD160 919d049392827b928c262962d13a319fb1b539e9 SHA1 026757ee426bd25a82ff0bef2cccb323d30eafd2 SHA256 6bea285b3344a9888f0b0207d8c3c836252570dcca3e55595e9df88301fe16f1 EBUILD conky-1.8.0-r1.ebuild 3965 RMD160 07fc8a9f34bc7eda8c358b3aac93445dba442625 SHA1 a045a2e771952cb69e1078f428fb544347f6b59a SHA256 5ff216043923ef95458b314f5fca674e215d86518f7fe88e375e4d0a3648e1ab EBUILD conky-1.8.0-r2.ebuild 4079 RMD160 3436ff2c35f2c2b22312ad88c884c54dc543bf70 SHA1 0578cf03fac7e477910b39109c52c50a49a3ed66 SHA256 849d437feaf17da6ca76adefa96c027da81ee6e42ccfcd8d8629a86ee6462819 -MISC ChangeLog 21606 RMD160 5e2f353112e421f0a3dafb874b94b6da27a4e646 SHA1 e53989a0412631796601b937a84029716b8785f7 SHA256 dbc8b74adfb20636526deadccd913d71d531623c90a062a5ac9482f5e5e78c79 +MISC ChangeLog 21775 RMD160 75a67f24db5f09b7aefa4e88047719febbc3aa8e SHA1 2512588a30e3ea869597774b8b30595a57e9d16b SHA256 c83dc59007e9ac1cd59ce375e73fdb1a0ab3ef0dc2918f2353d49fc3f675572e MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9 diff --git a/app-admin/conky/files/conky-1.8.0-ibm-x.patch b/app-admin/conky/files/conky-1.8.0-ibm-x.patch new file mode 100644 index 000000000000..efb8b1166d40 --- /dev/null +++ b/app-admin/conky/files/conky-1.8.0-ibm-x.patch @@ -0,0 +1,27 @@ +From a25985f00b5956e1100900a50986fd89ff560812 Mon Sep 17 00:00:00 2001 +From: Brenden Matthews <brenden@diddyinc.com> +Date: Fri, 13 Aug 2010 10:58:35 -0700 +Subject: [PATCH] Build fix for IBM support when X is disabled. + +See http://bugs.gentoo.org/show_bug.cgi?id=331171 for details. +--- + src/text_object.h | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/text_object.h b/src/text_object.h +index 471f842..52d19e7 100644 +--- a/src/text_object.h ++++ b/src/text_object.h +@@ -140,9 +140,7 @@ enum text_object_type { + OBJ_ibm_volume, + OBJ_ibm_brightness, + OBJ_smapi, +-#ifdef X11 + OBJ_smapi_bat_bar, +-#endif /* X11 */ + OBJ_smapi_bat_perc, + OBJ_smapi_bat_temp, + OBJ_smapi_bat_power, +-- +1.7.0.4 + |