rpms/papyrus/devel papyrus.patch,NONE,1.1 papyrus.spec,1.13,1.14

Rick L. Vinyard, Jr. (rvinyard) fedora-extras-commits at redhat.com
Tue Mar 4 04:02:40 UTC 2008


Author: rvinyard

Update of /cvs/extras/rpms/papyrus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32649

Modified Files:
	papyrus.spec 
Added Files:
	papyrus.patch 
Log Message:


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/extras/rpms/papyrus/devel/papyrus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- papyrus.spec	19 Feb 2008 22:55:12 -0000	1.13
+++ papyrus.spec	4 Mar 2008 04:02:03 -0000	1.14
@@ -2,13 +2,14 @@
 Summary:          Papyrus is a C++ canvas library similar to the Gnome canvas
 Name:             papyrus
 Version:          0.7.1
-Release:          2%{?dist}
-License:          LGPL
+Release:          3%{?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
 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 +30,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --enable-static=no
@@ -66,6 +68,10 @@
 %{_datadir}/papyrusmm-0.7.1/
 
 %changelog
+* 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
 




More information about the fedora-extras-commits mailing list