garnome r6734 - in trunk: . freedesktop/poppler office/inkscape office/inkscape/files

[kbrae svn gnome org]

Author: kbrae
Date: Fri Sep 12 17:42:30 2008
New Revision: 6734
URL: http://svn.gnome.org/viewvc/garnome?rev=6734&view=rev

Log:
        * freedesktop/poppler:
        * office/inkscape:
        Fix inkscape build. Export xpdf headers in poppler. Add patch to
        fix GTK includes and patch from gentoo to make inkscape build with
        libpoppler >= 0.8.3.
        https://bugs.launchpad.net/inkscape/+bug/254849
        https://bugs.launchpad.net/inkscape/+bug/238223



Added:
   trunk/office/inkscape/files/
   trunk/office/inkscape/files/gtk-clist.patch
   trunk/office/inkscape/files/inkscape-0.46-poppler-0.8.3.patch
Modified:
   trunk/ChangeLog
   trunk/freedesktop/poppler/Makefile
   trunk/office/inkscape/Makefile
   trunk/office/inkscape/checksums

Modified: trunk/freedesktop/poppler/Makefile
==============================================================================
--- trunk/freedesktop/poppler/Makefile	(original)
+++ trunk/freedesktop/poppler/Makefile	Fri Sep 12 17:42:30 2008
@@ -18,6 +18,6 @@
 INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
 CONFIGURE_ARGS = $(DIRPATHS) --disable-poppler-qt --disable-poppler-qt4 \
-  --disable-gtk-test --enable-zlib
+  --disable-gtk-test --enable-zlib --enable-xpdf-headers
 
 include ../category.mk

Modified: trunk/office/inkscape/Makefile
==============================================================================
--- trunk/office/inkscape/Makefile	(original)
+++ trunk/office/inkscape/Makefile	Fri Sep 12 17:42:30 2008
@@ -2,14 +2,16 @@
 GARVERSION = 0.46
 CATEGORIES = geektoys
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-LIBDEPS = bindings/glibmm bindings/gtkmm bindings/libsigc++
+PATCHFILES = inkscape-0.46-poppler-0.8.3.patch gtk-clist.patch
+
+LIBDEPS = bindings/glibmm bindings/gtkmm bindings/libsigc++ freedesktop/poppler
 
 MASTER_SITES = http://$(SOURCEFORGE_NET)/inkscape/
 
 DESCRIPTION = inkscape
 define BLURB
 Inkscape is an Open Source vector graphics editor, with capabilities similar 
-to Illustrator, Freehand, CorelDraw, or Xara X using the  W3C standard Scalable 
+to Illustrator, Freehand, CorelDraw, or Xara X using the W3C standard Scalable 
 Vector Graphics  (SVG) file format. Supported SVG features include shapes, 
 paths, text, markers, clones, alpha blending, transforms, gradients, patterns, 
 and grouping.  Inkscape also supports Creative Commons meta-data, node editing,

Modified: trunk/office/inkscape/checksums
==============================================================================
--- trunk/office/inkscape/checksums	(original)
+++ trunk/office/inkscape/checksums	Fri Sep 12 17:42:30 2008
@@ -1 +1,3 @@
 3bae9034047379012127e52f9b138d32  download/inkscape-0.46.tar.gz
+fffe7ed73bdadcf0f90282d5afc4df30  download/inkscape-0.46-poppler-0.8.3.patch
+4d9d19e7f2ec3f5ef7546c3fa5b56491  download/gtk-clist.patch

Added: trunk/office/inkscape/files/gtk-clist.patch
==============================================================================
--- (empty file)
+++ trunk/office/inkscape/files/gtk-clist.patch	Fri Sep 12 17:42:30 2008
@@ -0,0 +1,11 @@
+--- inkscape-0.46/src/widgets/sp-xmlview-attr-list.h  2008/06/07 22:06:52 1.1
++++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h  2008/06/07 22:09:22
+@@ -13,7 +13,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include <gtk/gtkclist.h>
++#include <gtk/gtk.h>
+ #include "../xml/repr.h"
+ 
+ #include <glib.h>

Added: trunk/office/inkscape/files/inkscape-0.46-poppler-0.8.3.patch
==============================================================================
--- (empty file)
+++ trunk/office/inkscape/files/inkscape-0.46-poppler-0.8.3.patch	Fri Sep 12 17:42:30 2008
@@ -0,0 +1,42 @@
+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();