Revision bump fixing bug 316637 and remove old testing

(Portage version: 2.1.8.3/cvs/Linux x86_64)

12 files changed, 46 insertions, 396 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index 65f4700d333a..1f86df7065ca 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-misc/workrave
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.61 2010/03/04 21:39:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.62 2010/06/16 16:09:15 pacho Exp $
+
+*workrave-1.9.1-r1 (16 Jun 2010)
+
+  16 Jun 2010; Pacho Ramos <pacho@gentoo.org> -workrave-1.9.0.ebuild,
+  -files/workrave-1.9.0-compilation-fixes.patch,
+  -files/workrave-1.9.0-dbus-glib.xml, -files/workrave-1.9.0-gcc43.patch,
+  -files/workrave-1.9.0-gcc44.patch, -files/workrave-1.9.0-gui.xml,
+  -files/workrave-1.9.0-nosoundplayer.patch,
+  -files/workrave-1.9.0-parallel-make.patch,
+  -files/workrave-1.9.0-service.in, -workrave-1.9.1.ebuild,
+  +workrave-1.9.1-r1.ebuild, +files/workrave-1.9.1-nogst-crash.patch:
+  Revision bump to include a patch fixing crashes with USE=-gstreamer on
+  some systems (bug #316637; thanks to Joachim Bartosik, Christian
+  Faulhammer and Rob Caelers). Remove old testing.
 
 *workrave-1.9.1 (04 Mar 2010)
 
