Hello community,
here is the log from the commit of package workrave
checked in at Wed Apr 30 01:53:41 CEST 2008.
--------
--- GNOME/workrave/workrave.changes 2007-10-29 16:38:47.000000000 +0100
+++ workrave/workrave.changes 2008-04-30 01:51:09.200548000 +0200
@@ -1,0 +2,10 @@
+Tue Apr 29 13:45:08 CEST 2008 - sbrabec@suse.cz
+
+- Added Fedora patches:
+ * fix locking/unlocking with gnome-screensaver (redhat#207058)
+ * build with gcc-4.3
+ * build GNOME applet with the latest libsigc++2
+- Fixed build of KDE applet with the latest libsigc++2.
+- Added desktop file.
+
+-------------------------------------------------------------------
New:
----
workrave-1.8.5-gcc43.patch
workrave-1.8.5-lock.patch
workrave-1.8.5-sigc.patch
workrave-kde-sigc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ workrave.spec ++++++
--- /var/tmp/diff_new_pack.A29667/_old 2008-04-30 01:51:19.000000000 +0200
+++ /var/tmp/diff_new_pack.A29667/_new 2008-04-30 01:51:19.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package workrave (Version 1.8.5)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,10 +10,11 @@
# norootforbuild
+
Name: workrave
BuildRequires: doxygen fdupes gdome2-devel gnet-devel gnome-panel-devel gnutls-devel intltool kdebase3 kdelibs3-devel kdesdk3 libgnomeprintui-devel libgnomeuimm-devel libidl libwnck-devel perl-XML-Parser
Version: 1.8.5
-Release: 1
+Release: 2
Url: http://www.workrave.org/
Group: Productivity/Other
License: GPL v2 or later
@@ -21,6 +22,10 @@
Source: %{name}-%{version}.tar.bz2
Patch: workrave-implicit-declaration.patch
Patch1: workrave-automake.patch
+Patch2: workrave-1.8.5-sigc.patch
+Patch3: workrave-1.8.5-gcc43.patch
+Patch4: workrave-1.8.5-lock.patch
+Patch5: workrave-kde-sigc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -37,6 +42,7 @@
Raymond Penners
%package gnome
+License: GPL v2 or later
Summary: Assist in the Recovery and Prevention of Repetitive Strain Injury
Group: Productivity/Other
Provides: %name = %version
@@ -56,6 +62,7 @@
%lang_package -n workrave-gnome
%package kde
+License: GPL v2 or later
Summary: Assist in the Recovery and Prevention of Repetitive Strain Injury
Group: Productivity/Other
Requires: kdebase3
@@ -78,6 +85,10 @@
%setup -q -c %{name}-%{version}
%patch
%patch1
+%patch2
+%patch3
+%patch4
+%patch5
cd %{name}-%{version}
# for %%doc
cp -a AUTHORS COPYING NEWS README ..
@@ -142,7 +153,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
# FIXME: Without calling aclocal, translations are incorrectly
# installed.
-rm -rf $RPM_BUILD_ROOT/%{_prefix}/share/locale
+rm -rf $RPM_BUILD_ROOT%{_prefix}/share/locale
# FIXME: Duplicate installation of sounds.
#rm -r $RPM_BUILD_ROOT/opt/kde3/share/sounds/workrave
cp -a $RPM_BUILD_ROOT/opt/kde3/share/locale $RPM_BUILD_ROOT%{_prefix}/share/
@@ -153,6 +164,9 @@
%find_lang %{name}
sed -i /kde/d %{name}.lang
%fdupes $RPM_BUILD_ROOT
+ln -s workrave/workrave-icon-huge.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+# FIXME: I see no better fit than Accessibility in the Desktop Menu Specification:
+%suse_update_desktop_file -c %{name} "Workrave" "Repetitive Strain Injury Recovery and Prevention" %{name} workrave-icon-huge Utility Accessibility
%clean
rm -rf $RPM_BUILD_ROOT
@@ -165,8 +179,10 @@
%{_prefix}/bin/*
%dir %{_prefix}/lib/gnome-applets
%{_prefix}/lib/gnome-applets/workrave-applet
+%{_datadir}/applications/*.desktop
%{_datadir}/gnome-2.0/ui/*.xml
%{_datadir}/pixmaps/workrave
+%{_datadir}/pixmaps/*.png
%{_datadir}/sounds/workrave
%{_datadir}/workrave
%{_datadir}/dbus-1/services/*.service
@@ -183,10 +199,20 @@
/opt/kde3/share/sounds/workrave
/opt/kde3/share/workrave
%{_datadir}/dbus-1/services/*.service
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/*.png
%files kde-lang -f %{name}-%{version}-kde/%{name}.lang
+
%changelog
-* Mon Oct 29 2007 - sbrabec@suse.cz
+* Tue Apr 29 2008 sbrabec@suse.cz
+- Added Fedora patches:
+ * fix locking/unlocking with gnome-screensaver (redhat#207058)
+ * build with gcc-4.3
+ * build GNOME applet with the latest libsigc++2
+- Fixed build of KDE applet with the latest libsigc++2.
+- Added desktop file.
+* Mon Oct 29 2007 sbrabec@suse.cz
- Updated to version 1.8.5:
* Task manager is never blocked by Workrave
* Many bug fixes, the most visible ones:
@@ -201,27 +227,27 @@
* Polish on the applets
* Translations updated
- Fixed gcc 4.3 errors.
-* Thu Oct 11 2007 - sbrabec@suse.cz
+* Thu Oct 11 2007 sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
-* Sun Aug 12 2007 - mrueckert@suse.de
+* Sun Aug 12 2007 mrueckert@suse.de
- switch to %%lang_package -n
- fixed typo in requires of workrave-kde
-* Tue Aug 07 2007 - maw@suse.de
+* Tue Aug 07 2007 maw@suse.de
- Use %%fdupes
- Split off -lang subpackages.
-* Sun Jan 28 2007 - ro@suse.de
+* Mon Jan 29 2007 ro@suse.de
- make it build after GNOME moved to /usr
-* Mon Oct 23 2006 - sbrabec@suse.cz
+* Mon Oct 23 2006 sbrabec@suse.cz
- Updated to version 1.8.3:
* 100%% CPU load fix.
* GNOME screen saver support added.
* The applet popup menu is now accessible when all timers hidden.
* Translations updated.
* Bug fixes.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Dec 23 2005 - ro@suse.de
+* Fri Dec 23 2005 ro@suse.de
- provide main package name in one subpackage
(needed for debuginfo since we do not have a main package here)
-* Thu Dec 15 2005 - sbrabec@suse.cz
+* Thu Dec 15 2005 sbrabec@suse.cz
- New SuSE package, version 1.8.1.
++++++ workrave-1.8.5-gcc43.patch ++++++
diff -up workrave-1.8.5/backend/src/Statistics.cc.gcc43 workrave-1.8.5/backend/src/Statistics.cc
--- workrave-1.8.5/backend/src/Statistics.cc.gcc43 2007-09-14 20:50:38.000000000 +0200
+++ workrave-1.8.5/backend/src/Statistics.cc 2008-02-19 13:01:44.000000000 +0100
@@ -23,6 +23,7 @@ static const char rcsid[] = "$Id: Statis
#include <sstream>
#include
+#include <cstring>
#include "debug.hh"
diff -up workrave-1.8.5/backend/src/GlibIniConfigurator.cc.gcc43 workrave-1.8.5/backend/src/GlibIniConfigurator.cc
--- workrave-1.8.5/backend/src/GlibIniConfigurator.cc.gcc43 2008-02-19 13:01:15.000000000 +0100
+++ workrave-1.8.5/backend/src/GlibIniConfigurator.cc 2008-02-19 13:00:18.000000000 +0100
@@ -29,6 +29,7 @@ static const char rcsid[] = "$Id: GlibIn
#include "GlibIniConfigurator.hh"
#include
+#include <cstring>
GlibIniConfigurator::GlibIniConfigurator()
: config(NULL)
++++++ workrave-1.8.5-lock.patch ++++++
diff -up workrave-1.8.5/frontend/gtkmm/src/WindowHints.cc.lock workrave-1.8.5/frontend/gtkmm/src/WindowHints.cc
--- workrave-1.8.5/frontend/gtkmm/src/WindowHints.cc.lock 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/WindowHints.cc 2008-04-04 10:53:28.000000000 +0200
@@ -185,6 +185,11 @@ WindowHints::grab(int num_windows, GdkWi
// So, let's not waste memory and simply return a bogus non-NULL ptr.
handle = (WindowHints::Grab *) 0xdeadf00d;
}
+ else
+ {
+ gdk_keyboard_ungrab(GDK_CURRENT_TIME);
+ gdk_pointer_ungrab(GDK_CURRENT_TIME);
+ }
}
#elif defined(WIN32)
if (num_windows > 0)
++++++ workrave-1.8.5-sigc.patch ++++++
diff -up workrave-1.8.5/frontend/gtkmm/src/Menus.hh.sigc workrave-1.8.5/frontend/gtkmm/src/Menus.hh
--- workrave-1.8.5/frontend/gtkmm/src/Menus.hh.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/Menus.hh 2008-04-04 14:36:41.000000000 +0200
@@ -21,9 +21,7 @@
#include "config.h"
-#ifdef HAVE_GTKMM24
-#include
-#endif
+#include
#ifdef HAVE_GNOME
#include
@@ -45,7 +43,7 @@ class TimerBoxAppletView;
#include
class Menus :
- public SigC::Object
+ public sigc::trackable
{
public:
Menus();
diff -up workrave-1.8.5/frontend/gtkmm/src/TimeEntry.hh.sigc workrave-1.8.5/frontend/gtkmm/src/TimeEntry.hh
--- workrave-1.8.5/frontend/gtkmm/src/TimeEntry.hh.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/TimeEntry.hh 2008-04-04 14:37:40.000000000 +0200
@@ -38,7 +38,7 @@ public:
time_t get_value();
void set_value(time_t time);
- typedef SigC::Signal0<void> signal_value_changed_t;
+ typedef sigc::signal0<void> signal_value_changed_t;
signal_value_changed_t &signal_value_changed();
protected:
diff -up workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.hh.sigc workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.hh
--- workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.hh.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/X11SystrayAppletWindow.hh 2008-04-04 14:30:44.000000000 +0200
@@ -24,9 +24,7 @@
#include "AppletWindow.hh"
-#ifdef HAVE_GTKMM24
-#include
-#endif
+#include
#include
#include
@@ -40,7 +38,7 @@ class AppletControl;
#include "eggtrayicon.h"
class X11SystrayAppletWindow :
- public SigC::Object,
+ public sigc::trackable,
public AppletWindow
{
public:
diff -up workrave-1.8.5/frontend/gtkmm/src/Dispatcher.cc.sigc workrave-1.8.5/frontend/gtkmm/src/Dispatcher.cc
--- workrave-1.8.5/frontend/gtkmm/src/Dispatcher.cc.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/Dispatcher.cc 2008-04-04 14:54:53.000000000 +0200
@@ -24,9 +24,7 @@ static const char rcsid[] = "$Id: Dispat
#include "preinclude.h"
-#ifdef HAVE_GTKMM24
-#include
-#endif
+#include
#include "Dispatcher.hh"
@@ -100,7 +98,7 @@ Dispatcher::create_thread_pipe()
if (event_handle)
{
queue = g_async_queue_new();
- io_connection = Glib::signal_io().connect(SigC::slot_class(*this, &Dispatcher::io_handler),
+ io_connection = Glib::signal_io().connect(sigc::mem_fun(*this, &Dispatcher::io_handler),
(int)event_handle,
Glib::IO_IN);
@@ -171,7 +169,7 @@ Dispatcher::create_thread_pipe()
fd_set_close_on_exec(receive_fd);
fd_set_close_on_exec(send_fd);
- io_connection = Glib::signal_io().connect(SigC::slot_class(*this, &Dispatcher::io_handler),
+ io_connection = Glib::signal_io().connect(sigc::mem_fun(*this, &Dispatcher::io_handler),
(int)receive_fd,
Glib::IO_IN);
@@ -242,8 +240,8 @@ Dispatcher::io_handler(Glib::IOCondition
#endif
-SigC::Connection
-Dispatcher::connect(const SigC::Slot0<void>& slot)
+sigc::connection
+Dispatcher::connect(const sigc::slot0<void>& slot)
{
return signal.connect(slot);
}
diff -up workrave-1.8.5/frontend/gtkmm/src/Dispatcher.hh.sigc workrave-1.8.5/frontend/gtkmm/src/Dispatcher.hh
--- workrave-1.8.5/frontend/gtkmm/src/Dispatcher.hh.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/Dispatcher.hh 2008-04-04 14:53:11.000000000 +0200
@@ -19,9 +19,7 @@
#ifndef DISPATCHER_HH
#define DISPATCHER_HH
-#ifdef HAVE_GTKMM24
-#include
-#endif
+#include
#include
#include
@@ -52,15 +50,15 @@ private:
#endif
//! I/O Connection
- SigC::Connection io_connection;
+ sigc::connection io_connection;
//!
- SigC::Signal0<void> signal;
+ sigc::signal0<void> signal;
public:
Dispatcher();
~Dispatcher();
- SigC::Connection connect(const SigC::Slot0<void>& slot);
+ sigc::connection connect(const sigc::slot0<void>& slot);
void send_notification();
private:
diff -up workrave-1.8.5/frontend/gtkmm/src/GUI.hh.sigc workrave-1.8.5/frontend/gtkmm/src/GUI.hh
--- workrave-1.8.5/frontend/gtkmm/src/GUI.hh.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/GUI.hh 2008-04-04 14:34:39.000000000 +0200
@@ -21,7 +21,7 @@
#include "preinclude.h"
-#include
+#include
#include
#include
@@ -65,7 +65,7 @@ class IConfigurator;
class GUI :
public IApp,
public CoreEventListener,
- public SigC::Object
+ public sigc::trackable
{
public:
GUI(int argc, char **argv);
@@ -104,7 +104,7 @@ public:
void set_block_mode(BlockMode mode);
// Misc
- SigC::Signal0<void> &signal_heartbeat();
+ sigc::signal0<void> &signal_heartbeat();
HeadInfo &get_head(int head);
int get_number_of_heads() const;
int map_to_head(int &x, int &y);
@@ -214,7 +214,7 @@ private:
Gtk::Tooltips *tooltips;
//! Heartbeat signal
- SigC::Signal0<void> heartbeat_signal;
+ sigc::signal0<void> heartbeat_signal;
//! Destroy break window on next heartbeat?
bool break_window_destroy;
@@ -243,7 +243,7 @@ private:
bool grab_wanted;
//! Connection to the grab retry timeout timer.
- SigC::Connection grab_retry_connection;
+ sigc::connection grab_retry_connection;
#endif
//! Grab
@@ -295,7 +295,7 @@ GUI::get_sound_player() const
}
//! Returns the GUI Heartbeat signal.
-inline SigC::Signal0<void> &
+inline sigc::signal0<void> &
GUI::signal_heartbeat()
{
return heartbeat_signal;
diff -up workrave-1.8.5/frontend/gtkmm/src/Frame.hh.sigc workrave-1.8.5/frontend/gtkmm/src/Frame.hh
--- workrave-1.8.5/frontend/gtkmm/src/Frame.hh.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/Frame.hh 2008-04-04 14:35:39.000000000 +0200
@@ -37,7 +37,7 @@ public:
void set_frame_color(const Gdk::Color &color);
void set_frame_flashing(int delay);
void set_frame_visible(bool visible);
- SigC::Signal1 &signal_flash();
+ sigc::signal1 &signal_flash();
protected:
bool on_timer();
@@ -78,9 +78,9 @@ private:
int flash_delay;
//! Flash timeout signal
- SigC::Connection flash_signal;
+ sigc::connection flash_signal;
//! Flash signal source
- SigC::Signal1 flash_signal_src;
+ sigc::signal1 flash_signal_src;
};
diff -up workrave-1.8.5/frontend/gtkmm/src/Frame.cc.sigc workrave-1.8.5/frontend/gtkmm/src/Frame.cc
--- workrave-1.8.5/frontend/gtkmm/src/Frame.cc.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/Frame.cc 2008-04-04 14:45:58.000000000 +0200
@@ -258,7 +258,7 @@ Frame::on_expose_event(GdkEventExpose* e
return rc;
}
-SigC::Signal1 &
+sigc::signal1 &
Frame::signal_flash()
{
return flash_signal_src;
diff -up workrave-1.8.5/frontend/gtkmm/src/GnomeAppletWindow.hh.sigc workrave-1.8.5/frontend/gtkmm/src/GnomeAppletWindow.hh
--- workrave-1.8.5/frontend/gtkmm/src/GnomeAppletWindow.hh.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/GnomeAppletWindow.hh 2008-04-04 14:20:25.000000000 +0200
@@ -24,9 +24,7 @@
#include "AppletWindow.hh"
-#ifdef HAVE_GTKMM24
-#include
-#endif
+#include
#include
#include
@@ -45,7 +43,7 @@ class TimerBoxGtkView;
class AppletControl;
class GnomeAppletWindow :
- public SigC::Object,
+ public sigc::trackable,
public AppletWindow
{
public:
diff -up workrave-1.8.5/frontend/gtkmm/src/preinclude.h.sigc workrave-1.8.5/frontend/gtkmm/src/preinclude.h
--- workrave-1.8.5/frontend/gtkmm/src/preinclude.h.sigc 2007-09-14 20:50:25.000000000 +0200
+++ workrave-1.8.5/frontend/gtkmm/src/preinclude.h 2008-04-04 14:50:27.000000000 +0200
@@ -25,12 +25,7 @@
#define NOMINMAX
#endif
-#ifdef HAVE_GTKMM24
#define MEMBER_SLOT sigc::mem_fun
-#else
-#define MEMBER_SLOT SigC::slot
-#endif
-
#undef THREAD_PRIORITY_NORMAL
#undef THREAD_PRIORITY_LOW
diff -up workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh.sigc workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh
--- workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh.sigc 2007-09-14 20:50:32.000000000 +0200
+++ workrave-1.8.5/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh 2008-04-04 14:43:52.000000000 +0200
@@ -46,7 +46,7 @@ public:
~ExercisesPanel();
void set_exercise_count(int num);
- SigC::Signal0<void> &signal_stop() { return stop_signal; }
+ sigc::signal0<void> &signal_stop() { return stop_signal; }
protected:
void on_realize();
@@ -88,12 +88,12 @@ private:
const std::list<Exercise> exercises;
std::list<Exercise>::const_iterator exercise_iterator;
std::listExercise::Image::const_iterator image_iterator;
- SigC::Connection heartbeat_signal;
+ sigc::connection heartbeat_signal;
int exercise_time;
int seq_time;
bool paused;
bool stopped;
- SigC::Signal0<void> stop_signal;
+ sigc::signal0<void> stop_signal;
bool standalone;
int exercise_num;
int exercise_count;
++++++ workrave-kde-sigc.patch ++++++
--- workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.hh
+++ workrave-1.8.5/frontend/gtkmm/src/KdeAppletWindow.hh
@@ -24,9 +24,7 @@
#include "AppletWindow.hh"
-#ifdef HAVE_GTKMM24
-#include
-#endif
+#include
#include
#include
@@ -38,7 +36,7 @@
class AppletControl;
class KdeAppletWindow :
- public SigC::Object,
+ public sigc::trackable,
public AppletWindow
{
public:
--- workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.hh
+++ workrave-1.8.5/frontend/gtkmm/src/KdeWorkraveControl.hh
@@ -29,7 +29,7 @@
class KWinModule;
-class KdeWorkraveControl : public KWorkraveControlIface, public SigC::Object
+class KdeWorkraveControl : public KWorkraveControlIface, public sigc::trackable
{
public:
void fire();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org