diff options
| -rw-r--r-- | app-admin/conky/ChangeLog | 11 | ||||
| -rw-r--r-- | app-admin/conky/Manifest | 12 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.9.0-r3.ebuild | 140 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.9.0-apcupsd.patch | 106 |
4 files changed, 263 insertions, 6 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 3e58e5f85b83..6de88ef86cab 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-admin/conky # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.211 2013/09/28 09:35:46 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.212 2013/10/24 17:00:02 billie Exp $ + +*conky-1.9.0-r3 (24 Oct 2013) + + 24 Oct 2013; Daniel Pielmeier <billie@gentoo.org> +conky-1.9.0-r3.ebuild, + +files/conky-1.9.0-apcupsd.patch: + Add patch from Debian to make apcupsd work again. This reverts the apcupsd + code in conky back to version 1.8.1. Upstream is currently idle, so this is + probably the best solution for the time being. This fixes bug #408893. Thanks + to Upendra Ghandi for the report. 28 Sep 2013; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0-r2.ebuild: Add epatch_user. This fixes bug #478482. diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 61ee20967f9a..6ff63883b2e3 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -2,17 +2,19 @@ Hash: SHA256 AUX conky-1.8.1-utf8-scroll.patch 2814 SHA256 ee622cda243c7265915c858b264fc4750a329f5c7e9a29323421a777291acfb7 SHA512 a88c49e83b360949d6450f1fbee22dc6648586f5469f6256581db7c55ba8efc35c01756fa241bfc13df0b44390d36ef72e4250d18a8743d62089e2f57f9f8fbd WHIRLPOOL 951e9b9083033a4d247bfeee12ee4f3da30ae53015c7b8095d587fb544e720c627b951ccee5da418c719a05c9a55b560d6bcb56cdfa5daaa6f50cee1a828327e +AUX conky-1.9.0-apcupsd.patch 2869 SHA256 5ed4d5f36b01c7461c02f17f959cf50911d6a7bcd76649fbe40c6b418f8d19ab SHA512 9a8721ade17c8d622479da8d3d32ed46c160ca4b0c9b7f760fee0af52b4ffd30326471186ff8d29b46e90246c2fc4b705596617bc4ede7ce029422e6c1f01981 WHIRLPOOL 4ba0f0f6fed7207afc5cf79b2b380917168f9ee899d4440c640ed1b63477cf2da715bc4afb4f2456ca70a85b41647643eb4c67ba7423c3dfad0c007cec08d6e6 AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258729df19098836f7f9ace0130b316 SHA512 555a7234933e6967cdf7ee003e46b089f29819891551205ab7d3008037f8c8771473ced3ed3da1009e2041e9d34beb6edca25fb1017f043a824611d439094e0e WHIRLPOOL 64d88b5b94e435cd0473d18fceaa1358dcea1e1d2c5c2de93588351c0e08f6fe3461e4a1d8b470533f1d8fb80c99ec078825d4b7803f7042be5bee74a540791d AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014 AUX conky-1.9.0-update-when-message-count-decreases.patch 2723 SHA256 d47df08331ff381eacfb9729f76135f7e556b51a4d8e2005df789f604b2fed38 SHA512 f4867a37d3874a3b6248d33c176f2178fa1171a16c61789895c4c10419ce28bc766d712ebba9ca7eade2c352331f43466e440f3c787ab879e66d4a60177b6264 WHIRLPOOL ab4fc736098bd6577e75a3670bfd0d39ad9a453fe3fce41716e4c6ed9d6f56f9b22ab2d0589253d9aad4dfe158c1c465588876e15a820c02d9cfdca9a11e68d9 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a EBUILD conky-1.9.0-r2.ebuild 4013 SHA256 ca93f00b03e1ac7d9dd803a9c4d3091b12f8f1c5f5acb34fdf450d8c1cad38e4 SHA512 8e9f71f39e6a56b4ab161a2361481fc9133ab701dd4205cc068aa959499866afd8f476343c84a0c1b5931f9aeca7ef8c96fd18c9c7c229b85c06a0ea0a44b3eb WHIRLPOOL 4dbb2bc47543c1cc5a77f4f1ba336df38d87c13eaa940209e98a2c093b1e21f915bdb46673f5ba81eca8e58cfd5597a8a41544c0e0a29bdb2fec8dd7311133a8 -MISC ChangeLog 31957 SHA256 cc3fc439dba034e51da1d046964d6e73c02bcd3c0c2f679e9068f7e45fd8a224 SHA512 b01131533a551539c2e19d6f690b117e93de7b92e469c6cafb3fcdbb1c8d9615d477b0f9a6b40a2557b7e71b8190c2ff16d3d84aa62c525ed7ab809c476c6863 WHIRLPOOL 58b8881e6750ce0b03388da37a9a1e92c520df197e1c6979663ad5340c7395ea15250c03a8e86c0628b5ba3c927fe1da7feaa4f650b6251e873c9867204e1c8f +EBUILD conky-1.9.0-r3.ebuild 4055 SHA256 4b182f268031cf8b86c8dcaf6e3d4b4a34ee28e27de76c26ed826796f0992921 SHA512 6a35b888d24d9fea0e57cc13005a41ae09d604bad9d90a03cc2be9d2c5b86d672aa29a628429a5cf7a2f57ddd30d2fdee3bca29c7666a0e5105c1cbcbf1d2c07 WHIRLPOOL da2cacbe02548bb84c795928a722fc09da26814bc8158851326f708c5f9d140c2dee705a0e0ad99d49dcf25ed53e9aff6badaf78db620651c9424080ed41b848 +MISC ChangeLog 32372 SHA256 c83f0d992cb4da1d2b4d6db6037e59365876147bd3560d83eeb8f3ebf54b65ab SHA512 43d7f0a80a3c8e115f7aad6b7eece030edfc16dc4d02872a3ec362aec4b9f27295d04f18027867725d9d760182751c94a07ddc8dbd06c015e0b8614d40db89c7 WHIRLPOOL 26df0e3e6d3cce566c28b4744dd321d03614460289c08687d586f27cb88c7ddc84cfe610c349d3c09c8a75b4a3e88dac78e94b046c7941f8730ac995e6768c09 MISC metadata.xml 2065 SHA256 697fdf5628f91d6a489add4bb77b4cf926ac72feb3cf09de0f733e842e7d2a67 SHA512 33ec0b8e3e9098671f2e733115a1e97931757ecb7932814de2e4ba7dfd4e45b15e2eda48a10d0ed97becb27bd45d40ed09f3deb70a09314e3167d665f90bf9ae WHIRLPOOL 58ac38f69259e8d4ea3e41c3f1221537cdabc20e144048065198b1c8044ffd85ad5398346007aad1c46747a6073023a40e04eeebd37cdb006d84d959cc3e246d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJGovcACgkQlcuUeyFa0U3orwCg1lZMmK7pYl6AGB/Kxr9DA55b -ofUAnjTDaMSfOu+x7iwKFxBY/zCJmInP -=aJ7v +iEYEAREIAAYFAlJpUhcACgkQlcuUeyFa0U3QBQCgxBf6OOjGGDhdGFhuYHVJan9p +SaAAoJ+RUFZjUk1ezFgs9iIlydVNgLMr +=Zqwb -----END PGP SIGNATURE----- diff --git a/app-admin/conky/conky-1.9.0-r3.ebuild b/app-admin/conky/conky-1.9.0-r3.ebuild new file mode 100644 index 000000000000..1ffe3f0894ff --- /dev/null +++ b/app-admin/conky/conky-1.9.0-r3.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r3.ebuild,v 1.1 2013/10/24 17:00:02 billie Exp $ + +EAPI=5 + +inherit autotools eutils libtool + +DESCRIPTION="An advanced, highly configurable system monitor for X" +HOMEPAGE="http://conky.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-3 BSD LGPL-2.1 MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2" + +DEPEND_COMMON=" + X? ( + imlib? ( media-libs/imlib2 ) + lua-cairo? ( + >=dev-lua/toluapp-1.0.93 + >=dev-lang/lua-5.1.4-r8 + x11-libs/cairo[X] ) + lua-imlib? ( + >=dev-lua/toluapp-1.0.93 + >=dev-lang/lua-5.1.4-r8 + media-libs/imlib2 ) + nvidia? ( media-video/nvidia-settings ) + truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXext + audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) + xmms2? ( media-sound/xmms2 ) + ) + curl? ( net-misc/curl ) + eve? ( net-misc/curl dev-libs/libxml2 ) + portmon? ( dev-libs/glib ) + lua? ( >=dev-lang/lua-5.1.4-r8 ) + ncurses? ( sys-libs/ncurses ) + rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) + wifi? ( net-wireless/wireless-tools ) + weather-metar? ( net-misc/curl ) + weather-xoap? ( dev-libs/libxml2 net-misc/curl ) + virtual/libiconv + " +RDEPEND=" + ${DEPEND_COMMON} + apcupsd? ( sys-power/apcupsd ) + hddtemp? ( app-admin/hddtemp ) + moc? ( media-sound/moc ) + nano-syntax? ( app-editors/nano ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " +DEPEND=" + ${DEPEND_COMMON} + virtual/pkgconfig + " + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \ + "${FILESDIR}/${P}-ncurses.patch" \ + "${FILESDIR}/${P}-lines-fix.patch" \ + "${FILESDIR}/${P}-update-when-message-count-decreases.patch" \ + "${FILESDIR}/${P}-apcupsd.patch" + + # Allow user patches #478482 + # Only run autotools if user patched something + epatch_user && eautoreconf || elibtoolize +} + +src_configure() { + local myconf + + if use X; then + myconf="--enable-x11 --enable-double-buffer --enable-xdamage" + myconf="${myconf} --enable-argb --enable-own-window" + myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)" + myconf="${myconf} $(use_enable lua-imlib lua-imlib2)" + myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)" + myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)" + else + myconf="--disable-x11 --disable-own-window --disable-argb" + myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft" + myconf="${myconf} --disable-audacious --disable-xmms2" + fi + + econf \ + ${myconf} \ + $(use_enable apcupsd) \ + $(use_enable curl) \ + $(use_enable debug) \ + $(use_enable eve) \ + $(use_enable hddtemp) \ + $(use_enable iostats) \ + $(use_enable lua) \ + $(use_enable thinkpad ibm) \ + $(use_enable math) \ + $(use_enable moc) \ + $(use_enable mpd) \ + $(use_enable ncurses) \ + $(use_enable portmon) \ + $(use_enable rss) \ + $(use_enable weather-metar) \ + $(use_enable weather-xoap) \ + $(use_enable wifi wlan) +} + +src_install() { + default + + dohtml doc/*.html + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/ftdetect + doins "${S}"/extras/vim/ftdetect/conkyrc.vim + + insinto /usr/share/vim/vimfiles/syntax + doins "${S}"/extras/vim/syntax/conkyrc.vim + fi + + if use nano-syntax; then + insinto /usr/share/nano/ + doins "${S}"/extras/nano/conky.nanorc + fi +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "You can find sample configurations at ${ROOT%/}/etc/conky." + elog "To customize, copy to ~/.conkyrc and edit it to your liking." + elog + elog "There are pretty html docs available at the conky homepage" + elog "or in ${ROOT%/}/usr/share/doc/${PF}/html." + elog + elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml" + elog + fi +} diff --git a/app-admin/conky/files/conky-1.9.0-apcupsd.patch b/app-admin/conky/files/conky-1.9.0-apcupsd.patch new file mode 100644 index 000000000000..9161fbcc5ebb --- /dev/null +++ b/app-admin/conky/files/conky-1.9.0-apcupsd.patch @@ -0,0 +1,106 @@ +Description: Fix broken apcupsd support in Conky 1.8.1 + Revert apcupsd-related code to Conky 1.8.0 in order to fix broken apcupsd + support. This is a workaround until upstream properly addresses this issue. +From: Brian Derr <bderrly@gmail.com> +Forwarded: http://sourceforge.net/support/tracker.php?aid=3083859 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/897495 +Last-Update: 2011-12-02 + +--- a/src/apcupsd.c ++++ b/src/apcupsd.c +@@ -154,7 +154,7 @@ + // + // Conky update function for apcupsd data + // +-int update_apcupsd(void) { ++void update_apcupsd(void) { + + int i; + APCUPSD_S apc; +@@ -164,41 +164,44 @@ + memcpy(apc.items[i], "N/A", 4); // including \0 + + do { +- struct addrinfo hints; +- struct addrinfo *ai, *rp; +- int res; ++ struct hostent* he = 0; ++ struct sockaddr_in addr; + short sz = 0; +- char portbuf[8]; ++#ifdef HAVE_GETHOSTBYNAME_R ++ struct hostent he_mem; ++ int he_errno; ++ char hostbuff[2048]; ++#endif + // + // connect to apcupsd daemon + // +- memset(&hints, 0, sizeof(struct addrinfo)); +- hints.ai_family = AF_UNSPEC; +- hints.ai_socktype = SOCK_STREAM; +- hints.ai_flags = 0; +- hints.ai_protocol = 0; +- snprintf(portbuf, 8, "%d", info.apcupsd.port); +- res = getaddrinfo(info.apcupsd.host, portbuf, &hints, &ai); +- if (res != 0) { +- NORM_ERR("APCUPSD getaddrinfo: %s", gai_strerror(res)); ++ sock = socket(AF_INET, SOCK_STREAM, 0); ++ if (sock < 0) { ++ perror("socket"); + break; + } +- for (rp = ai; rp != NULL; rp = rp->ai_next) { +- sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); +- if (sock == -1) { +- continue; +- } +- if (connect(sock, rp->ai_addr, rp->ai_addrlen) != -1) { +- break; +- } +- close(sock); ++#ifdef HAVE_GETHOSTBYNAME_R ++ if (gethostbyname_r(info.apcupsd.host, &he_mem, hostbuff, sizeof(hostbuff), &he, &he_errno) || !he ) { ++ NORM_ERR("APCUPSD gethostbyname_r: %s", hstrerror(h_errno)); ++ break; ++ } ++#else /* HAVE_GETHOSTBYNAME_R */ ++ he = gethostbyname(info.apcupsd.host); ++ if (!he) { ++ herror("gethostbyname"); ++ break; + } +- freeaddrinfo(ai); +- if (rp == NULL) { ++#endif /* HAVE_GETHOSTBYNAME_R */ ++ ++ memset(&addr, 0, sizeof(addr)); ++ addr.sin_family = AF_INET; ++ addr.sin_port = info.apcupsd.port; ++ memcpy(&addr.sin_addr, he->h_addr, he->h_length); ++ if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr)) < 0) { + // no error reporting, the daemon is probably not running + break; + } +- ++ + // + // send status request - "status" - 6B + // +@@ -222,5 +225,5 @@ + // "atomically" copy the data into working set + // + memcpy(info.apcupsd.items, apc.items, sizeof(info.apcupsd.items)); +- return 0; ++ return; + } +--- a/src/apcupsd.h ++++ b/src/apcupsd.h +@@ -49,6 +49,6 @@ + } APCUPSD_S, *PAPCUPSD_S; + + /* Service routine for the conky main thread */ +-int update_apcupsd(void); ++void update_apcupsd(void); + + #endif /*APCUPSD_H_*/ |