rpms/mingw32-plotmm/devel mingw32-plotmm-ac.patch, NONE, 1.1 mingw32-plotmm.spec, NONE, 1.1 plotmm-0.1.2-libsigc++20.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thomas M. Sailer sailer at fedoraproject.org
Thu Apr 30 06:00:43 UTC 2009


Author: sailer

Update of /cvs/extras/rpms/mingw32-plotmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28973

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-plotmm-ac.patch mingw32-plotmm.spec 
	plotmm-0.1.2-libsigc++20.patch 
Log Message:
import from review


mingw32-plotmm-ac.patch:

--- NEW FILE mingw32-plotmm-ac.patch ---
--- configure.ac.orig	2009-04-19 21:09:50.000000000 +0200
+++ configure.ac	2009-04-19 21:10:10.000000000 +0200
@@ -16,6 +16,12 @@
 AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
+AC_LANG_CPLUSPLUS
+
+AC_MINGW32
+AC_EXEEXT
+AC_OBJEXT
+
 AC_CHECK_TOOL(DOXYGEN, doxygen)
 
 pkg_modules="gtkmm-2.0"
--- plotmm/Makefile.am.mingw32	2005-11-09 17:37:09.000000000 +0100
+++ plotmm/Makefile.am	2009-04-19 22:14:54.000000000 +0200
@@ -13,6 +13,8 @@
 	supplemental.h supplemental.cc \
 	plot.h plot.cc \
 	compat.h
+libplotmm_la_LIBADD = @PACKAGE_LIBS@
+libplotmm_la_LDFLAGS = -no-undefined
 
 libplotmm_la_CXXFLAGS = @PACKAGE_CFLAGS@ -I$(top_srcdir)
 


--- NEW FILE mingw32-plotmm.spec ---
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
%global _use_internal_dependency_generator 0
%global __find_requires %{_mingw32_findrequires}
%global __find_provides %{_mingw32_findprovides}

Name:           mingw32-plotmm
Version:        0.1.2
Release:        2%{?dist}
Summary:        MinGW GTKmm plot widget for scientific applications
Group:          Development/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
Patch1:         mingw32-plotmm-ac.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 30
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-gcc-c++
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-gtkmm24 >= 2.4.0
BuildRequires:  libtool
BuildRequires:  automake
BuildRequires:  autoconf

Requires:       pkgconfig


%description
This package provides an extension to the mingw32 gtkmm library.  It
contains widgets which are primarily useful for technical and
scientifical purposes.  Initially, this is a 2-D plotting widget.

%prep
%setup -q -n plotmm-%{version}
%patch0 -p1 -b .libsigc++20
%patch1 -p0 -b .mingw32
# update autotools, distributed files are so old they do not
# get compiling dlls right
libtoolize --force --copy
aclocal
autoconf
automake -a -c


%build
%{_mingw32_configure} --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/curves.exe
rm $RPM_BUILD_ROOT%{_mingw32_bindir}/simple.exe

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog README
%{_mingw32_bindir}/libplotmm-0.dll
%{_mingw32_libdir}/libplotmm.dll.a
%{_mingw32_libdir}/libplotmm.la
%{_mingw32_libdir}/pkgconfig/plotmm.pc
%{_mingw32_includedir}/plotmm

%changelog
* Mon Apr 27 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.1.2-2
- add missing BR

* Sun Apr 19 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 0.1.2-1
- copy from native

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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-plotmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	30 Apr 2009 04:48:10 -0000	1.1
+++ .cvsignore	30 Apr 2009 06:00:12 -0000	1.2
@@ -0,0 +1 @@
+plotmm-0.1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-plotmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	30 Apr 2009 04:48:10 -0000	1.1
+++ sources	30 Apr 2009 06:00:13 -0000	1.2
@@ -0,0 +1 @@
+d8a49db390be5de5965e52ef8d8581f3  plotmm-0.1.2.tar.gz




More information about the fedora-extras-commits mailing list