Version bump.

5 files changed, 159 insertions, 3 deletions

diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog
index f89cc3d6344f..c5f5b23bd7f2 100644
--- a/app-misc/workrave/ChangeLog
+++ b/app-misc/workrave/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for app-misc/workrave
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.10 2003/11/06 15:07:19 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.11 2003/11/06 20:01:22 leonardop Exp $
 
+*workrave-1.4.1 (06 Nov 2003)
+
+  06 Nov 2003; L. Boshell <leonardop@gentoo.org> workrave-1.4.1.ebuild,
+  files//workrave-1.4.1-gcc2_fixes.patch:
+  Version bump. Updated patch to make it compile under gcc-2.
+  
   06 Nov 2003; L. Boshell <leonardop@gentoo.org> workrave-1.4.0-r1.ebuild:
   New corrections from bug #31662. Gconf should be the primary method for
   data persistence.
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 963eba8408c3..8563efb625d0 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,13 +1,14 @@
-MD5 3a766d752a63f51b25b2287a2d88d767 ChangeLog 1632
+MD5 ac8e2152be1c38283921bc61b9e57ffb ChangeLog 1842
 MD5 80c52743a9a0fa5e38fff1e7463fc9dd workrave-1.0.0.ebuild 1013
 MD5 cc5c432bc40bd47f5ae7f5fb15fc4380 workrave-1.2.2.ebuild 1324
 MD5 ffcad1d8e958149e36b9d2c454ed008f workrave-1.4.0.ebuild 1686
 MD5 e21b761e9608e48690d845f3ecd264c6 workrave-1.4.0-r1.ebuild 2275
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 831ce2fcf18dfa4577e46e6f3f98b113 workrave-1.4.1.ebuild 2099
+MD5 d0cbdce78b89fdec6cbb00160d7bdb27 workrave-1.4.1.ebuild 2095
 MD5 eee2df47107a2d3cb227075415706c59 files/digest-workrave-1.0.0 66
 MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0-r1 66
 MD5 5c5d367dc02b77f1af5c9fe0b0bddf6f files/digest-workrave-1.2.2 66
 MD5 bc9d7939a5ed8b03c2c327360e7b1c43 files/digest-workrave-1.4.0 66
 MD5 27bae5033a65f662821f75b0f95f252b files/workrave-1.4.0-gcc2_fixes.patch 899
 MD5 1b31fa48ef903e83bf7aa9edeb3c38ae files/digest-workrave-1.4.1 66
