rpms/inkscape/devel inkscape-0.46-gtk2.13.3.patch, NONE, 1.1 inkscape-0.46-poppler-0.8.3.patch, NONE, 1.1 inkscape.spec, 1.54, 1.55

[Lubomir Rintel (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29839

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.46-gtk2.13.3.patch 
	inkscape-0.46-poppler-0.8.3.patch 
Log Message:
* Wed Jul 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-4
- Fix compile issues with newer gtk and poppler


inkscape-0.46-gtk2.13.3.patch:

--- NEW FILE inkscape-0.46-gtk2.13.3.patch ---
gtkctree.h and gtkclist.h include each other, the order of inclusion
is important in gtk-2.13.3
https://bugs.launchpad.net/inkscape/+bug/246868

Lubomir Rintel <lkundrak at v3.sk>

--- inkscape-0.46+devel.orig/src/widgets/sp-xmlview-attr-list.h	2008-06-24 13:38:07.000000000 +0200
+++ inkscape-0.46+devel/src/widgets/sp-xmlview-attr-list.h	2008-07-05 13:03:50.000000000 +0200
@@ -13,6 +13,7 @@
  */
 
 #include <stdio.h>
+#include <gtk/gtkctree.h>
 #include <gtk/gtkclist.h>
 #include "../xml/repr.h"
 

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/devel/inkscape.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- inkscape.spec	26 Jun 2008 08:22:24 -0000	1.54
+++ inkscape.spec	9 Jul 2008 09:54:35 -0000	1.55
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -12,6 +12,8 @@
 Patch2:         inkscape-0.46pre2-icons.patch
 Patch3:         inkscape-0.46-fixlatex.patch
 Patch4:         inkscape-0.46-gtkopen.patch
+Patch5:         inkscape-0.46-gtk2.13.3.patch
+Patch6:         inkscape-0.46-poppler-0.8.3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +78,8 @@
 %patch2 -p1 -b .icons
 %patch3 -p1 -b .fixlatex
 %patch4 -p0 -b .gtkopen
+%patch5 -p1 -b .gtk2.13.3
+%patch6 -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
@@ -135,6 +139,9 @@
 
 
 %changelog
+* Wed Jul 09 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-4
+- Fix compile issues with newer gtk and poppler
+
 * Thu Jun 26 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-3
 - Remove useless old hack, that triggered an assert after gtkfilechooser switched to gio