Fix compilation with no sound framework enabled, bug #249683. Add missing cheetah dependency, bug #251275.

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 104 insertions, 9 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index c888985f5f7c..04426553bbac 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/workrave
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.56 2008/11/22 14:50:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.57 2008/12/27 12:07:55 eva Exp $
+
+  27 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/workrave-1.9.0-nosoundplayer.patch, workrave-1.9.0.ebuild:
+  Fix compilation with no sound framework enabled, bug #249683. Add missing
+  cheetah dependency, bug #251275.
 
 *workrave-1.9.0 (22 Nov 2008)
 
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 9b46831187d7..5daa4c374cfe 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -8,18 +8,19 @@ AUX workrave-1.9.0-compilation-fixes.patch 1095 RMD160 2af461b984ece7b73e825a30f
 AUX workrave-1.9.0-dbus-glib.xml 500 RMD160 bf569a817975d5e70110cf3841b0b47eb354a87f SHA1 3bde8a6c1cff93a15949c8b4a444f9b5cd4e44b9 SHA256 fc2465f6731e365085791576e201e4e84668060832d63b29e36d021588d8f070
 AUX workrave-1.9.0-gcc43.patch 1200 RMD160 4a2e94ebf7db7a24e0a8dcfcfa4ea8c3339863aa SHA1 0afe685af31f24b0ccdbd2fa8749d1fb6a6a74f4 SHA256 fc8f0e1160b53c06766986cfbeb2588460cae44467a5b7d5dac8dda7470fba90
 AUX workrave-1.9.0-gui.xml 2682 RMD160 10a3529edec1308d50763f9324f7123368e2034b SHA1 89f0b56281104b78e256d0c904236c8e7a868fd6 SHA256 4e1245d5f379a52f7b7aa0cda2da49374dbcd83f6556d4520a971e9b7bfb41f0
+AUX workrave-1.9.0-nosoundplayer.patch 2161 RMD160 7bf47d0d310c7b1f5401e23939fcd7969dfc66df SHA1 3d11721a4a96e5d9cbd5abd2b66646dee88d24a3 SHA256 d61f5d0d7ce8d87af13c460d3449bc41dcd27b47a5729c1cc4e18a707f295b0e
 AUX workrave-1.9.0-parallel-make.patch 1404 RMD160 a45d30bbfcf5b910a6f792a68e1a5dd1dda22985 SHA1 7251471e6d45e4603d95fbd16019a4bfb70d8f52 SHA256 fcc8ad9171b86fc051eb9c785467426c4bc2640423fdae79ba3054c2b0bb4281
 AUX workrave-1.9.0-service.in 84 RMD160 70c6c250a58e48407f818e91e726f6e8f313a7b4 SHA1 ddd63c56530ae44947e849519868c0f494c870cb SHA256 0d6d93cedd6409404d4f4207b55cb744656f139de7361d4383435045a4892caa
 DIST workrave-1.8.5.tar.gz 1940651 RMD160 306364cbae2a1a4270cbd624864dc111b27ef388 SHA1 d40c3d536f1a37b849fcf8d1e7a6591e043cf19d SHA256 4a2f8f16f015fcec4446953421c8e12cdb41391a6da0e63d04d17b30534a0c56
 DIST workrave-1.9.0.tar.gz 6475352 RMD160 80da62dd8166428ce1236d8424da02fe941113d0 SHA1 5b8e697d33fa472cbe2e330ecf8ec70671ec61ed SHA256 ce110dd0b31c98e6fb34fc0cd63d69843a8e97933b9e75e54f173097c22f59ef
 EBUILD workrave-1.8.5.ebuild 2234 RMD160 3597eae811581f4e428b8efab4bf1e47f8e7b8dd SHA1 95bf7bfc7509485d8c3dc9131b4efb52d0ca12a3 SHA256 ef1f7b7a969124e0112deb357c608892c093f7fcda3367a54a1aaba83c0b5acc
-EBUILD workrave-1.9.0.ebuild 2458 RMD160 031016cace0677fca8eb6860291dadb4dc8f9fc3 SHA1 9aac70f3fa6dfe2d7d20246d19c01fc8806e9d99 SHA256 022187db52909babb4edc9fb5b900de674391e450757a282d47ed95a91c7d936
-MISC ChangeLog 8748 RMD160 eea94b77d469e682f2c936b135797ad3d6645350 SHA1 762cb2bfd35ea89218a539177d755658e55b3e1d SHA256 b0881ec303c1675ee6dcb3f079591347bfeebf30e29c7d56e6aac3206fbc5e59
+EBUILD workrave-1.9.0.ebuild 2590 RMD160 ce3399acd32f4d18ffe260af433d2072dfc0e63b SHA1 716290b2b904266b8428c268f8262f35301452e9 SHA256 a3fdc60df72ca44abdcb50241d35a90a7c166ccfa1362e2fb80f741018dfe6fb
+MISC ChangeLog 8982 RMD160 63362c3989a76bea2df909ae22b827ca2b0a084f SHA1 ade5c747adb953e6b5f962e5a3a3ddc23abeac15 SHA256 48cc98aae61b188a49c4c07fbb2325fb4e8169aa35fb96382b0ce81018163905
 MISC metadata.xml 520 RMD160 36e3d789618562107f56faf8171d4c3adcd362ea SHA1 2a3ef0c57f60f739323f6422d9ebc443ed5514b6 SHA256 f614aee5f506fa3a49b3a4e9e8a20940c1b9795eca18c6d444b26048aa1c6fbc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkoKmIACgkQ1fmVwcYIWAaobgCg7bcMpKnAg+YnjbYRfbI9ud/W
