diff --git a/inkscape-poppler058-fix.patch b/inkscape-poppler058-fix.patch index 6f818ce..f6e6f06 100644 --- a/inkscape-poppler058-fix.patch +++ b/inkscape-poppler058-fix.patch @@ -1389,3 +1389,71 @@ index 5ede59b..604b7f8 100644 -- libgit2 0.26.0 + +From 59a7e9551fbe8fae9ff755eae2fa09f31f020f91 Mon Sep 17 00:00:00 2001 +From: Tim Sheridan +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 + -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API + -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ++ -DPOPPLER_NEW_OBJECT_API + + -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 + -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API + -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ++ -DPOPPLER_NEW_OBJECT_API + + -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 + -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API + -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ++ -DPOPPLER_NEW_OBJECT_API + + -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 + diff --git a/inkscape.changes b/inkscape.changes index 5cb6919..43cca01 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Sep 23 16:20:45 UTC 2017 - plinnell@opensuse.org + +- Disable IM7 until upstream supports it +- Resolves: https://bugzilla.suse.com/show_bug.cgi?id=1059927 + +------------------------------------------------------------------- +Sat Sep 23 11:53:02 UTC 2017 - zaitor@opensuse.org + +- Rebase inkscape-poppler058-fix.patch: Add yet an upstream commit. + ------------------------------------------------------------------- Fri Sep 15 19:15:32 UTC 2017 - zaitor@opensuse.org diff --git a/inkscape.spec b/inkscape.spec index 637dba7..f528b46 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -47,7 +47,8 @@ BuildRequires: gnome-vfs2-devel BuildRequires: gsl-devel BuildRequires: gtkmm24-devel BuildRequires: intltool -BuildRequires: libMagick++-devel +# Disabling IM until inkscape upstream supports IM7 +#BuildRequires: libMagick++-devel BuildRequires: liblcms2-devel BuildRequires: libpoppler-glib-devel BuildRequires: libtool