# ChangeLog for app-admin/conky
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.45 2007/02/07 18:55:57 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.46 2007/03/08 12:19:40 dragonheart Exp $
+
+ 08 Mar 2007; Daniel Black <dragonheart@gentoo.org>
+ -files/conky-sigaction.patch, -files/portmon-mpd.patch,
+ -conky-1.4.0-r1.ebuild, -conky-1.4.2.ebuild, -conky-1.4.4.ebuild,
+ conky-1.4.5.ebuild:
+ correct dependencies for USE="-X -ipv6" thanks to Pavel Denisov (bug
+ #169595). Fix for USE=-X thanks to Brenden and Philip and Anthony (bug
+ #166500). Cleanout of old versions
07 Feb 2007; Simon Stelling <blubb@gentoo.org> conky-1.4.5.ebuild:
stable on amd64; bug 158886
-AUX conky-sigaction.patch 408 RMD160 17519cf444661e3c227103fed5b3c1f611f98f8d SHA1 15355cb8bef537b159156cb148b2cfba2956e921 SHA256 59cd8f7a8634f6ec89370db16dff6c75156ada06459bc4725514e8f328546335
-MD5 2ecd81682f750b475c15c805a96b497f files/conky-sigaction.patch 408
-RMD160 17519cf444661e3c227103fed5b3c1f611f98f8d files/conky-sigaction.patch 408
-SHA256 59cd8f7a8634f6ec89370db16dff6c75156ada06459bc4725514e8f328546335 files/conky-sigaction.patch 408
-AUX portmon-mpd.patch 7143 RMD160 fe1ccafec1903de6c9b1db99e8278c06c86be2c9 SHA1 1921ac8589b1cce1f67c58570b75d1c977961c51 SHA256 6952b4756e2d59d34d00896b6e1a53d6514993dd0b53312c9b464ac9ba91b4b8
-MD5 5d84594f42f7e10ad9b8a6bf8617b5bd files/portmon-mpd.patch 7143
-RMD160 fe1ccafec1903de6c9b1db99e8278c06c86be2c9 files/portmon-mpd.patch 7143
-SHA256 6952b4756e2d59d34d00896b6e1a53d6514993dd0b53312c9b464ac9ba91b4b8 files/portmon-mpd.patch 7143
-DIST conky-1.4.0.tar.bz2 361968 RMD160 dceee3ae83fb1aa34473b61bc1a1287bef38d14c SHA1 3f65b59daa825b0f7fab98d59cee0c6b09adf79f SHA256 75480c7cfe1741d7c881e6309e11573b1ce22f9242d35e12f0b3a9d593c6960e
-DIST conky-1.4.2.tar.bz2 400574 RMD160 9622c9e5115dc5bfb6995424cfc66d3a6f90002e SHA1 cef7e9de4530a10b88040289c0024571a76d3d12 SHA256 e792a1ea4f865225e6f9d1e4cafd405745390a09d48d4a8936d4b0556e6e32b2
-DIST conky-1.4.4.tar.bz2 386353 RMD160 15ce90734c7ea9e497b810f12194beca25be1e09 SHA1 f16f22be0ded26e388db455a041159ece00fcc6f SHA256 2986b981fbe1e9c40cc16b4fa58194e7e8e300272633470d264a969a7a9a8140
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST conky-1.4.5.tar.bz2 390741 RMD160 7cc3690a78c562e7997e0e6d4b7342246be53d25 SHA1 27a2ae320fb4ced5c3c6873cce418dfe5f3dd369 SHA256 beb77ec55399dfa65f76330ba5ff65873028b24f3a768f4780e965d9bc5fd63b
-EBUILD conky-1.4.0-r1.ebuild 2438 RMD160 730c1cf7796290410e20b9f409e38ecbbaf758d2 SHA1 503c09bfa815859c6acaff55c98179e0a4819b20 SHA256 d08dd4edd0a0703dd392f07588230a2c1b46f725cbc0453335be4b810cbb15c7
-MD5 de3e972cd54ace4aab3b77366373b553 conky-1.4.0-r1.ebuild 2438
-RMD160 730c1cf7796290410e20b9f409e38ecbbaf758d2 conky-1.4.0-r1.ebuild 2438
-SHA256 d08dd4edd0a0703dd392f07588230a2c1b46f725cbc0453335be4b810cbb15c7 conky-1.4.0-r1.ebuild 2438
-EBUILD conky-1.4.2.ebuild 2486 RMD160 d4ef04a8f96dbe03a87440fb825af1cc172844a5 SHA1 607cff290f0e9bf01dfcb420ff2f62ff4489c776 SHA256 94ce4c5b277a85453b05244f27e078f2845db0acc0a1d22d8bfd600a7d58993b
-MD5 51282b80e980db1bb2bd6e83df16768d conky-1.4.2.ebuild 2486
-RMD160 d4ef04a8f96dbe03a87440fb825af1cc172844a5 conky-1.4.2.ebuild 2486
-SHA256 94ce4c5b277a85453b05244f27e078f2845db0acc0a1d22d8bfd600a7d58993b conky-1.4.2.ebuild 2486
-EBUILD conky-1.4.4.ebuild 2844 RMD160 ecba16e330f57adfae61b29bdbaa51f53681221a SHA1 2a67c7a1fb0140adf08cee3bbe20f62c94c28216 SHA256 e6a76a3314bc97be2b873b6dbbd929452d54dc939c35019d95e8a1fd418b7469
-MD5 8442c5d89e4525c13b71925cb7a7f475 conky-1.4.4.ebuild 2844
-RMD160 ecba16e330f57adfae61b29bdbaa51f53681221a conky-1.4.4.ebuild 2844
-SHA256 e6a76a3314bc97be2b873b6dbbd929452d54dc939c35019d95e8a1fd418b7469 conky-1.4.4.ebuild 2844
-EBUILD conky-1.4.5.ebuild 2871 RMD160 b1521e1c90bcd6602051dc426c4e87be14f99b16 SHA1 e1cfc468e7edbdb445f14ecc49254a11ca20bf4b SHA256 7c40cff872605a0cb4ae8c8d46c07ac134a70b8bc6d5fa2fe303b0bce129c202
-MD5 20747066dbd5a3d41fb674d540da465a conky-1.4.5.ebuild 2871
-RMD160 b1521e1c90bcd6602051dc426c4e87be14f99b16 conky-1.4.5.ebuild 2871
-SHA256 7c40cff872605a0cb4ae8c8d46c07ac134a70b8bc6d5fa2fe303b0bce129c202 conky-1.4.5.ebuild 2871
-MISC ChangeLog 7467 RMD160 a9f2fb63ce4ea9161a7a47f6764e9ff41c9c4181 SHA1 098d01e45b5948c570d311184759802fc59652e3 SHA256 e2ef23ff1ce509030dbca00fd359647d75a96165637139f1360a898b9315b552
-MD5 15b47e7b9951e088ea118263249c67ac ChangeLog 7467
-RMD160 a9f2fb63ce4ea9161a7a47f6764e9ff41c9c4181 ChangeLog 7467
-SHA256 e2ef23ff1ce509030dbca00fd359647d75a96165637139f1360a898b9315b552 ChangeLog 7467
+EBUILD conky-1.4.5.ebuild 2985 RMD160 666a34dc80db7471c2ec247aeed8f82b85c9b74c SHA1 50e8d3360bd2e1411c1e5ebf74b39dfbe3f921fc SHA256 9ea20b450d8834abd1eb5c94e37822dad4e2b66b92cad90d513ccd24eac6b6b4
+MD5 171be3f2023513cb0c0d6c3e998d1b1d conky-1.4.5.ebuild 2985
+RMD160 666a34dc80db7471c2ec247aeed8f82b85c9b74c conky-1.4.5.ebuild 2985
+SHA256 9ea20b450d8834abd1eb5c94e37822dad4e2b66b92cad90d513ccd24eac6b6b4 conky-1.4.5.ebuild 2985
+MISC ChangeLog 7856 RMD160 4d3541337a09602992b161fc05f306fa45e258e8 SHA1 0e67a1fb6ad2a7f99b2e975ab56e9fedda1a4f8a SHA256 5119a313d42e7793b4fa12363b92e0f1c3492bbf289b808f0d5229ac6aef7d76
+MD5 cf86f928014b707572a576c7777d996d ChangeLog 7856
+RMD160 4d3541337a09602992b161fc05f306fa45e258e8 ChangeLog 7856
+SHA256 5119a313d42e7793b4fa12363b92e0f1c3492bbf289b808f0d5229ac6aef7d76 ChangeLog 7856
MISC metadata.xml 569 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 SHA1 55b29887fc494ea60ff7e6100c3a85857eabf3a7 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b
MD5 03a9b5b9e3a071e3a4f6450a3559735b metadata.xml 569
RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 metadata.xml 569
SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b metadata.xml 569
-MD5 dd1c99f09b0ec583eadca05832f8c5ea files/digest-conky-1.4.0-r1 238
-RMD160 4743c690e8a6d5923fd3a83d25c1f021549978cb files/digest-conky-1.4.0-r1 238
-SHA256 61e0266fd2231aa366ed5009e12d8667da17bc789f026bf0dd082af02853261f files/digest-conky-1.4.0-r1 238
-MD5 8669fb84e545dd83e96aa87a60c83c67 files/digest-conky-1.4.2 238
-RMD160 6ecbeb97f9cd77a1b0b12b604c210b5632b4189f files/digest-conky-1.4.2 238
-SHA256 8d00a420a57f5165242e9e5d7706f84c37922314b23a6ab215405942e49094bd files/digest-conky-1.4.2 238
-MD5 42c1a74f828caba48677de39c2b416ee files/digest-conky-1.4.4 238
-RMD160 8bd0e2d717b75823558442b84dd6ff871460e0c1 files/digest-conky-1.4.4 238
-SHA256 d2e0d992bebabc0de316ad4ace6c8896387107d6529379b79e7ac2fbc874f11d files/digest-conky-1.4.4 238
MD5 642549dcaf7c261ab1debd9bb4bab3e8 files/digest-conky-1.4.5 238
RMD160 098c571e597a6de1ec155fae0803f10e3f70b771 files/digest-conky-1.4.5 238
SHA256 7a976846714021782708e067dcf2f31e998d33a33523468c79a31f1694409f82 files/digest-conky-1.4.5 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF7/90mdTrptrqvGERAl5sAJ4o3tyTFlexCoTnPEGZ4cmsTNo9hACgjgRE
+gCX2jLTnI9Lzx1lcNHrbqtA=
+=d+RA
+-----END PGP SIGNATURE-----
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.0-r1.ebuild,v 1.9 2007/01/24 14:01:15 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="truetype X ipv6 audacious"
-
-DEPEND_COMMON="
- virtual/libc
- X? (
- || ( ( x11-libs/libICE
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libSM
- x11-libs/libXrender
- x11-libs/libXft
- )
- virtual/x11
- )
- truetype? ( >=media-libs/freetype-2 )
- audacious? ( media-sound/audacious )
- )"
-
-RDEPEND="${DEPEND_COMMON}"
-
-DEPEND="
- ${DEPEND_COMMON}
- X? (
- || ( ( x11-libs/libXt
- x11-proto/xextproto
- x11-proto/xproto
- )
- virtual/x11
- )
- )
- sys-apps/grep
- sys-apps/sed"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/portmon-mpd.patch || die "epatch failed"
-}
-
-src_compile() {
- local mymake
- if useq ipv6 ; then
- ewarn
- ewarn "You have the ipv6 USE flag enabled. Please note that"
- ewarn "using the ipv6 USE flag with Conky disables the port"
- ewarn "monitor."
- ewarn
- epause
- else
- mymake="MPD_NO_IPV6=noipv6"
- fi
- local myconf
- myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
- --enable-mpd --enable-mldonkey --disable-bmpx"
- econf \
- ${myconf} \
- --disable-xmms --disable-infopipe \
- $(use_enable truetype xft) \
- $(use_enable X x11) \
- $(use_enable audacious) \
- $(use_enable !ipv6 portmon) || die "econf failed"
- emake ${mymake} || die "compile failed"
-}
-
-src_install() {
- emake DESTDIR=${D} install || die "make install failed"
- dodoc ChangeLog AUTHORS README doc/conkyrc.sample doc/variables.html
- dodoc doc/docs.html doc/config_settings.html
-}
-
-pkg_postinst() {
- elog 'Default configuration file is "~/.conkyrc"'
- elog "you can find a sample configuration file in"
- elog "/usr/share/doc/${PF}/conkyrc.sample.gz"
- elog
- elog "For more info on Conky's new features,"
- elog "please look at the README and ChangeLog:"
- elog "/usr/share/doc/${PF}/README.gz"
- elog "/usr/share/doc/${PF}/ChangeLog.gz"
- elog "There are also pretty html docs available"
- elog "on Conky's site or in /usr/share/doc/${PF}"
- elog
- elog "Check out app-vim/conky-syntax for conkyrc"
- elog "syntax highlighting in Vim"
- elog
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.2.ebuild,v 1.5 2007/01/24 14:01:15 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 bmpx audacious"
-
-DEPEND_COMMON="
- virtual/libc
- X? (
- || ( ( x11-libs/libICE
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libSM
- x11-libs/libXrender
- x11-libs/libXft
- )
- virtual/x11
- )
- truetype? ( >=media-libs/freetype-2 )
- bmpx? ( media-sound/bmpx
- >=sys-apps/dbus-0.35
- )
- audacious? ( media-sound/audacious )
- )"
-
-RDEPEND="${DEPEND_COMMON}"
-
-DEPEND="
- ${DEPEND_COMMON}
- X? (
- || ( ( x11-libs/libXt
- x11-proto/xextproto
- x11-proto/xproto
- )
- virtual/x11
- )
- )
- sys-apps/grep
- sys-apps/sed"
-
-src_compile() {
- local mymake
- if useq ipv6 ; then
- ewarn
- ewarn "You have the ipv6 USE flag enabled. Please note that"
- ewarn "using the ipv6 USE flag with Conky disables the port"
- ewarn "monitor."
- ewarn
- epause
- else
- mymake="MPD_NO_IPV6=noipv6"
- fi
- local myconf
- myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
- --enable-mpd --enable-mldonkey"
- econf \
- ${myconf} \
- --disable-xmms --disable-infopipe \
- $(use_enable truetype xft) \
- $(use_enable X x11) \
- $(use_enable bmpx) \
- $(use_enable audacious) \
- $(use_enable !ipv6 portmon) || die "econf failed"
- emake ${mymake} || die "compile failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
- dodoc ChangeLog AUTHORS README doc/conkyrc.sample
- dohtml doc/docs.html doc/config_settings.html doc/variables.html
-}
-
-pkg_postinst() {
- elog 'Default configuration file is "~/.conkyrc"'
- elog "you can find a sample configuration file in"
- elog "/usr/share/doc/${PF}/conkyrc.sample.gz"
- elog
- elog "For more info on Conky's new features,"
- elog "please look at the README and ChangeLog:"
- elog "/usr/share/doc/${PF}/README.gz"
- elog "/usr/share/doc/${PF}/ChangeLog.gz"
- elog "There are also pretty html docs available"
- elog "on Conky's site or in /usr/share/doc/${PF}"
- elog
- elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
- elog
- elog "Check out app-vim/conky-syntax for conkyrc"
- elog "syntax highlighting in Vim"
- elog
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.4.ebuild,v 1.3 2007/01/24 14:01:15 genone Exp $
-
-inherit eutils
-# used for epause
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 audacious bmpx hddtemp mpd vim-syntax"
-
-DEPEND_COMMON="
- virtual/libc
- X? (
- || ( ( x11-libs/libICE
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libSM
- x11-libs/libXrender
- x11-libs/libXdamage
- x11-libs/libXft
- )
- virtual/x11
- )
- truetype? ( >=media-libs/freetype-2 )
- audacious? ( >=media-sound/audacious-0.1 )
- bmpx? ( media-sound/bmpx
- >=sys-apps/dbus-0.35
- )
- )"
-
-RDEPEND="${DEPEND_COMMON}
- hddtemp? ( app-admin/hddtemp )
- mpd? ( media-sound/mpd )
- vim-syntax? ( || ( app-editors/vim
- app-editors/gvim ) )"
-
-DEPEND="
- ${DEPEND_COMMON}
- X? (
- || ( ( x11-libs/libXt
- x11-proto/xextproto
- x11-proto/xproto
- )
- virtual/x11
- )
- )"
-
-src_compile() {
- local mymake
- if useq ipv6 ; then
- ewarn
- ewarn "You have the ipv6 USE flag enabled. Please note that using"
- ewarn "the ipv6 USE flag with Conky disables the port monitor."
- epause
- else
- mymake="MPD_NO_IPV6=noipv6"
- fi
- local myconf
- myconf="--enable-own-window --enable-proc-uptime"
- use X && myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage"
- econf \
- ${myconf} \
- $(use_enable truetype xft) \
- $(use_enable audacious) \
- $(use_enable bmpx) \
- $(use_enable hddtemp ) \
- $(use_enable mpd) \
- $(use_enable !ipv6 portmon) || die "econf failed"
- emake ${mymake} || die "compile failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc ChangeLog AUTHORS README doc/conkyrc.sample
- dohtml doc/docs.html doc/config_settings.html doc/variables.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
-}
-
-pkg_postinst() {
- elog 'Default configuration file is "~/.conkyrc"'
- elog "You can find a sample configuration file in"
- elog "/usr/share/doc/${PF}/conkyrc.sample.gz"
- elog
- elog "For more info on Conky's new features,"
- elog "please look at the README and ChangeLog:"
- elog "/usr/share/doc/${PF}/README.gz"
- elog "/usr/share/doc/${PF}/ChangeLog.gz"
- elog "There are also pretty html docs available"
- elog "on Conky's site or in /usr/share/doc/${PF}"
- elog
- elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
- elog
- elog "Vim syntax highlighting for conkyrc now enabled with"
- elog "USE=vim-syntax"
- elog
-}
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.5.ebuild,v 1.7 2007/02/07 18:55:57 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.5.ebuild,v 1.8 2007/03/08 12:19:40 dragonheart Exp $
inherit eutils
# used for epause
bmpx? ( media-sound/bmpx
>=sys-apps/dbus-0.35
)
- !ipv6? ( >=dev-libs/glib-2.0 )
- )"
-
+ )
+ !ipv6? ( >=dev-libs/glib-2.0 )"
RDEPEND="${DEPEND_COMMON}
- hddtemp? ( app-admin/hddtemp )
- mpd? ( media-sound/mpd )
vim-syntax? ( || ( app-editors/vim
- app-editors/gvim ) )"
+ app-editors/gvim ) )"
DEPEND="
${DEPEND_COMMON}
mymake="MPD_NO_IPV6=noipv6"
fi
local myconf
- myconf="--enable-own-window --enable-proc-uptime"
- use X && myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage"
+ myconf="--enable-proc-uptime"
+ if useq X; then
+ myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage --enable-own-window"
+ myconf="${myconf} $(use_enable truetype xft)"
+ else
+ myconf="${myconf} --disable-x11 --disable-double-buffer --disable-xdamage --disable-own-window"
+ myconf="${myconf} --disable-xft"
+ fi
econf \
${myconf} \
- $(use_enable truetype xft) \
$(use_enable audacious) \
$(use_enable bmpx) \
$(use_enable hddtemp ) \
+++ /dev/null
-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 */
+++ /dev/null
-MD5 532e7b8a0d4be31eb8cd29c5dbf92eb5 conky-1.4.0.tar.bz2 361968
-RMD160 dceee3ae83fb1aa34473b61bc1a1287bef38d14c conky-1.4.0.tar.bz2 361968
-SHA256 75480c7cfe1741d7c881e6309e11573b1ce22f9242d35e12f0b3a9d593c6960e conky-1.4.0.tar.bz2 361968
+++ /dev/null
-MD5 050a53bdb359a96421ef3ddf761f143c conky-1.4.2.tar.bz2 400574
-RMD160 9622c9e5115dc5bfb6995424cfc66d3a6f90002e conky-1.4.2.tar.bz2 400574
-SHA256 e792a1ea4f865225e6f9d1e4cafd405745390a09d48d4a8936d4b0556e6e32b2 conky-1.4.2.tar.bz2 400574
+++ /dev/null
-MD5 c856556d4372226f99cf7e9a888e9118 conky-1.4.4.tar.bz2 386353
-RMD160 15ce90734c7ea9e497b810f12194beca25be1e09 conky-1.4.4.tar.bz2 386353
-SHA256 2986b981fbe1e9c40cc16b4fa58194e7e8e300272633470d264a969a7a9a8140 conky-1.4.4.tar.bz2 386353
+++ /dev/null
---- src/libtcp-portmon.c.old 2005-12-05 22:27:16.000000000 -0500
-+++ src/libtcp-portmon.c 2006-02-13 00:22:25.000000000 -0500
-@@ -231,8 +231,8 @@
- p_monitor1 = (tcp_port_monitor_t *)p_data1;
- p_monitor2 = (tcp_port_monitor_t *)p_data2;
-
-- return (p_monitor1->port_range_begin == p_monitor1->port_range_begin &&
-- p_monitor2->port_range_end == p_monitor2->port_range_end);
-+ return (p_monitor1->port_range_begin == p_monitor2->port_range_begin &&
-+ p_monitor1->port_range_end == p_monitor2->port_range_end);
- }
-
- /* ---------------------------------------------------------------------------
---- src/mpd.c.old 2006-02-12 23:11:15.000000000 -0500
-+++ src/mpd.c 2006-02-14 13:23:14.000000000 -0500
-@@ -42,22 +42,14 @@
- current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
- if (current_info->mpd.file == NULL)
- current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
-- strncpy(current_info->mpd.name, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.file, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.artist, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.album, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.title, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.random, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.repeat, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.track, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-+ *current_info->mpd.name=0;
-+ *current_info->mpd.file=0;
-+ *current_info->mpd.artist=0;
-+ *current_info->mpd.album=0;
-+ *current_info->mpd.title=0;
-+ *current_info->mpd.random=0;
-+ *current_info->mpd.repeat=0;
-+ *current_info->mpd.track=0;
- strncpy(current_info->mpd.status, "MPD not responding", TEXT_BUFFER_SIZE - 1);
- current_info->mpd.bitrate = 0;
- current_info->mpd.progress = 0;
-@@ -97,22 +89,14 @@
- current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
- if (current_info->mpd.file == NULL)
- current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
-- strncpy(current_info->mpd.name, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.file, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.artist, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.album, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.title, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.random, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.repeat, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.track, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-+ *current_info->mpd.name=0;
-+ *current_info->mpd.file=0;
-+ *current_info->mpd.artist=0;
-+ *current_info->mpd.album=0;
-+ *current_info->mpd.title=0;
-+ *current_info->mpd.random=0;
-+ *current_info->mpd.repeat=0;
-+ *current_info->mpd.track=0;
- strncpy(current_info->mpd.status, "MPD not responding", TEXT_BUFFER_SIZE - 1);
- current_info->mpd.bitrate = 0;
- current_info->mpd.progress = 0;
-@@ -158,23 +142,15 @@
- current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
- if (current_info->mpd.file == NULL)
- current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
-- strncpy(current_info->mpd.name, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.file, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.artist, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.album, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.title, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.random, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.repeat, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.track, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.status, "Unknown",
-+ *current_info->mpd.name=0;
-+ *current_info->mpd.file=0;
-+ *current_info->mpd.artist=0;
-+ *current_info->mpd.album=0;
-+ *current_info->mpd.title=0;
-+ *current_info->mpd.random=0;
-+ *current_info->mpd.repeat=0;
-+ *current_info->mpd.track=0;
-+ strncpy(current_info->mpd.status, "Stopped",
- TEXT_BUFFER_SIZE - 1);
- }
- if (status->state == MPD_STATUS_STATE_PAUSE) {
-@@ -211,24 +187,15 @@
- current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
- if (current_info->mpd.file == NULL)
- current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
-- strncpy(current_info->mpd.name, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.file, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.artist, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.album, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.title, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.random, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.repeat, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.track, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-- strncpy(current_info->mpd.status, "Unknown",
-- TEXT_BUFFER_SIZE - 1);
-+ *current_info->mpd.name=0;
-+ *current_info->mpd.file=0;
-+ *current_info->mpd.artist=0;
-+ *current_info->mpd.album=0;
-+ *current_info->mpd.title=0;
-+ *current_info->mpd.random=0;
-+ *current_info->mpd.repeat=0;
-+ *current_info->mpd.track=0;
-+ *current_info->mpd.status=0;
- }
- if (status->state == MPD_STATUS_STATE_PLAY ||
- status->state == MPD_STATUS_STATE_PAUSE) {
-@@ -248,14 +215,14 @@
- } else if (status->random == 1) {
- strcpy(current_info->mpd.random, "On");
- } else {
-- strcpy(current_info->mpd.random, "Unknown");
-+ *current_info->mpd.random=0;
- }
- if (status->repeat == 0) {
- strcpy(current_info->mpd.repeat, "Off");
- } else if (status->repeat == 1) {
- strcpy(current_info->mpd.repeat, "On");
- } else {
-- strcpy(current_info->mpd.repeat, "Unknown");
-+ *current_info->mpd.repeat=0;
- }
- }
-
-@@ -292,37 +259,37 @@
- strncpy(current_info->mpd.artist, song->artist,
- TEXT_BUFFER_SIZE - 1);
- } else {
-- strcpy(current_info->mpd.artist, "Unknown");
-+ *current_info->mpd.artist=0;
- }
- if (song->album) {
- strncpy(current_info->mpd.album, song->album,
- TEXT_BUFFER_SIZE - 1);
- } else {
-- strcpy(current_info->mpd.album, "Unknown");
-+ *current_info->mpd.album=0;
- }
- if (song->title) {
- strncpy(current_info->mpd.title, song->title,
- TEXT_BUFFER_SIZE - 1);
- } else {
-- strcpy(current_info->mpd.title, "Unknown");
-+ *current_info->mpd.title=0;
- }
- if (song->track) {
- strncpy(current_info->mpd.track, song->track,
- TEXT_BUFFER_SIZE - 1);
- } else {
-- strcpy(current_info->mpd.track, "Unknown");
-+ *current_info->mpd.track=0;
- }
- if (song->name) {
- strncpy(current_info->mpd.name, song->name,
- TEXT_BUFFER_SIZE - 1);
- } else {
-- strcpy(current_info->mpd.name, "Unknown");
-+ *current_info->mpd.name=0;
- }
- if (song->file) {
- strncpy(current_info->mpd.file,
- song->file, TEXT_BUFFER_SIZE - 1);
- } else {
-- strcpy(current_info->mpd.file, "Unknown");
-+ *current_info->mpd.file=0;
- }
- if (entity != NULL) {
- mpd_freeInfoEntity(entity);
projects / gentoo.git / commitdiff