Re: [sisyphus] libpoppler.so.5 backwards incompatibility

["Dmitry V. Levin" <ldv@altlinux.org>]

[-- Attachment #1.1: Type: text/plain, Size: 1360 bytes --]

On Fri, Jan 22, 2010 at 02:35:25AM +0300, Dmitry V. Levin wrote:
> On Thu, Jan 21, 2010 at 06:15:57PM -0500, Ivan Adzhubey wrote:
> > Dmitry, spasibo chto nashli vremja vzgljanut! Est' li shans na 
> > rabotosposobnuju sborku? Google pokazyvaet chto problema obsuzhdaetsa no 
> > gotovogo reshenija ja ne vizhu.
> > 
> > Proshu proshenija za English i za translit, russkogo na rabote na klaviature 
> > net. No chitat' Cyrillic ja mogu tak chto ne objazatel'no mne otvechat' 
> > po-anglijski ;-)
> 
> Я не специалист ни в poppler, ни в inkscape.  Пакет inkscape-0.47-alt4 в
> Сизифе перестал проходить тест на пересборку сразу после того, как в
> Сизифе обновился пакет poppler5 с версии 0.12.1 на более новую:
> 
> extension/internal/pdfinput/pdf-parser.cpp: In member function 'void PdfParser::opSetExtGState(Object*, int)':
> extension/internal/pdfinput/pdf-parser.cpp:812: error: no matching function for call to 'GfxColorSpace::parse(Object*)'
> /usr/include/poppler/GfxState.h:182: note: candidates are: static GfxColorSpace* GfxColorSpace::parse(Object*, Gfx*)
> (и ещё куча аналогичных ошибок из-за смены API у poppler'а)
> 
> Я надеюсь, что upstream poppler'а это скоро исправит (если ещё не
> исправил).

Похоже что уже исправили, см.
https://bugs.launchpad.net/inkscape/+bug/487038
и приложенный патч оттуда.


-- 
ldv

[-- Attachment #1.2: inkscape-ubuntu-poppler-API.patch --]
[-- Type: text/plain, Size: 3674 bytes --]

#! /bin/sh /usr/share/dpatch/dpatch-run
## 50-poppler-API.patch.dpatch by Kees Cook <kees@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: https://bugs.launchpad.net/inkscape/+bug/487038

@DPATCH@
diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp
--- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp	2009-10-10 12:17:47.000000000 -0700
+++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp	2009-12-23 22:34:13.000000000 -0800
@@ -809,7 +809,7 @@
 	  blendingColorSpace = NULL;
 	  isolated = knockout = gFalse;
 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
-	    blendingColorSpace = GfxColorSpace::parse(&obj5);
+	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
 	  }
 	  obj5.free();
 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
@@ -1009,9 +1009,9 @@
   state->setFillPattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0]);
+    colorSpace = GfxColorSpace::parse(&args[0], NULL);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj);
+    colorSpace = GfxColorSpace::parse(&obj, NULL);
   }
   obj.free();
   if (colorSpace) {
@@ -1032,9 +1032,9 @@
   state->setStrokePattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0]);
+    colorSpace = GfxColorSpace::parse(&args[0], NULL);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj);
+    colorSpace = GfxColorSpace::parse(&obj, NULL);
   }
   obj.free();
   if (colorSpace) {
@@ -1101,7 +1101,7 @@
       builder->updateStyle(state);
     }
     if (args[numArgs-1].isName() &&
-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
       state->setFillPattern(pattern);
       builder->updateStyle(state);
     }
@@ -1145,7 +1145,7 @@
       builder->updateStyle(state);
     }
     if (args[numArgs-1].isName() &&
-	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
       state->setStrokePattern(pattern);
       builder->updateStyle(state);
     }
@@ -1543,7 +1543,7 @@
   double *matrix = NULL;
   GBool savedState = gFalse;
 
-  if (!(shading = res->lookupShading(args[0].getName()))) {
+  if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
     return;
   }
 
@@ -2507,7 +2507,7 @@
       }
     }
     if (!obj1.isNull()) {
-      colorSpace = GfxColorSpace::parse(&obj1);
+      colorSpace = GfxColorSpace::parse(&obj1, NULL);
     } else if (csMode == streamCSDeviceGray) {
       colorSpace = new GfxDeviceGrayColorSpace();
     } else if (csMode == streamCSDeviceRGB) {
@@ -2592,7 +2592,7 @@
 	  obj2.free();
 	}
       }
-      maskColorSpace = GfxColorSpace::parse(&obj1);
+      maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
       obj1.free();
       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
 	goto err1;
@@ -2767,7 +2767,7 @@
     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
       transpGroup = gTrue;
       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
-	blendingColorSpace = GfxColorSpace::parse(&obj3);
+	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
       }
       obj3.free();
       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]