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

(Portage version: 2.2_rc18/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 98 insertions, 4 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/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
 }