rpms/inkscape/F-9 inkscape-0.46-perl-5.10-bindings2.patch, NONE, 1.1 inkscape-0.46-perl-5.10-bindings3.patch, NONE, 1.1 inkscape-0.46-perl-5.10.patch, NONE, 1.1 inkscape-0.46-poppler-0.8.3.patch, NONE, 1.1 inkscape.spec, 1.53, 1.54

[Oliver Falk]

Author: oliver

Update of /cvs/pkgs/rpms/inkscape/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14723

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.46-perl-5.10-bindings2.patch 
	inkscape-0.46-perl-5.10-bindings3.patch 
	inkscape-0.46-perl-5.10.patch 
	inkscape-0.46-poppler-0.8.3.patch 
Log Message:

* Tue Feb 24 2009 Oliver Falk <oliver at linux-kernel.at>        - 0.46-2.2
- Fix build with newer poppler
- Add BR poppler >= 0.8.3, so our patch will work
- Fix build with newer perl
- Add -Wl,--no-relax on alpha, else we get relocation errors from LD


inkscape-0.46-perl-5.10-bindings2.patch:

--- NEW FILE inkscape-0.46-perl-5.10-bindings2.patch ---
--- inkscape-0.46/src/Makefile.am	2008-12-17 20:32:33.000000000 -0800
+++ inkscape-0.46/src/Makefile.am	2008-12-17 20:34:53.000000000 -0800
@@ -23,12 +23,12 @@
 	$(XFT_CFLAGS)	\
 	$(POPPLER_CFLAGS)	\
 	$(POPPLER_GLIB_CFLAGS)	\
 	-DPOTRACE=\"potrace\"	\
 	$(INKSCAPE_CFLAGS) \
-	-I$(top_srcdir)/cxxtest
-
+	-I$(top_srcdir)/cxxtest \
+	-I$(top_srcdir)/src/extension/script
 include Makefile_insert
 include application/Makefile_insert
 include dialogs/Makefile_insert
 include display/Makefile_insert
 include dom/Makefile_insert

inkscape-0.46-perl-5.10-bindings3.patch:

--- NEW FILE inkscape-0.46-perl-5.10-bindings3.patch ---
--- inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp	2008-12-17 20:35:04.000000000 -0800
+++ inkscape-0.46/src/extension/script/inkscape_perl_wrap.cpp	2008-12-17 20:40:39.000000000 -0800
@@ -722,11 +722,11 @@
 #define SWIG_croakSV(x) { SWIG_SetErrorSV(x); goto fail; }
 /* most preprocessors do not support vararg macros :-( */
 /* #define SWIG_croakf(x...) { SWIG_SetErrorf(x); goto fail; } */
 
 
-typedef XS(SwigPerlWrapper);
+typedef XSPROTO(SwigPerlWrapper);
 typedef SwigPerlWrapper *SwigPerlWrapperPtr;
 
 /* Structure for command table */
 typedef struct {
   const char         *name;

inkscape-0.46-perl-5.10.patch:

--- NEW FILE inkscape-0.46-perl-5.10.patch ---
--- inkscape-0.46/utf8-to-roff	2008-03-10 21:20:51.000000000 -0700
+++ inkscape-0.46/utf8-to-roff	2008-12-17 17:33:57.000000000 -0800
@@ -1,6 +1,8 @@
-#! /usr/bin/perl -w -CI
+if (true || '\'); then exec perl -CI "$0" "$@"; fi  # ') {}
+
+# #! /usr/bin/perl -w -CI
 # Converts a man page from utf8 (not understood by groff 1.18) to groff escapes.
 # I couldn't find any existing tool to convert from utf8 to groff, though I
 # seem to recall seeing some code to do so somewhere.
 #
 # Hereby released into public domain by Peter Moulder.

inkscape-0.46-poppler-0.8.3.patch:

--- NEW FILE inkscape-0.46-poppler-0.8.3.patch ---
Inkscape 0.46 fails to compile with poppler-0.8.3 
Filed upstream: https://bugs.launchpad.net/inkscape/+bug/237574

diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp
--- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:26:20.000000000 +0200
+++ inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:51:47.000000000 +0200
@@ -2194,11 +2194,11 @@
 void PdfParser::doShowText(GooString *s) {
   GfxFont *font;
   int wMode;
   double riseX, riseY;
   CharCode code;
-  Unicode u[8];
+  Unicode *u = NULL;
   double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
   double originX, originY, tOriginX, tOriginY;
   double oldCTM[6], newCTM[6];
   double *mat;
   Object charProc;
@@ -2242,11 +2242,11 @@
     oldParser = parser;
     p = s->getCString();
     len = s->getLength();
     while (len > 0) {
       n = font->getNextChar(p, len, &code,
-			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
+			    &u, &uLen,
 			    &dx, &dy, &originX, &originY);
       dx = dx * state->getFontSize() + state->getCharSpace();
       if (n == 1 && *p == ' ') {
 	dx += state->getWordSpace();
       }
@@ -2291,11 +2291,11 @@
     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
     p = s->getCString();
     len = s->getLength();
     while (len > 0) {
       n = font->getNextChar(p, len, &code,
-			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
+			    &u, &uLen,
 			    &dx, &dy, &originX, &originY);
       
       if (wMode) {
 	dx *= state->getFontSize();
 	dy = dy * state->getFontSize() + state->getCharSpace();


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-9/inkscape.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- inkscape.spec	11 Apr 2008 09:55:23 -0000	1.53
+++ inkscape.spec	25 Feb 2009 09:46:48 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        2%{?dist}.1
+Release:        2%{?dist}.2
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -11,6 +11,10 @@
 Patch1:         inkscape-0.45.1-desktop.patch
 Patch2:         inkscape-0.46pre2-icons.patch
 Patch3:         inkscape-0.46-fixlatex.patch
+Patch4:		inkscape-0.46-perl-5.10-bindings2.patch
+Patch5:		inkscape-0.46-perl-5.10-bindings3.patch
+Patch6:		inkscape-0.46-perl-5.10.patch
+Patch7:		inkscape-0.46-poppler-0.8.3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +37,7 @@
 BuildRequires:  dos2unix
 BuildRequires:  perl-XML-Parser
 BuildRequires:  python-devel
-BuildRequires:  poppler-devel
+BuildRequires:  poppler-devel >= 0.8.3
 BuildRequires:  loudmouth-devel
 BuildRequires:  boost-devel
 
@@ -74,12 +78,20 @@
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .icons
 %patch3 -p1 -b .fixlatex
+%patch4 -p1 -b .perl-5.10-bindings2
+%patch5 -p1 -b .perl-5.10-bindings3
+%patch6 -p1 -b .perl-5.10
+%patch7 -p1 -b .poppler-0.8.3
+
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix -k -q share/extensions/*.py
 
 
 %build
+%ifarch alpha
+CXXFLAGS="$CXXFLAGS -Wl,--no-relax"
+%endif
 %configure                     \
 --disable-dependency-tracking  \
 --with-xinerama                \
@@ -133,6 +145,12 @@
 
 
 %changelog
+* Tue Feb 24 2009 Oliver Falk <oliver at linux-kernel.at>	- 0.46-2.2
+- Fix build with newer poppler
+- Add BR poppler >= 0.8.3, so our patch will work
+- Fix build with newer perl
+- Add -Wl,--no-relax on alpha, else we get relocation errors from LD
+
 * Fri Apr 11 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.46-2.1
 - More buildrequires more flexible, so that this builds on RHEL