diff options
Diffstat (limited to 'graphics/inkscape/adapt_to_poppler_0.58_autotools.patch')
| -rw-r--r-- | graphics/inkscape/adapt_to_poppler_0.58_autotools.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/graphics/inkscape/adapt_to_poppler_0.58_autotools.patch b/graphics/inkscape/adapt_to_poppler_0.58_autotools.patch new file mode 100644 index 0000000000..6094501b0a --- /dev/null +++ b/graphics/inkscape/adapt_to_poppler_0.58_autotools.patch @@ -0,0 +1,67 @@ +From 59a7e9551fbe8fae9ff755eae2fa09f31f020f91 Mon Sep 17 00:00:00 2001 +From: Tim Sheridan <tghs@tghs.net> +Date: Fri, 15 Sep 2017 21:00:10 +0100 +Subject: [PATCH] Adapt to poppler 0.58.0 in autotools build + +--- + build-x64-gtk3.xml | 1 + + build-x64.xml | 1 + + build.xml | 1 + + configure.ac | 5 +++++ + 4 files changed, 8 insertions(+) + +diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml +index 29ade0e..769f168 100644 +--- a/build-x64-gtk3.xml ++++ b/build-x64-gtk3.xml +@@ -393,6 +393,7 @@ + -DPOPPLER_NEW_ERRORAPI <!-- poppler changed the error api for 0.20.0 --> + -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.26.0 --> + -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.29.0 --> ++ -DPOPPLER_NEW_OBJECT_API <!-- poppler changed the object api for 0.58.0 --> + <!-- GTK+3 migration --> + -DGLIBMM_DISABLE_DEPRECATED + -DG_DISABLE_DEPRECATED +diff --git a/build-x64.xml b/build-x64.xml +index 7176723..abe230d 100644 +--- a/build-x64.xml ++++ b/build-x64.xml +@@ -388,6 +388,7 @@ + -DPOPPLER_NEW_ERRORAPI <!-- poppler changed the error api for 0.20.0 --> + -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.26.0 --> + -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.29.0 --> ++ -DPOPPLER_NEW_OBJECT_API <!-- poppler changed the object api for 0.58.0 --> + <!-- GTK+3 migration --> + -DGLIBMM_DISABLE_DEPRECATED + -DG_DISABLE_DEPRECATED +diff --git a/build.xml b/build.xml +index 90ba74d..1070aa9 100644 +--- a/build.xml ++++ b/build.xml +@@ -388,6 +388,7 @@ + -DPOPPLER_NEW_ERRORAPI <!-- poppler changed the error api for 0.20.0 --> + -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.26.0 --> + -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.29.0 --> ++ -DPOPPLER_NEW_OBJECT_API <!-- poppler changed the object api for 0.58.0 --> + <!-- GTK+3 migration --> + -DGLIBMM_DISABLE_DEPRECATED + -DG_DISABLE_DEPRECATED +diff --git a/configure.ac b/configure.ac +index 2454012..ff55553 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -454,6 +454,11 @@ 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 + ++PKG_CHECK_MODULES(POPPLER_NEW_OBJECT_API, poppler >= 0.58.0, popplernewobjectapi=yes, popplernewobjectapi=no) ++if test "x$popplernewobjectapi" = "xyes"; then ++ AC_DEFINE(POPPLER_NEW_OBJECT_API, 1, [Use new object API from Poppler >= 0.58.0]) ++fi ++ + CPPFLAGS=$ink_svd_CPPFLAGS + LIBS=$ink_svd_LIBS + +-- +libgit2 0.26.0 + |