diff --git a/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch b/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch
deleted file mode 100644
index 04ebafec4437..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: frontend/gtkmm/src/Menus.cc
-===================================================================
---- frontend/gtkmm/src/Menus.cc	(révision 1650)
-+++ frontend/gtkmm/src/Menus.cc	(copie de travail)
-@@ -461,7 +461,7 @@
- #endif
- }
- 
--
-+#ifdef HAVE_DISTRIBUTION
- void
- Menus::on_network_log_response(int response)
- {
-@@ -476,6 +476,7 @@
-   // done by gtkmm ??? delete network_log_dialog;
-   network_log_dialog = NULL;
- }
-+#endif
- 
- void
- Menus::on_statistics_response(int response)
-@@ -534,7 +535,11 @@
-       on_menu_network_leave();
-       break;
-     case MENU_COMMAND_NETWORK_LOG:
-+#ifdef HAVE_DISTRIBUTION
-       on_menu_network_log(network_log_dialog == NULL);
-+#else
-+      on_menu_network_log(true);
-+#endif
-       break;
-     case MENU_COMMAND_NETWORK_RECONNECT:
-       on_menu_network_reconnect();
-@@ -565,7 +570,12 @@
-           ICore *core = CoreFactory::get_core();
- 
-           menus[i]->resync(core->get_operation_mode(),
-+#ifdef HAVE_DISTRIBUTION
-                            network_log_dialog != NULL);
-+#else
-+                           false);
-+#endif
-+
-         }
-     }
- 
diff --git a/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml b/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml
deleted file mode 100644
index c1149888147a..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<node name="/org/workrave/Workrave">
-
-#for interface in $model.interfaces
-  <interface name="$interface.name">
-
-#for method in $interface.methods
-    <method name="$method.qname">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" 
-                  value="$method.csymbol"/>
-     #for p in method.params
-     <arg type="$p.sig()" name="$p.name" direction="$p.direction" />
-     #end for
-    </method>
-#end for
-  
-  </interface>
-
-#end for
-
-</node>
-
-  
diff --git a/app-misc/workrave/files/workrave-1.9.0-gcc43.patch b/app-misc/workrave/files/workrave-1.9.0-gcc43.patch
deleted file mode 100644
index af4783803ae5..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-gcc43.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: frontend/gtkmm/src/GnomeAppletWindow.cc
-===================================================================
---- frontend/gtkmm/src/GnomeAppletWindow.cc	(révision 1650)
-+++ frontend/gtkmm/src/GnomeAppletWindow.cc	(copie de travail)
-@@ -19,6 +19,8 @@
- 
- static const char rcsid[] = "$Id: workrave-1.9.0-gcc43.patch,v 1.1 2008/11/22 14:50:49 eva Exp $";
- 
-+using namespace std;
-+
- #include "preinclude.h"
- 
- #ifdef HAVE_CONFIG_H
-@@ -111,10 +113,14 @@
-               applet_orientation =  (Orientation) applet_control->GetOrientation();
- 
- #ifndef HAVE_EXERCISES
--              applet_control->SetMenuActive("/commands/Exercises", false);
-+              const std::string exercices_command("/commands/Exercises");
-+	      bool exercices_command_status(false);
-+              applet_control->SetMenuActive(exercices_command, exercices_command_status);
- #endif
- #ifndef HAVE_DISTRIBUTION
--              applet_control->SetMenuActive("/commands/Network", false);
-+              const std::string network_command("/commands/Network");
-+	      bool network_command_status(false);
-+              applet_control->SetMenuActive(network_command, network_command_status);
- #endif
-             }
-         }
diff --git a/app-misc/workrave/files/workrave-1.9.0-gcc44.patch b/app-misc/workrave/files/workrave-1.9.0-gcc44.patch
deleted file mode 100644
index f9f6deca2161..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up workrave-1.9.0/backend/src/GlibIniConfigurator.cc.gcc44 workrave-1.9.0/backend/src/GlibIniConfigurator.cc
---- workrave-1.9.0/backend/src/GlibIniConfigurator.cc.gcc44	2008-03-07 22:38:26.000000000 +0100
-+++ workrave-1.9.0/backend/src/GlibIniConfigurator.cc	2009-02-25 23:40:01.000000000 +0100
-@@ -248,7 +248,7 @@ void
- GlibIniConfigurator::split_key(const string &key, string &group, string &out_key) const
- {
-   const char *s = key.c_str();
--  char *slash = strchr(s, '/');
-+  const char *slash = strchr(s, '/');
-   if (slash)
-     {
-       group = key.substr(0, slash-s);
diff --git a/app-misc/workrave/files/workrave-1.9.0-gui.xml b/app-misc/workrave/files/workrave-1.9.0-gui.xml
deleted file mode 100644
index 585657922b51..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-gui.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<unit name="DBusGUI">
-
-  <interface name="org.workrave.ControlInterface" csymbol="Menus">
-    <import>
-      <include name="Menus.hh"/>
-    </import>
-
-    <method name="OpenMain"              csymbol="on_menu_open_main_window"/>
-    <method name="Preferences"           csymbol="on_menu_preferences"/>
-    <method name="NetworkConnect"        csymbol="on_menu_network_join"/>
-    <method name="NetworkLog"            csymbol="on_menu_network_log">
-      <arg type="bool" name="show" direction="in"/>
-    </method>
-    <method name="NetworkReconnect"      csymbol="on_menu_network_reconnect"/>
-    <method name="NetworkDisconnect"     csymbol="on_menu_network_leave"/>
-    <method name="Statistics"            csymbol="on_menu_statistics"/>
-    <method name="Exercises"             csymbol="on_menu_exercises"
- 	                                 condition="defined(HAVE_EXERCISES)"/>
-    <method name="RestBreak"             csymbol="on_menu_restbreak_now"/>
-    <method name="Quit"                  csymbol="on_menu_quit"/>
-    <method name="About"                 csymbol="on_menu_about"/>
-  </interface>
-
-  <interface name="org.workrave.GnomeAppletSupportInterface" csymbol="GnomeAppletWindow"
-             condition="defined(HAVE_GNOME)">
-    <import>
-      <include name="gdk/gdkcolor.h"/>
-      <include name="GnomeAppletWindow.hh"/>
-      <include name="Orientation.hh"/>
-    </import>
-
-    <struct name="Color" csymbol="GdkColor">
-      <field type="uint32" name="pixel"/>
-      <field type="uint32" name="red"/>
-      <field type="uint32" name="green"/>
-      <field type="uint32" name="blue"/>
-    </struct>
-
-    <enum name="Orientation" csymbol="Orientation">
-      <value name="up"    csymbol="ORIENTATION_UP"/>
-      <value name="right" csymbol="ORIENTATION_RIGHT"/>
-      <value name="down"  csymbol="ORIENTATION_DOWN"/>
-      <value name="left"  csymbol="ORIENTATION_LEFT"/>
-    </enum>
-
-    <method name="SetOrientation" csymbol="set_applet_orientation">
-      <arg type="Orientation" name="orientation" direction="in"/>
-    </method>
-      
-    <method name="SetSize" csymbol="set_applet_size">
-      <arg type="uint32" name="size" direction="in"/>
-    </method>
-      
-    <method name="SetBackground" csymbol="set_applet_background">
-      <arg type="uint32" name="type" direction="in"/>
-      <arg type="Color" name="color" direction="in"/>
-      <arg type="uint32" name="xid" direction="in"/>
-    </method>
-
-    <method name="ButtonClicked" csymbol="button_clicked">
-      <arg type="uint32" name="button" direction="in"/>
-    </method>
-
-    <method name="EmbedRequest" csymbol="fire_gnome_applet"/>
-  </interface>
-</unit>
diff --git a/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch b/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch
deleted file mode 100644
index 40fdf28b1a2c..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch
+++ /dev/null
@@ -1,86 +0,0 @@
----
- 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/files/workrave-1.9.0-parallel-make.patch b/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch
deleted file mode 100644
index 97b4320c9d92..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: frontend/gtkmm/src/Makefile.am
-===================================================================
---- frontend/gtkmm/src/Makefile.am	(révision 1650)
-+++ frontend/gtkmm/src/Makefile.am	(copie de travail)
-@@ -119,7 +119,7 @@
- 
- includesinput = 	-I$(top_srcdir)/common/win32/harpoon/include
- WIN32LIBS = 		-L$(top_builddir)/common/win32/harpoon/src/Release/ -lharpoon \
--			${top_srcdir}/frontend/gtkmm/src/win32/libworkrave-frontend-gtkmm-win32.la \
-+			$(top_builddir)/frontend/gtkmm/src/win32/libworkrave-frontend-gtkmm-win32.la \
- 			-lshell32 -lole32 -lwinmm -lshlwapi
- endif
- 
-@@ -130,7 +130,7 @@
- if PLATFORM_OS_OSX
- includesosx  = 		-I$(top_srcdir)/frontend/gtkmm/src/osx
- ldflags =	 	-L$(top_builddir)/frontend/gtkmm/src/osx
--OSXLIBS	=		${top_srcdir}/frontend/gtkmm/src/osx/libworkrave-frontend-gtkmm-osx.la
-+OSXLIBS	=		$(top_builddir)/frontend/gtkmm/src/osx/libworkrave-frontend-gtkmm-osx.la
- extrasources +=		
- endif
- 
-@@ -277,9 +277,9 @@
- 
- endif
- 
--$(bin_PROGRAMS):	${top_srcdir}/backend/src/libworkrave-backend.la \
--			${top_srcdir}/common/src/libworkrave-common.la \
--			${top_srcdir}/frontend/common/src/libworkrave-frontend-common.la
-+$(bin_PROGRAMS):	$(top_builddir)/backend/src/libworkrave-backend.la \
-+			$(top_builddir)/common/src/libworkrave-common.la \
-+			$(top_builddir)/frontend/common/src/libworkrave-frontend-common.la
- 
- workrave_LDFLAGS = 	@WR_LDFLAGS@ ${ldflags}
- 
diff --git a/app-misc/workrave/files/workrave-1.9.0-service.in b/app-misc/workrave/files/workrave-1.9.0-service.in
deleted file mode 100644
index 9a32690e8e2e..000000000000
--- a/app-misc/workrave/files/workrave-1.9.0-service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.workrave.Workrave.Activator
-Exec=@workravebindir@/workrave
diff --git a/app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch b/app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch
new file mode 100644
index 000000000000..95fc690dc1a0
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.1-nogst-crash.patch
@@ -0,0 +1,27 @@
+--- frontend/common/src/SoundPlayer.cc.orig	2010-06-16 10:49:11.000000000 +0200
++++ frontend/common/src/SoundPlayer.cc	2010-06-16 10:54:04.000000000 +0200
+@@ -334,8 +334,11 @@
+ void
+ SoundPlayer::init()
+ {
+-  driver->init();
+-  register_sound_events();
++  if (driver != NULL)
++  {
++    driver->init();
++    register_sound_events();
++  }
+ }
+ 
+ void
+@@ -405,6 +408,10 @@
+ void
+ SoundPlayer::sync_settings()
+ {
++  if (driver == NULL)
++    {
++      return;
++    }
+   if (driver != NULL)
+     {
+       for (unsigned int i = 0; i < sizeof(sound_registry)/sizeof(sound_registry[0]); i++)
diff --git a/app-misc/workrave/workrave-1.9.0.ebuild b/app-misc/workrave/workrave-1.9.0.ebuild
deleted file mode 100644
index de02b3240c38..000000000000
--- a/app-misc/workrave/workrave-1.9.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 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.5 2009/11/20 17:04:13 ssuominen Exp $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
-HOMEPAGE="http://workrave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus distribution gnome nls xml"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2.6
-	>=dev-cpp/gtkmm-2.4
-	>=dev-cpp/glibmm-2.4
-	>=dev-libs/libsigc++-2
-	gnome? (
-		>=gnome-base/libgnomeui-2
-		>=dev-cpp/libgnomeuimm-2.6
-		>=gnome-base/gnome-panel-2.0.10
-		>=gnome-base/libbonobo-2
-		>=gnome-base/orbit-2.8.3 )
-	distribution? ( >=net-libs/gnet-2 )
-	dbus? (
-		>=sys-apps/dbus-1.0
-		dev-libs/dbus-glib )
-	xml? ( dev-libs/gdome2 )
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libXmu"
-
-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
-#	gstreamer? (
-#		>=media-libs/gstreamer-0.10 )
-
-DOCS="AUTHORS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="--enable-gconf
-		--disable-gstreamer
-		$(use_enable dbus)
-		$(use_enable distribution)
-		$(use_enable gnome)
-		$(use_enable gnome gnomemm)
-		--disable-kde
-		$(use_enable nls)
-		$(use_enable xml)
-		--without-arts"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix intltool tests
-	echo "frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in" >> po/POTFILES.skip
-	echo "intl/plural.c" >> po/POTFILES.skip
-
-	# 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"
-
-	# Fix compilation with gcc-4
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-
-	# Fix compilation with USE="-distribution"
-	epatch "${FILESDIR}/${P}-compilation-fixes.patch"
-
-	# 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
-}
diff --git a/app-misc/workrave/workrave-1.9.1.ebuild b/app-misc/workrave/workrave-1.9.1-r1.ebuild
index 74656f0b6aa5..34ae063ed4e7 100644
--- a/app-misc/workrave/workrave-1.9.1.ebuild
+++ b/app-misc/workrave/workrave-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.1.ebuild,v 1.1 2010/03/04 21:39:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.9.1-r1.ebuild,v 1.1 2010/06/16 16:09:15 pacho Exp $
 
 EAPI="2"
 
@@ -73,4 +73,7 @@ src_prepare() {
 
 	# Fix intltool tests
 	echo "frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in" >> po/POTFILES.skip
+
+	# Fix crash when building without gstreamer support; bug #316637
+	epatch "${FILESDIR}/${P}-nogst-crash.patch"
 }