[lfs-patches] r3733 - trunk/inkscape

ken at higgs.linuxfromscratch.org ken at higgs.linuxfromscratch.org
Tue Apr 24 12:19:15 PDT 2018


Author: ken
Date: Tue Apr 24 12:19:15 2018
New Revision: 3733

Log:
Patch inkscape to build with poppler-0.64.0.

Added:
   trunk/inkscape/inkscape-0.92.3-poppler64-1.patch

Added: trunk/inkscape/inkscape-0.92.3-poppler64-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/inkscape/inkscape-0.92.3-poppler64-1.patch	Tue Apr 24 12:19:15 2018	(r3733)
@@ -0,0 +1,67 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2018-04-24
+Initial Package Version: 0.92.3
+Upstream Status: unknown
+Origin: Arch
+Description: Fixes to build with poppler-0.64.0.
+
+diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp
+--- old/src/extension/internal/pdfinput/pdf-parser.cpp	2018-03-11 10:38:09.000000000 -1000
++++ new/src/extension/internal/pdfinput/pdf-parser.cpp	2018-04-21 08:55:27.901218709 -1000
+@@ -2490,7 +2490,7 @@
+     builder->updateFont(state);
+     fontChanged = gFalse;
+   }
+-  doShowText(args[0].getString());
++  doShowText((GooString *)args[0].getString());
+ }
+ 
+ // TODO not good that numArgs is ignored but args[] is used:
+@@ -2511,7 +2511,7 @@
+   ty = state->getLineY() - state->getLeading();
+   state->textMoveTo(tx, ty);
+   builder->updateTextPosition(tx, ty);
+-  doShowText(args[0].getString());
++  doShowText((GooString *)args[0].getString());
+ }
+ 
+ // TODO not good that numArgs is ignored but args[] is used:
+@@ -2534,7 +2534,7 @@
+   ty = state->getLineY() - state->getLeading();
+   state->textMoveTo(tx, ty);
+   builder->updateTextPosition(tx, ty);
+-  doShowText(args[2].getString());
++  doShowText((GooString *)args[2].getString());
+ }
+ 
+ // TODO not good that numArgs is ignored but args[] is used:
+@@ -2572,7 +2572,7 @@
+       }
+       builder->updateTextShift(state, obj.getNum());
+     } else if (obj.isString()) {
+-      doShowText(obj.getString());
++      doShowText((GooString *)obj.getString());
+     } else {
+       error(errSyntaxError, getPos(), "Element of show/space array must be number or string");
+     }
+@@ -2732,7 +2732,7 @@
+ {
+   Object obj1, obj2, obj3, refObj;
+ 
+-  char *name = args[0].getName();
++  char *name = (char *)args[0].getName();
+ #if defined(POPPLER_NEW_OBJECT_API)
+   if ((obj1 = res->lookupXObject(name)).isNull()) {
+ #else
+diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp
+--- old/src/extension/internal/pdfinput/svg-builder.cpp	2018-03-11 10:38:09.000000000 -1000
++++ new/src/extension/internal/pdfinput/svg-builder.cpp	2018-04-21 10:14:49.821436417 -1000
+@@ -1020,7 +1020,7 @@
+     GfxFont *font = state->getFont();
+     // Store original name
+     if (font->getName()) {
+-        _font_specification = font->getName()->getCString();
++        _font_specification = (char *)font->getName()->getCString();
+     } else {
+         _font_specification = (char*) "Arial";
+     }


More information about the patches mailing list