Accepting request 266626 from GNOME:Apps
- Add inkscape-fix-build-with-poppler-0.29.patch: Fix build with poppler 0.29. Patch has been backported from https://bugs.launchpad.net/inkscape/+bug/1399811. OBS-URL: https://build.opensuse.org/request/show/266626 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=78
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
5d61e9ed26
commit
6568850bf6
94
inkscape-fix-build-with-poppler-0.29.patch
Normal file
94
inkscape-fix-build-with-poppler-0.29.patch
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
--- inkscape-0.48.5.orig/configure.ac
|
||||||
|
+++ inkscape-0.48.5/configure.ac
|
||||||
|
@@ -593,6 +593,11 @@ if test "x$popplernewercolorspaceapi" =
|
||||||
|
AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
|
||||||
|
fi
|
||||||
|
|
||||||
|
+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
|
||||||
|
+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
|
||||||
|
+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
# Poppler's b604a008 commit changes this
|
||||||
|
AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
|
||||||
|
popplergfxcolor="no"
|
||||||
|
--- inkscape-0.48.5.orig/src/extension/internal/pdfinput/pdf-parser.cpp
|
||||||
|
+++ inkscape-0.48.5/src/extension/internal/pdfinput/pdf-parser.cpp
|
||||||
|
@@ -860,7 +860,9 @@ void PdfParser::opSetExtGState(Object ar
|
||||||
|
blendingColorSpace = NULL;
|
||||||
|
isolated = knockout = gFalse;
|
||||||
|
if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
|
||||||
|
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
||||||
|
+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
|
||||||
|
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
|
||||||
|
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
|
||||||
|
blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
|
||||||
|
@@ -1085,7 +1087,13 @@ void PdfParser::opSetFillColorSpace(Obje
|
||||||
|
|
||||||
|
state->setFillPattern(NULL);
|
||||||
|
res->lookupColorSpace(args[0].getName(), &obj);
|
||||||
|
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
||||||
|
+ if (obj.isNull()) {
|
||||||
|
+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
|
||||||
|
+ } else {
|
||||||
|
+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
|
||||||
|
+ }
|
||||||
|
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
if (obj.isNull()) {
|
||||||
|
colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
|
||||||
|
} else {
|
||||||
|
@@ -1126,7 +1134,13 @@ void PdfParser::opSetStrokeColorSpace(Ob
|
||||||
|
|
||||||
|
state->setStrokePattern(NULL);
|
||||||
|
res->lookupColorSpace(args[0].getName(), &obj);
|
||||||
|
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
||||||
|
+ if (obj.isNull()) {
|
||||||
|
+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
|
||||||
|
+ } else {
|
||||||
|
+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
|
||||||
|
+ }
|
||||||
|
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
if (obj.isNull()) {
|
||||||
|
colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
|
||||||
|
} else {
|
||||||
|
@@ -2756,8 +2770,10 @@ void PdfParser::doImage(Object *ref, Str
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!obj1.isNull()) {
|
||||||
|
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
|
||||||
|
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
||||||
|
+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
|
||||||
|
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
|
||||||
|
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
|
||||||
|
colorSpace = GfxColorSpace::parse(&obj1, NULL);
|
||||||
|
#else
|
||||||
|
@@ -2847,8 +2863,10 @@ void PdfParser::doImage(Object *ref, Str
|
||||||
|
obj2.free();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
|
||||||
|
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
||||||
|
+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
|
||||||
|
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
|
||||||
|
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
|
||||||
|
maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
|
||||||
|
#else
|
||||||
|
@@ -3040,7 +3058,9 @@ void PdfParser::doForm(Object *str) {
|
||||||
|
if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
|
||||||
|
transpGroup = gTrue;
|
||||||
|
if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
|
||||||
|
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
||||||
|
+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
|
||||||
|
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
||||||
|
blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
|
||||||
|
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
|
||||||
|
blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
|
||||||
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 29 08:31:27 UTC 2014 - mlin@suse.com
|
||||||
|
|
||||||
|
- Add inkscape-fix-build-with-poppler-0.29.patch: Fix build with
|
||||||
|
poppler 0.29. Patch has been backported from
|
||||||
|
https://bugs.launchpad.net/inkscape/+bug/1399811.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Nov 22 19:53:52 UTC 2014 - stefan.bruens@rwth-aachen.de
|
Sat Nov 22 19:53:52 UTC 2014 - stefan.bruens@rwth-aachen.de
|
||||||
|
|
||||||
|
|||||||
@ -37,6 +37,8 @@ Patch2: inkscape-return-on-exit.patch
|
|||||||
Patch4: inkscape-apply-invert-transform.patch
|
Patch4: inkscape-apply-invert-transform.patch
|
||||||
# PATCH-FIX-UPSTREAM inkscape-0.48.5-librevenge.patch lp#1323592 fstrba@suse.com -- port to librevenge based libwpg (backported to inkscape 0.48.5)
|
# PATCH-FIX-UPSTREAM inkscape-0.48.5-librevenge.patch lp#1323592 fstrba@suse.com -- port to librevenge based libwpg (backported to inkscape 0.48.5)
|
||||||
Patch8: inkscape-0.48.5-librevenge.patch
|
Patch8: inkscape-0.48.5-librevenge.patch
|
||||||
|
# PATCH-FIX-UPSTREAM inkscape-fix-build-with-poppler-0.29.patch lp#1399811 mlin@suse.com -- fix build with poppler 0.29 (backported to inkscape 0.48.5)
|
||||||
|
Patch9: inkscape-fix-build-with-poppler-0.29.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
@ -166,6 +168,7 @@ Inkscape is a vector illustration program for the GNOME desktop.
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
libtoolize --force --copy --install
|
libtoolize --force --copy --install
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user