rpms/plotmm/devel plotmm-0.1.2-libsigc++20.patch, NONE, 1.1 plotmm.spec, 1.5, 1.6

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/plotmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5547

Modified Files:
	plotmm.spec 
Added Files:
	plotmm-0.1.2-libsigc++20.patch 
Log Message:
fix compile against libsigc++20

plotmm-0.1.2-libsigc++20.patch:

--- NEW FILE plotmm-0.1.2-libsigc++20.patch ---
diff -up plotmm-0.1.2/plotmm/curve.h.BAD plotmm-0.1.2/plotmm/curve.h
--- plotmm-0.1.2/plotmm/curve.h.BAD	2008-08-29 08:03:17.000000000 -0400
+++ plotmm-0.1.2/plotmm/curve.h	2008-08-29 08:04:49.000000000 -0400
@@ -140,7 +140,7 @@ namespace PlotMM {
 			  int from = 0, int to = -1);
 
 	//! Signals that this curve has changed in some way or the other
-	SigC::Signal0<void> signal_curve_changed;
+	sigc::signal0<void> signal_curve_changed;
 
     protected:
 	virtual void init(const Glib::ustring &title);
diff -up plotmm-0.1.2/plotmm/plot.cc.BAD plotmm-0.1.2/plotmm/plot.cc
--- plotmm-0.1.2/plotmm/plot.cc.BAD	2008-08-29 08:07:38.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.cc	2008-08-29 08:08:01.000000000 -0400
@@ -406,19 +406,19 @@ void Plot::replot()
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
 {
     return canvas_.signal_plot_mouse_press;
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
 {
     return canvas_.signal_plot_mouse_release;
 }
 
 //! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
+sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
 {
     return canvas_.signal_plot_mouse_move;
 }
diff -up plotmm-0.1.2/plotmm/plot.h.BAD plotmm-0.1.2/plotmm/plot.h
--- plotmm-0.1.2/plotmm/plot.h.BAD	2008-08-29 08:08:18.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.h	2008-08-29 08:08:45.000000000 -0400
@@ -79,9 +79,9 @@ namespace PlotMM 
 	virtual void clear();
 	virtual void end_replot();
 
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
-	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
 
     protected:
 	virtual bool on_expose_event(GdkEventExpose* event);
@@ -141,9 +141,9 @@ namespace PlotMM 
 	Scale *scale(PlotAxisID id) { return tickMark_[id]; }
 	PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
 
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
-	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
-	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
 
 	void set_selection(const Rectangle &r);
 	Rectangle get_selection() { return select_; }
diff -up plotmm-0.1.2/plotmm/scale.h.BAD plotmm-0.1.2/plotmm/scale.h
--- plotmm-0.1.2/plotmm/scale.h.BAD	2008-08-29 08:05:52.000000000 -0400
+++ plotmm-0.1.2/plotmm/scale.h	2008-08-29 08:05:24.000000000 -0400
@@ -133,7 +133,7 @@ namespace PlotMM
 	/*! This signal is thrown whenever the scale is enabled or disabled
 	 *  \sa set_enabled, enabled
 	 */
-	SigC::Signal1<void,bool> signal_enabled;
+	sigc::signal1<void,bool> signal_enabled;
 
     protected:
 	virtual void on_realize();


Index: plotmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plotmm/devel/plotmm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plotmm.spec	28 Aug 2008 21:50:35 -0000	1.5
+++ plotmm.spec	29 Aug 2008 16:14:30 -0000	1.6
@@ -1,14 +1,17 @@
 Name:           plotmm
 Version:        0.1.2
-Release:        8%{?dist}
-
+Release:        9%{?dist}
 Summary:        GTKmm plot widget for scientific applications
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://plotmm.sourceforge.net/
 Source0:        http://download.sourceforge.net/plotmm/plotmm-%{version}.tar.gz
+# Fix code to build against libsigc++20
+# Upstream:
+# https://sourceforge.net/tracker/?func=detail&atid=632478&aid=2082337&group_id=102665
+Patch0:         plotmm-0.1.2-libsigc++20.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtkmm24-devel >= 2.4.0, libsigc++-devel
+BuildRequires:  gtkmm24-devel >= 2.4.0
 
 
 %description
@@ -40,6 +43,7 @@
 
 %prep
 %setup -q -n plotmm-%{version}
+%patch0 -p1 -b .libsigc++20
 
 
 %build
@@ -81,6 +85,9 @@
 %{_bindir}/plotmm-simple
 
 %changelog
+* Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.2-9
+- fix code to compile against libsigc++20
+
 * Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.2-8
 - fix broken BR