-+PkAn15k2WUHR/F3+MotakaMBneNj53X
-=55nt
+iEYEARECAAYFAklWGrAACgkQ1fmVwcYIWAbhZgCfctk93kMMaV6OOZaA6s8mtY9L
+X0IAnjuoX8JwD/C8wVrLRuJ0DAi01IER
+=XpWe
 -----END PGP SIGNATURE-----
diff --git a/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch b/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch
new file mode 100644
index 000000000000..40fdf28b1a2c
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch
@@ -0,0 +1,86 @@
+---
+ frontend/common/src/SoundPlayer.cc |   43 +++++++++++++++++++------------------
+ 1 file changed, 23 insertions(+), 20 deletions(-)
+
+Index: b/frontend/common/src/SoundPlayer.cc
+===================================================================
+--- a/frontend/common/src/SoundPlayer.cc
++++ b/frontend/common/src/SoundPlayer.cc
+@@ -26,37 +26,40 @@ static const char rcsid[] = "$Id: SoundP
+ #include "debug.hh"
+ #include "nls.h"
+ 
++#ifdef HAVE_REALPATH
++#include <limits.h>
++#include <stdlib.h>
++#endif
++
+ #include <list>
+ 
+-#include "SoundPlayer.hh"
+ #include "Thread.hh"
++
+ #include "Sound.hh"
++#include "SoundPlayer.hh"
++#include "ISoundDriver.hh"
+ 
+ #include "IConfigurator.hh"
+ #include "CoreFactory.hh"
+ #include "Util.hh"
+ 
+-#ifdef HAVE_GNOME
++#if defined HAVE_GNOME
+ #include <gdk/gdk.h>
+ #include "GnomeSoundPlayer.hh"
+-#endif
+-#ifdef HAVE_KDE
++#elif defined HAVE_KDE
+ #include "KdeSoundPlayer.hh"
+-#endif
+-#ifdef PLATFORM_OS_UNIX
++#elif defined PLATFORM_OS_UNIX
+ #include <X11/Xlib.h>
+-#endif
+-#ifdef PLATFORM_OS_WIN32
++#elif defined PLATFORM_OS_WIN32
+ #include <windows.h>
+ #include "W32SoundPlayer.hh"
+-#endif
+-#ifdef PLATFORM_OS_OSX
++#elif defined PLATFORM_OS_OSX
+ #include "OSXSoundPlayer.hh"
+-#endif
+-#ifdef HAVE_GSTREAMER
++#elif defined HAVE_GSTREAMER
+ #include "GstSoundPlayer.hh"
+ #endif
+ 
++
+ const char *SoundPlayer::CFG_KEY_SOUND_ENABLED = "sound/enabled";
+ const char *SoundPlayer::CFG_KEY_SOUND_DEVICE = "sound/device";
+ const char *SoundPlayer::CFG_KEY_SOUND_VOLUME = "sound/volume";
+@@ -296,16 +299,16 @@ SpeakerPlayer::run()
+ SoundPlayer::SoundPlayer()
+ {
+   driver =
+-#if defined(PLATFORM_OS_WIN32)
+-     new W32SoundPlayer()
+-#elif defined(HAVE_KDE)
+-     new KdeSoundPlayer()
+-#elif defined(HAVE_GSTREAMER)
+-     new GstSoundPlayer()
+-#elif defined(HAVE_GNOME)
++#if defined HAVE_GNOME
+      new GnomeSoundPlayer()
+-#elif defined(PLATFORM_OS_OSX)
++#elif defined HAVE_KDE
++     new KdeSoundPlayer()
++#elif defined PLATFORM_OS_WIN32
++     new W32SoundPlayer()
++#elif defined PLATFORM_OS_OSX
+      new OSXSoundPlayer()
++#elif defined HAVE_GSTREAMER
++     new GstSoundPlayer()
+ #else
+ #  warning Sound card support disabled.
+      NULL
diff --git a/app-misc/workrave/workrave-1.9.0.ebuild b/app-misc/workrave/workrave-1.9.0.ebuild
index 71fe078fd860..fd13ba6ecdc7 100644
--- a/app-misc/workrave/workrave-1.9.0.ebuild
+++ b/app-misc/workrave/workrave-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.0.ebuild,v 1.1 2008/11/22 14:50:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.0.ebuild,v 1.2 2008/12/27 12:07:55 eva Exp $
 
 inherit autotools eutils gnome2
 
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/inputproto
 	x11-proto/recordproto
-
+	dev-python/cheetah
 	nls? ( sys-devel/gettext )
 	>=dev-util/pkgconfig-0.9"
 # Currently freezes workrave
@@ -73,7 +73,7 @@ src_unpack() {
 	echo "frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in" >> po/POTFILES.skip
 	echo "intl/plural.c" >> po/POTFILES.skip
 
-	# Copy file missing from tarball
+	# Copy files missing from tarball
 	cp "${FILESDIR}/${P}-gui.xml" "${S}/frontend/gtkmm/src/workrave-gui.xml"
 	cp "${FILESDIR}/${P}-dbus-glib.xml" "${S}/common/bin/DBus-glib.xml"
 	cp "${FILESDIR}/${P}-service.in" "${S}/frontend/gtkmm/src/org.workrave.Workrave.service.in"
@@ -87,6 +87,9 @@ src_unpack() {
 	# Fix parallel make issues ?
 	epatch "${FILESDIR}/${P}-parallel-make.patch"
 
+	# Fix compilation with no sound framework enabled, bug #249683
+	epatch "${FILESDIR}/${P}-nosoundplayer.patch"
+
 	eautoreconf
 }