rpms/workrave/devel workrave-1.8.2-cpp-fix.patch, NONE, 1.1 workrave.spec, 1.3, 1.4

[Tomas Mraz (tmraz)]

Author: tmraz

Update of /cvs/extras/rpms/workrave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17884

Modified Files:
	workrave.spec 
Added Files:
	workrave-1.8.2-cpp-fix.patch 
Log Message:
- Fixed compilation on gcc-4.1


workrave-1.8.2-cpp-fix.patch:

--- NEW FILE workrave-1.8.2-cpp-fix.patch ---
--- workrave-1.8.2/frontend/gtkmm/src/GtkUtil.hh.cpp-fix	2005-09-23 21:22:33.000000000 +0200
+++ workrave-1.8.2/frontend/gtkmm/src/GtkUtil.hh	2006-02-02 12:39:26.000000000 +0100
@@ -56,11 +56,11 @@
   create_label(std::string text, bool bold);
 
   static Gtk::Widget *
-  GtkUtil::create_label_with_tooltip(std::string text,
+  create_label_with_tooltip(std::string text,
                                      std::string tooltip);
 
   static EventImage *
-  GtkUtil::create_image_with_tooltip(std::string file,
+  create_image_with_tooltip(std::string file,
                                      std::string tooltip);
 
   static Gtk::Widget *
@@ -84,7 +84,7 @@
   static void set_wmclass(Gtk::Window &window, std::string class_postfix);
   static void center_window(Gtk::Window &window, HeadInfo &head);
 
-  static bool GtkUtil::has_button_images();
+  static bool has_button_images();
 };
 
 #endif // GTKMMGUI_HH


Index: workrave.spec
===================================================================
RCS file: /cvs/extras/rpms/workrave/devel/workrave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workrave.spec	2 Feb 2006 11:26:01 -0000	1.3
+++ workrave.spec	2 Feb 2006 11:42:35 -0000	1.4
@@ -8,6 +8,8 @@
 URL: http://workrave.sourceforge.net/
 Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
 Source1: workrave.desktop
+Patch1: workrave-1.8.2-cpp-fix.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
 BuildRequires:  gnet2-devel
@@ -25,6 +27,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .cpp-fix
+
 %build
 if [ ! -x configure ]; then
   ### Needed for snapshot releases.
@@ -66,6 +70,7 @@
 * Thu Feb  2 2006 Tomas Mraz <tmraz at redhat.com> - 1.8.2-1
 - Updated version, dropped obsolete patch
 - Added missing buildrequires for modular X
+- Fixed compilation on gcc-4.1
 
 * Sat Oct 22 2005 Tomas Mraz <tmraz at redhat.com> - 1.8.1-4
 - Added a desktop file