+MD5 1916d0da66305260c2926ef7d68f4510 files/workrave-1.4.1-gcc2_fixes.patch 2585
diff --git a/app-misc/workrave/files/digest-workrave-1.4.1 b/app-misc/workrave/files/digest-workrave-1.4.1
new file mode 100644
index 000000000000..926b52d3b6d7
--- /dev/null
+++ b/app-misc/workrave/files/digest-workrave-1.4.1
@@ -0,0 +1 @@
+MD5 68f9cbb2b20e4295abed174c51d018b5 workrave-1.4.1.tar.gz 987241
diff --git a/app-misc/workrave/files/workrave-1.4.1-gcc2_fixes.patch b/app-misc/workrave/files/workrave-1.4.1-gcc2_fixes.patch
new file mode 100644
index 000000000000..708475f3152e
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.4.1-gcc2_fixes.patch
@@ -0,0 +1,66 @@
+diff -NurB workrave-1.4.1-orig/src/app/gtkmm/AppletWindow.cc workrave-1.4.1/src/app/gtkmm/AppletWindow.cc
+--- workrave-1.4.1-orig/src/app/gtkmm/AppletWindow.cc	2003-11-06 11:29:43.000000000 -0500
++++ workrave-1.4.1/src/app/gtkmm/AppletWindow.cc	2003-11-06 14:20:59.000000000 -0500
+@@ -40,6 +40,7 @@
+ #include "ConfiguratorInterface.hh"
+ #include "CoreInterface.hh"
+ #include "CoreFactory.hh"
++#include <gtkmm/eventbox.h>
+ 
+ 
+ //! Constructor.
+diff -NurB workrave-1.4.1-orig/src/app/gtkmm/gnome_applet/WorkraveApplet.c workrave-1.4.1/src/app/gtkmm/gnome_applet/WorkraveApplet.c
+--- workrave-1.4.1-orig/src/app/gtkmm/gnome_applet/WorkraveApplet.c	2003-11-06 11:29:43.000000000 -0500
++++ workrave-1.4.1/src/app/gtkmm/gnome_applet/WorkraveApplet.c	2003-11-06 11:30:57.000000000 -0500
+@@ -850,6 +850,7 @@
+   GdkPixbuf *pixbuf = NULL;
+   GtkWidget *hbox = NULL;
+   BonoboUIComponent *ui = NULL;
++  GtkWidget *event_box = NULL;
+   
+   // Create menus.
+   panel_applet_setup_menu_from_file(applet, NULL, "GNOME_WorkraveApplet.xml", NULL,
+@@ -863,7 +864,7 @@
+   bonobo_ui_component_add_listener(ui, "Quiet", mode_callback, NULL);
+ 
+   // Eventbox
+-  GtkWidget *event_box = gtk_event_box_new();
++  event_box = gtk_event_box_new();
+   applet_control->event_box = event_box;
+   gtk_widget_set_events(event_box, gtk_widget_get_events(event_box) | GDK_BUTTON_PRESS_MASK);
+   gtk_widget_show(GTK_WIDGET(event_box));
+diff -NurB workrave-1.4.1-orig/src/app/gtkmm/StatisticsDialog.cc workrave-1.4.1/src/app/gtkmm/StatisticsDialog.cc
+--- workrave-1.4.1-orig/src/app/gtkmm/StatisticsDialog.cc	2003-11-06 11:29:43.000000000 -0500
++++ workrave-1.4.1/src/app/gtkmm/StatisticsDialog.cc	2003-11-06 13:14:35.000000000 -0500
+@@ -35,6 +35,7 @@
+ #include <unistd.h>
+ #include <assert.h>
+ #include <sstream>
++#include <stdio.h>
+ 
+ #include <gtkmm/notebook.h>
+ #include <gtkmm/calendar.h>
+diff -NurB workrave-1.4.1-orig/src/app/shared/Exercise.cc workrave-1.4.1/src/app/shared/Exercise.cc
+--- workrave-1.4.1-orig/src/app/shared/Exercise.cc	2003-11-06 11:29:43.000000000 -0500
++++ workrave-1.4.1/src/app/shared/Exercise.cc	2003-11-06 13:06:58.000000000 -0500
+@@ -28,6 +28,7 @@
+ 
+ #include <unistd.h>
+ #include <assert.h>
++#include <stdio.h>
+ 
+ #include <glib.h>
+ 
+@@ -274,9 +275,11 @@
+ Exercise::parse_exercises(const char *file_name,
+                           std::list<Exercise> &exe)
+ {
++  FILE *stream = NULL;
++  
+   TRACE_ENTER_MSG("ExercisesParser::get_exercises", file_name);
+   
+-  FILE *stream = fopen(file_name, "rb");
++  stream = fopen(file_name, "rb");
+   if (stream)
+     {
+       GMarkupParser parser;
diff --git a/app-misc/workrave/workrave-1.4.1.ebuild b/app-misc/workrave/workrave-1.4.1.ebuild
new file mode 100644
index 000000000000..8cba68708bf3
--- /dev/null
+++ b/app-misc/workrave/workrave-1.4.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.1.ebuild,v 1.1 2003/11/06 20:01:22 leonardop Exp $
+
+IUSE="debug gnome nls xml2"
+# Internal USE flags
+IUSE="${IUSE} no-exercises no-experimental distribution"
+
+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="~x86 ~ppc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=dev-cpp/gtkmm-2
+	>=dev-libs/libsigc++-1.2
+	distribution? ( >=net-libs/gnet-2 )
+	gnome? ( >=gnome-base/libgnomeui-2
+		>=dev-cpp/libgnomeuimm-2
+		>=gnome-base/gnome-panel-2.0.10
+		>=gnome-base/libbonobo-2
+		>=gnome-base/gconf-2 )
+	nls? ( sys-devel/gettext )
+	xml2? ( dev-libs/gdome2 )
+	!xml2? ( !gnome? ( >=gnome-base/gconf-2 ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc2_fixes.patch
+
+	# need to remove the configure specified CFLAGS
+	sed -e "/CFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
+		< configure > configure.sed
+	sed -e "/CXXFLAGS/s/-O2//" -e "/CFLAGS/s/-g//" \
+		< configure.sed > configure
+}
+
+src_compile() {
+	local myconf=""
+
+	use debug           && myconf="${myconf} --enable-debug"
+	use distribution    || myconf="${myconf} --disable-distribution"
+	use nls             || myconf="${myconf} --disable-nls"
+	use no-exercises    || myconf="${myconf} --enable-exercises"
+	use no-experimental && myconf="${myconf} --disable-experimental"
+	use xml2            && myconf="${myconf} --enable-xml"
+
+	if [ `use gnome` ]
+	then
+		myconf="${myconf} --enable-gconf"
+	else
+		myconf="${myconf} --disable-gnome"
+	fi
+
+	if [ ! `use gnome` ] && [ ! `use xml2` ]
+	then
+		myconf="${myconf} --enable-gconf"
+	fi
+
+	econf ${myconf} || die
+
+	# emake will bring nothing but trouble if you're using the `nls' USE
+	# var
+	make || die "Compilation failed"
+}
+
+src_install() {
+	einstall || die
+
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README
+}
+