diff options
author | Leonardo Boshell <leonardop@gentoo.org> | 2007-03-16 02:48:57 +0000 |
---|---|---|
committer | Leonardo Boshell <leonardop@gentoo.org> | 2007-03-16 02:48:57 +0000 |
commit | f49d739cc09ab62e09b5b83da3d9c7e3e91389bd (patch) | |
tree | 88dfa33d3bc6208a0917521bb36a8ab09b4e6efc /app-misc | |
parent | Stable for HPPA too. (diff) | |
download | gentoo-2-f49d739cc09ab62e09b5b83da3d9c7e3e91389bd.tar.gz gentoo-2-f49d739cc09ab62e09b5b83da3d9c7e3e91389bd.tar.bz2 gentoo-2-f49d739cc09ab62e09b5b83da3d9c7e3e91389bd.zip |
New release: 1.8.4
(Portage version: 2.1.2.2)
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/workrave/ChangeLog | 12 | ||||
-rw-r--r-- | app-misc/workrave/files/digest-workrave-1.8.4 | 3 | ||||
-rw-r--r-- | app-misc/workrave/files/org.workrave.Workrave.service.in | 3 | ||||
-rw-r--r-- | app-misc/workrave/files/workrave-1.8.4-nls_macros.patch | 64 | ||||
-rw-r--r-- | app-misc/workrave/files/workrave-1.8.4-no_gnome.patch | 17 | ||||
-rw-r--r-- | app-misc/workrave/workrave-1.8.4.ebuild | 87 |
6 files changed, 185 insertions, 1 deletions
diff --git a/app-misc/workrave/ChangeLog b/app-misc/workrave/ChangeLog index af82734d07ec..c3be671b433c 100644 --- a/app-misc/workrave/ChangeLog +++ b/app-misc/workrave/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-misc/workrave # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.44 2007/02/16 23:38:10 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/ChangeLog,v 1.45 2007/03/16 02:48:57 leonardop Exp $ + +*workrave-1.8.4 (16 Mar 2007) + + 16 Mar 2007; Leonardo Boshell <leonardop@gentoo.org> + +files/workrave-1.8.4-nls_macros.patch, + +files/workrave-1.8.4-no_gnome.patch, + +files/org.workrave.Workrave.service.in, +workrave-1.8.4.ebuild: + New release. Re-added 'dbus' USE flag. Dropped virtual/x11 dependency. Added + patch to fix compilation with USE=-gnome. Don't install ChangeLog since + it's an empty document. 16 Feb 2007; Leonardo Boshell <leonardop@gentoo.org> workrave-1.8.3.ebuild: diff --git a/app-misc/workrave/files/digest-workrave-1.8.4 b/app-misc/workrave/files/digest-workrave-1.8.4 new file mode 100644 index 000000000000..b15e308a6504 --- /dev/null +++ b/app-misc/workrave/files/digest-workrave-1.8.4 @@ -0,0 +1,3 @@ +MD5 ddb2d1d86b4adbe00fe662f0015bc6b4 workrave-1.8.4-2.tar.gz 1907721 +RMD160 95498e202d4e4d848b61cfc93b3c8673f6edf4cb workrave-1.8.4-2.tar.gz 1907721 +SHA256 af79f4b11e5a51fc5f0e4c32f92334b0a6f0c04b4d27b1dab40568eb09d016e8 workrave-1.8.4-2.tar.gz 1907721 diff --git a/app-misc/workrave/files/org.workrave.Workrave.service.in b/app-misc/workrave/files/org.workrave.Workrave.service.in new file mode 100644 index 000000000000..ef00d37747d7 --- /dev/null +++ b/app-misc/workrave/files/org.workrave.Workrave.service.in @@ -0,0 +1,3 @@ +[Workrave D-BUS Service] +Name=org.workrave.Workrave +Exec=@bindir@/workrave diff --git a/app-misc/workrave/files/workrave-1.8.4-nls_macros.patch b/app-misc/workrave/files/workrave-1.8.4-nls_macros.patch new file mode 100644 index 000000000000..19ac5da3b78c --- /dev/null +++ b/app-misc/workrave/files/workrave-1.8.4-nls_macros.patch @@ -0,0 +1,64 @@ +diff -NurdpB workrave-1.8.4/common/include/nls.h workrave-1.8.4-patched/common/include/nls.h +--- workrave-1.8.4/common/include/nls.h 2007-03-04 13:56:45.000000000 -0500 ++++ workrave-1.8.4-patched/common/include/nls.h 2007-03-15 17:59:05.000000000 -0500 +@@ -25,28 +25,23 @@ + #ifndef WORKRAVE_NLS_H + #define WORKRAVE_NLS_H + +-#ifdef HAVE_GNOME +-# include <gnome.h> +-#else +-# ifdef ENABLE_NLS +-# include <locale.h> +-# include <libintl.h> +-# define _(String) gettext (String) +-# ifdef gettext_noop +-# define N_(String) gettext_noop (String) +-# else +-# define N_(String) (String) +-# endif ++#ifdef ENABLE_NLS ++# ifdef HAVE_GNOME ++# include <gnome.h> + # else +-/* Stubs that do something close enough. */ +-# define textdomain(String) (String) +-# define gettext(String) (String) +-# define dgettext(Domain,Message) (Message) +-# define dcgettext(Domain,Message,Type) (Message) +-# define bindtextdomain(Domain,Directory) (Domain) +-# define _(String) (String) ++# include <locale.h> ++# include <libintl.h> ++# define _(String) gettext (String) ++# ifdef gettext_noop ++# define N_(String) gettext_noop (String) ++# else + # define N_(String) (String) ++# endif + # endif ++#else ++/* Stubs that do something close enough. */ ++# define _(String) (String) ++# define N_(String) (String) + #endif + + #ifdef __cplusplus +diff -NurdpB workrave-1.8.4/frontend/gtkmm/src/RemoteControl.cc workrave-1.8.4-patched/frontend/gtkmm/src/RemoteControl.cc +--- workrave-1.8.4/frontend/gtkmm/src/RemoteControl.cc 2007-03-04 13:56:38.000000000 -0500 ++++ workrave-1.8.4-patched/frontend/gtkmm/src/RemoteControl.cc 2007-03-15 17:59:43.000000000 -0500 +@@ -22,13 +22,12 @@ static const char rcsid[] = "$Id: Remote + + #include "debug.hh" + +-#include "RemoteControl.hh" +- + #include "GUI.hh" + #include "AppletControl.hh" + #include "GnomeAppletWindow.hh" + + #include "Menus.hh" ++#include "RemoteControl.hh" + + WR_INIT() + diff --git a/app-misc/workrave/files/workrave-1.8.4-no_gnome.patch b/app-misc/workrave/files/workrave-1.8.4-no_gnome.patch new file mode 100644 index 000000000000..0b99c254bcc6 --- /dev/null +++ b/app-misc/workrave/files/workrave-1.8.4-no_gnome.patch @@ -0,0 +1,17 @@ +diff -NurdpB workrave-1.8.4/frontend/gtkmm/src/Menus.hh workrave-1.8.4-patched/frontend/gtkmm/src/Menus.hh +--- workrave-1.8.4/frontend/gtkmm/src/Menus.hh 2007-03-05 12:52:07.000000000 -0500 ++++ workrave-1.8.4-patched/frontend/gtkmm/src/Menus.hh 2007-03-15 20:02:11.000000000 -0500 +@@ -186,13 +186,11 @@ Menus::set_main_window(MainWindow *main) + } + + +-#if defined(HAVE_GNOME) || defined(WIN32) + inline Menus * + Menus::get_instance() + { + assert(instance != 0); + return instance; + } +-#endif + + #endif // MENUS_HH diff --git a/app-misc/workrave/workrave-1.8.4.ebuild b/app-misc/workrave/workrave-1.8.4.ebuild new file mode 100644 index 000000000000..dfa4686c038b --- /dev/null +++ b/app-misc/workrave/workrave-1.8.4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.8.4.ebuild,v 1.1 2007/03/16 02:48:57 leonardop Exp $ + +inherit eutils gnome2 + +DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)" +HOMEPAGE="http://workrave.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}-2.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 + >=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-0.92 + dev-libs/dbus-glib ) + xml? ( dev-libs/gdome2 ) + kde? ( + =x11-libs/qt-3* + kde-base/kdelibs ) + arts? ( kde-base/arts ) + + x11-libs/libX11 + 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" + +MAKEOPTS="${MAKEOPTS} -j1" +DOCS="AUTHORS NEWS README TODO" + + +pkg_setup() { + G2CONF="--enable-gconf \ + $(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 + + # Removes a few broken macros. See bug #86939. + epatch "${FILESDIR}/${P}-nls_macros.patch" + + # Fix compilation with USE=-gnome + epatch "${FILESDIR}/${P}-no_gnome.patch" + + # File missing from the tarball + cp "${FILESDIR}"/org.workrave.Workrave.service.in ${S}/backend/src +} + +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 +} |