Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-11 18:38:45 +00:00
Code Issues Releases Activity

xmms2 patch

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@643 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2006-05-18 00:22:39 +00:00
parent ddceb70cab
commit cda929a1e1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app-admin/conky/conky-1.4.2.ebuild
View File

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
LICENSE="BSD" LICENSE="BSD"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="truetype X ipv6 bmpx bmp xmms infopipe audacious" IUSE="truetype X ipv6 bmpx bmp xmms xmms2 infopipe audacious"
DEPEND_COMMON=" DEPEND_COMMON="
virtual/libc virtual/libc
@ -33,6 +33,7 @@ DEPEND_COMMON="
audacious? ( media-sound/audacious ) audacious? ( media-sound/audacious )
infopipe? ( media-plugins/xmms-infopipe ) infopipe? ( media-plugins/xmms-infopipe )
xmms? ( media-sound/xmms ) xmms? ( media-sound/xmms )
xmms2? ( medis-sound/xmms2 )
)" )"
RDEPEND="${DEPEND_COMMON}" RDEPEND="${DEPEND_COMMON}"
@ -72,6 +73,7 @@ src_compile() {
$(use_enable bmpx) \ $(use_enable bmpx) \
$(use_enable bmp) \ $(use_enable bmp) \
$(use_enable xmms) \ $(use_enable xmms) \
$(use_enable xmms2) \
$(use_enable audacious) \ $(use_enable audacious) \
$(use_enable infopipe) \ $(use_enable infopipe) \
$(use_enable !ipv6 portmon) || die "econf failed" $(use_enable !ipv6 portmon) || die "econf failed"

6
src/conky.c
View File

@ -3248,13 +3248,13 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
OBJ(diskio) { OBJ(diskio) {
if (!use_spacer) { if (!use_spacer) {
if (diskio_value > 1024*1024) { if (diskio_value > 1024*1024) {
snprintf(p, p_max_size, "%.1fG", snprintf(p, p_max_size, "%.1fGiB",
(double)diskio_value/1024/1024); (double)diskio_value/1024/1024);
} else if (diskio_value > 1024) { } else if (diskio_value > 1024) {
snprintf(p, p_max_size, "%.1fM", snprintf(p, p_max_size, "%.1fMiB",
(double)diskio_value/1024); (double)diskio_value/1024);
} else if (diskio_value > 0) { } else if (diskio_value > 0) {
snprintf(p, p_max_size, "%dK", diskio_value); snprintf(p, p_max_size, "%dKiB", diskio_value);
} else { } else {
snprintf(p, p_max_size, "%d", diskio_value); snprintf(p, p_max_size, "%d", diskio_value);
} }