rpms/papyrus/F-9 papyrus-0.7.1-virtual-dtors.patch, NONE, 1.1 papyrus.spec, 1.15, 1.16
Tim Niemueller
timn at fedoraproject.org
Thu Jan 1 11:01:23 UTC 2009
Author: timn
Update of /cvs/pkgs/rpms/papyrus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20767
Modified Files:
papyrus.spec
Added Files:
papyrus-0.7.1-virtual-dtors.patch
Log Message:
+ Added patch to fix non-virtual dtors
+ Sync to F-10 version/release and changelog
Tim
papyrus-0.7.1-virtual-dtors.patch:
--- NEW FILE papyrus-0.7.1-virtual-dtors.patch ---
diff -urN papyrus-0.7.1/papyrus/animator.h papyrus-0.7.1.dtors/papyrus/animator.h
--- papyrus-0.7.1/papyrus/animator.h 2006-12-17 19:39:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/animator.h 2009-01-01 11:25:35.000000000 +0100
@@ -37,7 +37,7 @@
Animator();
- ~Animator();
+ virtual ~Animator();
/** Advance the animation by n frames */
virtual int advance(int n=1);
diff -urN papyrus-0.7.1/papyrus/arc.h papyrus-0.7.1.dtors/papyrus/arc.h
--- papyrus-0.7.1/papyrus/arc.h 2007-02-25 00:20:39.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/arc.h 2009-01-01 11:25:53.000000000 +0100
@@ -87,7 +87,7 @@
);
/** Destructor */
- ~Arc();
+ virtual ~Arc();
/** Returns the radius of this arc */
double radius();
diff -urN papyrus-0.7.1/papyrus/beziergon.h papyrus-0.7.1.dtors/papyrus/beziergon.h
--- papyrus-0.7.1/papyrus/beziergon.h 2006-12-17 19:36:12.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/beziergon.h 2009-01-01 11:25:59.000000000 +0100
@@ -63,7 +63,7 @@
static Beziergon::pointer create(BezierVertices vertices=BezierVertices());
- ~Beziergon();
+ virtual ~Beziergon();
virtual void set_line_style(const LineStyle& line_style);
diff -urN papyrus-0.7.1/papyrus/bezierline.h papyrus-0.7.1.dtors/papyrus/bezierline.h
--- papyrus-0.7.1/papyrus/bezierline.h 2007-01-01 21:46:00.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/bezierline.h 2009-01-01 11:26:14.000000000 +0100
@@ -101,7 +101,7 @@
/** Creates a polyline from a specified set of vertices */
static Bezierline::pointer create( BezierVertices vertices = BezierVertices() );
- ~Bezierline();
+ virtual ~Bezierline();
Bezierline& operator=( const Bezierline& other );
diff -urN papyrus-0.7.1/papyrus/boxed.h papyrus-0.7.1.dtors/papyrus/boxed.h
--- papyrus-0.7.1/papyrus/boxed.h 2007-01-19 07:17:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/boxed.h 2009-01-01 11:26:21.000000000 +0100
@@ -53,7 +53,7 @@
static Boxed::pointer create();
- ~Boxed();
+ virtual ~Boxed();
Rectangle::pointer get_box();
diff -urN papyrus-0.7.1/papyrus/circle.h papyrus-0.7.1.dtors/papyrus/circle.h
--- papyrus-0.7.1/papyrus/circle.h 2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/circle.h 2009-01-01 11:26:39.000000000 +0100
@@ -75,7 +75,7 @@
const LineStyle& outline
);
- ~Circle();
+ virtual ~Circle();
PAPYRUS_CLASS_NAME( "Circle" );
diff -urN papyrus-0.7.1/papyrus/grid.h papyrus-0.7.1.dtors/papyrus/grid.h
--- papyrus-0.7.1/papyrus/grid.h 2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/grid.h 2009-01-01 11:28:25.000000000 +0100
@@ -42,7 +42,7 @@
static pointer create(double xmin=-infinity, double xmax=infinity,
double ymin=-infinity, double ymax=infinity);
- ~Grid();
+ virtual ~Grid();
double x_min();
diff -urN papyrus-0.7.1/papyrus/hilbert.h papyrus-0.7.1.dtors/papyrus/hilbert.h
--- papyrus-0.7.1/papyrus/hilbert.h 2006-12-17 19:57:46.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/hilbert.h 2009-01-01 11:28:47.000000000 +0100
@@ -36,7 +36,7 @@
static Hilbert::pointer create(unsigned level=0, double size=0);
- ~Hilbert();
+ virtual ~Hilbert();
unsigned level();
diff -urN papyrus-0.7.1/papyrus/image.h papyrus-0.7.1.dtors/papyrus/image.h
--- papyrus-0.7.1/papyrus/image.h 2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/image.h 2009-01-01 11:29:08.000000000 +0100
@@ -74,7 +74,7 @@
static Image::pointer create ( Cairo::RefPtr<Cairo::ImageSurface> img );
/** Destructor */
- ~Image();
+ virtual ~Image();
std::string filename() const;
diff -urN papyrus-0.7.1/papyrus/kochcurve.h papyrus-0.7.1.dtors/papyrus/kochcurve.h
--- papyrus-0.7.1/papyrus/kochcurve.h 2006-12-17 19:58:34.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochcurve.h 2009-01-01 11:29:19.000000000 +0100
@@ -36,7 +36,7 @@
static KochCurve::pointer create(unsigned level=0, double size=0.0);
- ~KochCurve();
+ virtual ~KochCurve();
unsigned level();
diff -urN papyrus-0.7.1/papyrus/kochsnowflake.h papyrus-0.7.1.dtors/papyrus/kochsnowflake.h
--- papyrus-0.7.1/papyrus/kochsnowflake.h 2006-12-17 19:58:51.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/kochsnowflake.h 2009-01-01 11:29:30.000000000 +0100
@@ -36,7 +36,7 @@
static KochSnowflake::pointer create(unsigned level=0, double size=0.0);
- ~KochSnowflake();
+ virtual ~KochSnowflake();
unsigned level();
diff -urN papyrus-0.7.1/papyrus/linestyle.h papyrus-0.7.1.dtors/papyrus/linestyle.h
--- papyrus-0.7.1/papyrus/linestyle.h 2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/linestyle.h 2009-01-01 11:29:43.000000000 +0100
@@ -47,7 +47,7 @@
Cairo::LineJoin join
);
- ~LineStyle();
+ virtual ~LineStyle();
LineStyle& operator=( const LineStyle& other );
diff -urN papyrus-0.7.1/papyrus/marker.h papyrus-0.7.1.dtors/papyrus/marker.h
--- papyrus-0.7.1/papyrus/marker.h 2006-12-17 19:59:19.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/marker.h 2009-01-01 11:29:53.000000000 +0100
@@ -71,7 +71,7 @@
static Marker::pointer create( STYLE style=NONE, double width = 20.0, double height = 20.0, FACING facing = RIGHT );
/** Destructor */
- ~Marker();
+ virtual ~Marker();
/** @return marker style */
STYLE style() const;
diff -urN papyrus-0.7.1/papyrus/polygon.h papyrus-0.7.1.dtors/papyrus/polygon.h
--- papyrus-0.7.1/papyrus/polygon.h 2006-12-17 19:59:38.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polygon.h 2009-01-01 11:30:06.000000000 +0100
@@ -65,7 +65,7 @@
static Polygon::pointer create(Vertices vertices=Vertices());
- ~Polygon();
+ virtual ~Polygon();
virtual void set_line_style(const LineStyle& line_style);
diff -urN papyrus-0.7.1/papyrus/polyline.h papyrus-0.7.1.dtors/papyrus/polyline.h
--- papyrus-0.7.1/papyrus/polyline.h 2006-12-17 19:59:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/polyline.h 2009-01-01 11:30:12.000000000 +0100
@@ -92,7 +92,7 @@
/** Creates a polyline from a specified set of vertices */
static Polyline::pointer create( Vertices vertices = Vertices() );
- ~Polyline();
+ virtual ~Polyline();
Polyline& operator=(const Polyline& other);
diff -urN papyrus-0.7.1/papyrus/rectangle.h papyrus-0.7.1.dtors/papyrus/rectangle.h
--- papyrus-0.7.1/papyrus/rectangle.h 2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rectangle.h 2009-01-01 11:30:16.000000000 +0100
@@ -80,7 +80,7 @@
const LineStyle& outline
);
- ~Rectangle();
+ virtual ~Rectangle();
/** Returns the width of the rectangle */
double width();
diff -urN papyrus-0.7.1/papyrus/region.h papyrus-0.7.1.dtors/papyrus/region.h
--- papyrus-0.7.1/papyrus/region.h 2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/region.h 2009-01-01 11:30:24.000000000 +0100
@@ -33,7 +33,7 @@
Region(double x=0.0, double y=0.0, double w=0.0, double h=0.0);
- ~Region();
+ virtual ~Region();
double x() const;
double y() const;
diff -urN papyrus-0.7.1/papyrus/regularpolygon.h papyrus-0.7.1.dtors/papyrus/regularpolygon.h
--- papyrus-0.7.1/papyrus/regularpolygon.h 2006-12-17 20:00:24.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/regularpolygon.h 2009-01-01 11:30:29.000000000 +0100
@@ -79,7 +79,7 @@
static RegularPolygon::pointer create(unsigned int sides=3, double radius=1.0, Style style=ZERO_RADIUS );
- ~RegularPolygon();
+ virtual ~RegularPolygon();
unsigned int sides();
diff -urN papyrus-0.7.1/papyrus/rotator.h papyrus-0.7.1.dtors/papyrus/rotator.h
--- papyrus-0.7.1/papyrus/rotator.h 2006-12-31 23:16:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/rotator.h 2009-01-01 11:30:50.000000000 +0100
@@ -58,7 +58,7 @@
double radian_interval = 0.0
);
- ~Rotator();
+ virtual ~Rotator();
// double radian_interval();
diff -urN papyrus-0.7.1/papyrus/scaler.h papyrus-0.7.1.dtors/papyrus/scaler.h
--- papyrus-0.7.1/papyrus/scaler.h 2007-01-01 01:32:55.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/scaler.h 2009-01-01 11:30:57.000000000 +0100
@@ -55,7 +55,7 @@
int selection_depth = 1,
unsigned side = 0 );
- ~Scaler();
+ virtual ~Scaler();
virtual void set_selection_group( Group::pointer selection_group, bool add_drawable_only = true );
diff -urN papyrus-0.7.1/papyrus/sierpinski.h papyrus-0.7.1.dtors/papyrus/sierpinski.h
--- papyrus-0.7.1/papyrus/sierpinski.h 2006-12-17 20:01:02.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/sierpinski.h 2009-01-01 11:31:10.000000000 +0100
@@ -36,7 +36,7 @@
static Sierpinski::pointer create(unsigned level=0, double size=0.0);
- ~Sierpinski();
+ virtual ~Sierpinski();
unsigned level();
diff -urN papyrus-0.7.1/papyrus/text.h papyrus-0.7.1.dtors/papyrus/text.h
--- papyrus-0.7.1/papyrus/text.h 2006-12-17 20:01:29.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/text.h 2009-01-01 11:31:21.000000000 +0100
@@ -74,7 +74,7 @@
Cairo::FontWeight weight = Cairo::FONT_WEIGHT_NORMAL
);
- ~Text();
+ virtual ~Text();
const std::string& font_family();
diff -urN papyrus-0.7.1/papyrus/translator.h papyrus-0.7.1.dtors/papyrus/translator.h
--- papyrus-0.7.1/papyrus/translator.h 2006-12-30 02:09:26.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/translator.h 2009-01-01 11:31:31.000000000 +0100
@@ -54,7 +54,7 @@
int selection_depth = 1,
unsigned transforms = TRANSLATE_X|TRANSLATE_Y );
- ~Translator();
+ virtual ~Translator();
unsigned transforms();
diff -urN papyrus-0.7.1/papyrus/viewbox.h papyrus-0.7.1.dtors/papyrus/viewbox.h
--- papyrus-0.7.1/papyrus/viewbox.h 2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.dtors/papyrus/viewbox.h 2009-01-01 11:31:44.000000000 +0100
@@ -105,7 +105,7 @@
static pointer create(const Region& region, ALIGN align=ALIGN_NONE, MEET_OR_SLICE meet_or_slice = MEET);
- ~Viewbox();
+ virtual ~Viewbox();
Viewbox& operator=( const Region& other );
Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-9/papyrus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- papyrus.spec 21 Dec 2008 17:30:30 -0000 1.15
+++ papyrus.spec 1 Jan 2009 11:00:53 -0000 1.16
@@ -2,7 +2,7 @@
Summary: Papyrus is a C++ canvas library similar to the Gnome canvas
Name: papyrus
Version: 0.7.1
-Release: 4%{?dist}
+Release: 6%{?dist}
License: LGPLv2
URL: http://libpapyrus.sourceforge.net/
Group: System Environment/Libraries
@@ -10,6 +10,7 @@
Patch0: papyrus.patch
Patch1: papyrus-0.7.1-typedef-fixes.patch
Patch2: papyrus-0.7.1-valarray.patch
+Patch3: papyrus-0.7.1-virtual-dtors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
@@ -35,6 +36,7 @@
%patch0 -p1 -b gcc43
%patch1 -p1 -b typedef-fixes
%patch2 -p1 -b valarray
+%patch3 -p1 -b virtual-dtors
%build
%configure --enable-static=no
@@ -72,10 +74,17 @@
%{_datadir}/papyrusmm-0.7.1/
%changelog
-* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-4
+* Thu Jan 01 2009 Tim Niemueller <tim at niemueller.de> - 0.7.1-6
+- Make all dtors virtual to fix compile warnings (errors with -Wall -Werror)
+- Sync with F-10 version/release and changelog
+
+* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-5
- Header fixes for F-10
- Drawing fixes (invalid use of std::valarray)
+* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-4
+- Fix Patch0:/%%patch mismatch.
+
* Mon Mar 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.7.1-3
- Added boost-devel dependency
- Added INT_MAX patch
More information about the fedora-extras-commits
mailing list