rpms/papyrus/F-8 papyrus-0.7.1-typedef-fixes.patch, NONE, 1.1 papyrus-0.7.1-valarray.patch, NONE, 1.1 papyrus.patch, NONE, 1.1 papyrus.spec, 1.12, 1.13
Tim Niemueller
timn at fedoraproject.org
Sun Dec 21 17:26:39 UTC 2008
Author: timn
Update of /cvs/pkgs/rpms/papyrus/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17509
Modified Files:
papyrus.spec
Added Files:
papyrus-0.7.1-typedef-fixes.patch papyrus-0.7.1-valarray.patch
papyrus.patch
Log Message:
Backport fixes from F-9/F-10, cf. #476538
+ Added existing F-9/F-10 patches
+ 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();
papyrus.patch:
--- NEW FILE papyrus.patch ---
diff -r -U 5 papyrus-0.7.1.orig/demos/papyrus-demo/demowindow.cc papyrus-0.7.1/demos/papyrus-demo/demowindow.cc
--- papyrus-0.7.1.orig/demos/papyrus-demo/demowindow.cc 2007-02-24 17:08:42.000000000 -0700
+++ papyrus-0.7.1/demos/papyrus-demo/demowindow.cc 2008-03-03 20:46:57.000000000 -0700
@@ -29,10 +29,11 @@
#include "demos.h"
#include <vector>
#include <cctype>
#include <cerrno>
#include <stdio.h>
+#include <cstring>
#ifdef NEED_FLOCKFILE_PROTO
extern "C" void flockfile (FILE *);
#endif
#ifdef NEED_FUNLOCKFILE_PROTO
diff -r -U 5 papyrus-0.7.1.orig/demos/papyrus-demo/textwidget.cc papyrus-0.7.1/demos/papyrus-demo/textwidget.cc
--- papyrus-0.7.1.orig/demos/papyrus-demo/textwidget.cc 2007-02-24 17:08:42.000000000 -0700
+++ papyrus-0.7.1/demos/papyrus-demo/textwidget.cc 2008-03-03 20:49:40.000000000 -0700
@@ -19,10 +19,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "textwidget.h"
#include "pangomm/fontdescription.h"
+#include <cstring>
TextWidget::TextWidget(bool is_source)
{
set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
diff -r -U 5 papyrus-0.7.1.orig/demos/papyrusmm-demo/demowindow.cc papyrus-0.7.1/demos/papyrusmm-demo/demowindow.cc
--- papyrus-0.7.1.orig/demos/papyrusmm-demo/demowindow.cc 2007-02-24 17:08:57.000000000 -0700
+++ papyrus-0.7.1/demos/papyrusmm-demo/demowindow.cc 2008-03-03 20:47:18.000000000 -0700
@@ -29,10 +29,11 @@
#include "demos.h"
#include <vector>
#include <cctype>
#include <cerrno>
#include <stdio.h>
+#include <cstring>
#ifdef NEED_FLOCKFILE_PROTO
extern "C" void flockfile (FILE *);
#endif
#ifdef NEED_FUNLOCKFILE_PROTO
diff -r -U 5 papyrus-0.7.1.orig/demos/papyrusmm-demo/textwidget.cc papyrus-0.7.1/demos/papyrusmm-demo/textwidget.cc
--- papyrus-0.7.1.orig/demos/papyrusmm-demo/textwidget.cc 2007-02-24 17:08:58.000000000 -0700
+++ papyrus-0.7.1/demos/papyrusmm-demo/textwidget.cc 2008-03-03 20:49:54.000000000 -0700
@@ -19,10 +19,11 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "textwidget.h"
#include "pangomm/fontdescription.h"
+#include <cstring>
TextWidget::TextWidget(bool is_source)
{
set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
diff -r -U 5 papyrus-0.7.1.orig/papyrus/handlebox.cpp papyrus-0.7.1/papyrus/handlebox.cpp
--- papyrus-0.7.1.orig/papyrus/handlebox.cpp 2007-02-24 16:05:14.000000000 -0700
+++ papyrus-0.7.1/papyrus/handlebox.cpp 2008-03-03 20:34:48.000000000 -0700
@@ -19,10 +19,12 @@
#include "handlebox.h"
#include "circle.h"
#include "rgba.h"
+#include <limits.h>
+
namespace Papyrus
{
Handlebox::Handlebox(Handles handles) : Boxed(), m_initializing(true)
{
Index: papyrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/papyrus/F-8/papyrus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- papyrus.spec 11 Mar 2007 18:09:55 -0000 1.12
+++ papyrus.spec 21 Dec 2008 17:26:09 -0000 1.13
@@ -2,13 +2,16 @@
Summary: Papyrus is a C++ canvas library similar to the Gnome canvas
Name: papyrus
Version: 0.7.1
-Release: 1%{?dist}
-License: LGPL
+Release: 4%{?dist}
+License: LGPLv2
URL: http://libpapyrus.sourceforge.net/
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 pkgconfig m4
+BuildRequires: gtkmm24-devel >= 2.10 cairomm-devel >= 1.2 boost-devel pkgconfig m4
%description
Papyrus is a C++ canvas library similar in scope
@@ -29,6 +32,9 @@
%prep
%setup -q
+%patch0 -p1 -b gcc43
+%patch1 -p1 -b typedef-fixes
+%patch2 -p1 -b valarray
%build
%configure --enable-static=no
@@ -66,6 +72,17 @@
%{_datadir}/papyrusmm-0.7.1/
%changelog
+* 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
+- Added INT_MAX patch
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.1-2
+- Autorebuild for GCC 4.3
+
* Sat Mar 10 2007 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.7.1-1
- New release
More information about the scm-commits
mailing list