New release: 1.8.4

Package-Manager: portage-2.1.2.2

4 files changed, 87 insertions, 0 deletions

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