From 622c190e3726404ef9c9b2e377a6aaf22e1f5020 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Thu, 22 Nov 2007 19:38:17 +0000 Subject: [PATCH] Conky 1.4.9 git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@990 7f574dfc-610e-0410-a909-a81674777703 --- ChangeLog | 10 ++++++++-- app-admin/conky/conky-1.4.9.ebuild | 11 ++++++++--- configure.ac.in | 2 +- data/conky.conf | 26 ++++++++++++++++++++++++++ src/audacious.c | 15 ++++++++++----- 5 files changed, 53 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33f76d40..78959f2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ # $Id$ +2007-11-22 + * Conky 1.4.9 released. + +2007-11-18 + * Added Gentoo USE flag audacious-legacy for Audacious legacy support. + 2007-11-16 - * Added support for Audacious 1.4.0 via --enable-audacious=yes|no|legacy: - * (use 'yes' for audacious >= 1.4.0, 'legacy' for prior versions). + * Added support for Audacious 1.4.0 and legacy versions via + --enable-audacious=yes|no|legacy. 2007-11-14 * Fix compilation error with --disable-x11 (bug #1830373). diff --git a/app-admin/conky/conky-1.4.9.ebuild b/app-admin/conky/conky-1.4.9.ebuild index e9a4fbe4..8d4e5b24 100644 --- a/app-admin/conky/conky-1.4.9.ebuild +++ b/app-admin/conky/conky-1.4.9.ebuild @@ -11,8 +11,8 @@ SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" -IUSE="audacious bmpx hddtemp ipv6 mpd rss truetype vim-syntax wifi X" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="audacious audacious-legacy bmpx hddtemp ipv6 mpd rss truetype vim-syntax wifi X" DEPEND_COMMON=" virtual/libc @@ -26,6 +26,7 @@ DEPEND_COMMON=" x11-libs/libXft truetype? ( >=media-libs/freetype-2 ) audacious? ( >=media-sound/audacious-1.4.0 ) + audacious-legacy? ( =sys-apps/dbus-0.35 ) @@ -67,9 +68,13 @@ src_compile() { myconf="${myconf} --disable-x11 --disable-double-buffer --disable-xdamage --disable-own-window" myconf="${myconf} --disable-xft" fi + if useq audacious-legacy; then + myconf="${myconf} --enable-audacious=legacy" + elif useq audacious; then + myconf="${myconf} --enable-audacious" + fi econf \ ${myconf} \ - $(use_enable audacious) \ $(use_enable bmpx) \ $(use_enable hddtemp ) \ $(use_enable mpd) \ diff --git a/configure.ac.in b/configure.ac.in index 7f5fcc5c..fc2c7e79 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -4,7 +4,7 @@ dnl major, minor and micro version macros. m4_define([conky_version_major], [1]) m4_define([conky_version_minor], [4]) m4_define([conky_version_micro], [9]) -m4_define([conky_version_tag], [svn]) dnl [] for releases +m4_define([conky_version_tag], []) dnl [] for releases m4_define([conky_version_revision],[r@REVISION@]) m4_define([conky_version], [conky_version_major().conky_version_minor().conky_version_micro()ifelse( diff --git a/data/conky.conf b/data/conky.conf index 7a0032f7..88a28dfd 100644 --- a/data/conky.conf +++ b/data/conky.conf @@ -1,3 +1,29 @@ +# Conky, a system monitor, based on torsmo +# +# Any original torsmo code is licensed under the BSD license +# +# All code written since the fork of torsmo is licensed under the GPL +# +# Please see COPYING for details +# +# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen +# Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +# All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# $Id$ + alignment bottom_left background no border_width 1 diff --git a/src/audacious.c b/src/audacious.c index ea170958..53d7f21b 100644 --- a/src/audacious.c +++ b/src/audacious.c @@ -142,18 +142,18 @@ void *audacious_thread_func(void *pvoid) AUDACIOUS_DBUS_PATH, AUDACIOUS_DBUS_INTERFACE); if (!session) { - CRIT_ERR ("unable to establish dbus proxy"); + CRIT_ERR ("unable to create dbus proxy"); } #endif /* AUDACIOUS_LEGACY */ - /* Loop until the main thread sets the runnable signal to 0i via timed_thread_destroy. */ + /* Loop until the main thread resets the runnable signal. */ while (1) { if (!audacious_remote_is_running (session)) { memset(&items,0,sizeof(items)); strcpy(items[AUDACIOUS_STATUS],"Not running"); - goto next_iter; + goto bottom; } /* Player status */ @@ -218,14 +218,19 @@ void *audacious_thread_func(void *pvoid) snprintf(items[AUDACIOUS_PLAYLIST_POSITION],sizeof(items[AUDACIOUS_PLAYLIST_POSITION])-1, "%d", playpos+1); -next_iter: +bottom: /* Deliver the refreshed items array to audacious_items. */ timed_thread_lock (info.audacious.p_timed_thread); memcpy(&audacious_items,items,sizeof(items)); timed_thread_unlock (info.audacious.p_timed_thread); - if (timed_thread_test (info.audacious.p_timed_thread)) + if (timed_thread_test (info.audacious.p_timed_thread)) { +#ifndef AUDACIOUS_LEGACY + /* release reference to dbus proxy */ + g_object_unref (session); +#endif timed_thread_exit (info.audacious.p_timed_thread); + } } }