rpms/papyrus/F-10 papyrus-0.7.1-typedef-fixes.patch, NONE, 1.1 papyrus-0.7.1-valarray.patch, NONE, 1.1 papyrus.spec, 1.15, 1.16

[Tim Niemueller]

Author: timn

Update of /cvs/pkgs/rpms/papyrus/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21349

Modified Files:
	papyrus.spec 
Added Files:
	papyrus-0.7.1-typedef-fixes.patch papyrus-0.7.1-valarray.patch 
Log Message:
Header and drawing fixes, cf. #476538

+ Header fixes to deal with strict compilers
+ Patch that fixes a drawing error

Tim


papyrus-0.7.1-typedef-fixes.patch:

--- NEW FILE papyrus-0.7.1-typedef-fixes.patch ---
diff -urN papyrus-0.7.1/papyrus/event.h papyrus-0.7.1.fixed/papyrus/event.h
--- papyrus-0.7.1/papyrus/event.h	2006-08-31 06:20:39.000000000 +0200
+++ papyrus-0.7.1.fixed/papyrus/event.h	2008-12-15 15:19:30.000000000 +0100
@@ -23,7 +23,7 @@
 
 namespace Event {
 
-  typedef enum Type {
+  typedef enum {
     BUTTON_PRESS,
     BUTTON_RELEASE,
     BUTTON_DOUBLE_PRESS,
@@ -39,10 +39,10 @@
     SCROLL_DOWN,
     SCROLL_LEFT,
     SCROLL_RIGHT,
-  };
+  } ScrollDirection;
 
   // These are taken straight from GDK
-  typedef enum ModifierType
+  typedef enum
   {
     SHIFT_MASK    = 1 << 0,
     LOCK_MASK     = 1 << 1,
diff -urN papyrus-0.7.1/papyrus/marker.h papyrus-0.7.1.fixed/papyrus/marker.h
--- papyrus-0.7.1/papyrus/marker.h	2006-12-17 19:59:19.000000000 +0100
+++ papyrus-0.7.1.fixed/papyrus/marker.h	2008-12-15 15:18:18.000000000 +0100
@@ -31,7 +31,7 @@
    */
   class Marker : public Shape {
     public:
-      typedef enum STYLE {
+      typedef enum {
         NONE,
         LINES,
         TRIANGLE,
@@ -55,12 +55,12 @@
         ROUND,
         OPEN_ROUND,
         BACKSLASH,
-    };
+    } STYLE;
 
-      typedef enum FACING {
+      typedef enum {
         LEFT,
         RIGHT
-    };
+    } FACING;
 
       typedef PapyrusSmartPointer<Marker> pointer;
 
diff -urN papyrus-0.7.1/papyrus/regularpolygon.h papyrus-0.7.1.fixed/papyrus/regularpolygon.h
--- papyrus-0.7.1/papyrus/regularpolygon.h	2006-12-17 20:00:24.000000000 +0100
+++ papyrus-0.7.1.fixed/papyrus/regularpolygon.h	2008-12-15 15:18:37.000000000 +0100
@@ -73,7 +73,7 @@
 public:
   typedef PapyrusSmartPointer<RegularPolygon> pointer;
 
-  typedef enum Style {ZERO_RADIUS, ZERO_APOTHEM};
+  typedef enum {ZERO_RADIUS, ZERO_APOTHEM} Style;
 
     RegularPolygon(unsigned int sides=3, double radius=1.0, Style style=ZERO_RADIUS);
 

papyrus-0.7.1-valarray.patch:

--- NEW FILE papyrus-0.7.1-valarray.patch ---
diff -urN papyrus-0.7.1/papyrus/linestyle.cpp papyrus-0.7.1.valarray/papyrus/linestyle.cpp
--- papyrus-0.7.1/papyrus/linestyle.cpp	2007-02-25 00:05:14.000000000 +0100
+++ papyrus-0.7.1.valarray/papyrus/linestyle.cpp	2008-12-21 16:04:03.000000000 +0100
@@ -58,6 +58,7 @@
     m_cap = other.m_cap;
     m_join = other.m_join;
     m_miter_limit = other.m_miter_limit;
+    m_dash_array.resize(other.m_dash_array.size());
     m_dash_array = other.m_dash_array;
     m_dash_offset = other.m_dash_offset;
 
@@ -98,6 +99,7 @@
 
   void LineStyle::set_dash ( const std::valarray< double > dashes, double offset )
   {
+    m_dash_array.resize(dashes.size());
     m_dash_array = dashes;
     m_dash_offset = offset;
     m_signal_dash.emit();


Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-10/papyrus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- papyrus.spec	21 Sep 2008 08:53:28 -0000	1.15
+++ papyrus.spec	21 Dec 2008 17:33:32 -0000	1.16
@@ -8,6 +8,8 @@
 Group:            System Environment/Libraries
 Source:           http://download.sourceforge.net/libpapyrus/%{name}-%{version}.tar.bz2
 Patch0:           papyrus.patch
+Patch1:           papyrus-0.7.1-typedef-fixes.patch
+Patch2:           papyrus-0.7.1-valarray.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
 
@@ -30,7 +32,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b gcc43
+%patch1 -p1 -b typedef-fixes
+%patch2 -p1 -b valarray
 
 %build
 %configure --enable-static=no
@@ -68,8 +72,9 @@
 %{_datadir}/papyrusmm-0.7.1/
 
 %changelog
-* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-4
-- Fix Patch0:/%%patch mismatch.
+* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 0.7.1-4
+- Header fixes for F-10
+- Drawing fixes (invalid use of std::valarray)
 
 * Mon Mar 03 2008 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.7.1-3
 - Added boost-devel dependency