Bump to 1.9.0. Gstreamer support is not enabled because it freezes workrave on my box. Closes bug #236270.

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

8 files changed, 318 insertions, 1 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index 82d09c9ba852..c888985f5f7c 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,6 +1,16 @@
 # 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.55 2008/11/04 00:13:28 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.56 2008/11/22 14:50:49 eva Exp $
+
+*workrave-1.9.0 (22 Nov 2008)
+
+  22 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +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-gui.xml, +files/workrave-1.9.0-parallel-make.patch,
+  +files/workrave-1.9.0-service.in, +workrave-1.9.0.ebuild:
+  Bump to 1.9.0. Gstreamer support is not enabled because it freezes
+  workrave on my box. Closes bug #236270.
 
   04 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
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
new file mode 100644
index 000000000000..04ebafec4437
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch
@@ -0,0 +1,46 @@
+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
new file mode 100644
index 000000000000..c1149888147a
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml
@@ -0,0 +1,24 @@
+<?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
new file mode 100644
index 000000000000..af4783803ae5
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.0-gcc43.patch
@@ -0,0 +1,30 @@
+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-gui.xml b/app-misc/workrave/files/workrave-1.9.0-gui.xml
new file mode 100644
index 000000000000..585657922b51
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.0-gui.xml
@@ -0,0 +1,68 @@
+<?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-parallel-make.patch b/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch
new file mode 100644
index 000000000000..97b4320c9d92
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000000..9a32690e8e2e
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.9.0-service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.workrave.Workrave.Activator
+Exec=@workravebindir@/workrave
diff --git a/app-misc/workrave/workrave-1.9.0.ebuild b/app-misc/workrave/workrave-1.9.0.ebuild
new file mode 100644
index 000000000000..71fe078fd860
--- /dev/null
+++ b/app-misc/workrave/workrave-1.9.0.ebuild
@@ -0,0 +1,101 @@
+# 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 $
+
+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="arts dbus distribution gnome kde 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 )
+	kde? (
+		=x11-libs/qt-3*
+		=kde-base/kdelibs-3* )
+	arts? ( kde-base/arts )
+
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXt
+	x11-libs/libXmu"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/recordproto
+
+	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)
+		$(use_enable kde)
+		$(use_enable nls)
+		$(use_enable xml)
+		$(use_with 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 file 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"
+
+	# Fix compilation with USE="-distribution"
+	epatch "${FILESDIR}/${P}-compilation-fixes.patch"
+
+	# Fix parallel make issues ?
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	if use kde; then
+		addwrite "/usr/qt/3/etc/settings"
+		export KDEDIR=$(kde-config --prefix)
+		einfo "KDEDIR set to ${KDEDIR}"
+	fi
+
+	gnome2_src_compile
+}