summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2005-03-28 20:50:07 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2005-03-28 20:50:07 +0000
commit7a32004e72337d67cdb4846f396b33907c11ca29 (patch)
treec87a8fc1b6f2eebe8526b24319fee406642d6b0e /app-misc/workrave/files
parentUse pkg_setup instead of pkg_preinst. Duh on my part. (diff)
downloadgentoo-2-7a32004e72337d67cdb4846f396b33907c11ca29.tar.gz
gentoo-2-7a32004e72337d67cdb4846f396b33907c11ca29.tar.bz2
gentoo-2-7a32004e72337d67cdb4846f396b33907c11ca29.zip
New patch to fix bug #86939
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-misc/workrave/files')
-rw-r--r--app-misc/workrave/files/workrave-1.6.2-nls_macros.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch b/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch
new file mode 100644
index 000000000000..0a72400da1e2
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.6.2-nls_macros.patch
@@ -0,0 +1,63 @@
+diff -NurdB workrave-1.6.2-orig/common/include/nls.h workrave-1.6.2/common/include/nls.h
+--- workrave-1.6.2-orig/common/include/nls.h 2005-03-28 11:42:00.000000000 -0500
++++ workrave-1.6.2/common/include/nls.h 2005-03-28 14:40:17.000000000 -0500
+@@ -27,28 +27,23 @@
+
+ #include <glib/glist.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 -NurdB workrave-1.6.2-orig/frontend/gtkmm/src/RemoteControl.cc workrave-1.6.2/frontend/gtkmm/src/RemoteControl.cc
+--- workrave-1.6.2-orig/frontend/gtkmm/src/RemoteControl.cc 2005-03-28 11:42:00.000000000 -0500
++++ workrave-1.6.2/frontend/gtkmm/src/RemoteControl.cc 2005-03-28 15:17:39.000000000 -0500
+@@ -22,12 +22,12 @@
+
+ #include "debug.hh"
+
+-#include "RemoteControl.hh"
+
+ #include "GUI.hh"
+ #include "AppletWindow.hh"
+
+ #include "Menus.hh"
++#include "RemoteControl.hh"
+
+ WR_INIT()
+