Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2019-06-03 18:45:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape" Mon Jun 3 18:45:49 2019 rev:101 rq:706633 version:0.92.4 Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2019-02-08 13:47:35.086794527 +0100 +++ /work/SRC/openSUSE:Factory/.inkscape.new.5148/inkscape.changes 2019-06-03 18:46:08.236624404 +0200 @@ -1,0 +2,11 @@ +Fri May 31 08:43:53 UTC 2019 - Bjørn Lie <[email protected]> + +- Add inkscape-fix-for-poppler-0.76.patch: Fix build with poppler + 0.76, patch from upstream git. + +------------------------------------------------------------------- +Wed May 15 13:09:07 UTC 2019 - Martin Liška <[email protected]> + +- Disable LTO (boo#1135211). + +------------------------------------------------------------------- New: ---- inkscape-fix-for-poppler-0.76.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.7PeEmi/_old 2019-06-03 18:46:09.372624014 +0200 +++ /var/tmp/diff_new_pack.7PeEmi/_new 2019-06-03 18:46:09.372624014 +0200 @@ -35,6 +35,8 @@ Patch1: build_internal_libraries_as_static.patch # PATCH-FIX-OPENSUSE fix_install_targets.patch -- use correct libdir etc. Patch2: fix_install_targets.patch +# PATCH-FIX-UPSTREAM inkscape-fix-for-poppler-0.76.patch -- Fix build with poppler 0.76 +Patch3: inkscape-fix-for-poppler-0.76.patch BuildRequires: gtkspell-devel %if 0%{?suse_version} > 1325 @@ -157,12 +159,10 @@ %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build +%define _lto_cflags %{nil} %ifarch %{arm} export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif ++++++ inkscape-fix-for-poppler-0.76.patch ++++++ >From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin <[email protected]> Date: Wed, 24 Apr 2019 14:11:26 +0200 Subject: [PATCH] Tentative fix for poppler 0.76 --- src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index 2981d6ee51..ddbff7671f 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { error(errInternal, -1, "Weird page contents"); return; } - parser = new Parser(xref, new Lexer(xref, obj), gFalse); + parser = new _POPPLER_NEW_PARSER(xref, obj); go(topLevel); delete parser; parser = NULL; diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h index 6e4dde7dee..21a60702fa 100644 --- a/src/extension/internal/pdfinput/poppler-transition-api.h +++ b/src/extension/internal/pdfinput/poppler-transition-api.h @@ -3,6 +3,13 @@ #include <glib/poppler-features.h> +#if POPPLER_CHECK_VERSION(0, 76, 0) +#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) +#else +#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) +#endif + + #if POPPLER_CHECK_VERSION(0, 72, 0) #define getCString c_str #endif -- 2.21.0
