From 9bfc5e66326cdb57014cbe0a1ea3a5ddb443c088c5c41f99cf004193bf7693e3 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 May 2019 08:47:58 +0000 Subject: [PATCH 1/2] Accepting request 703145 from home:marxin:branches:graphics - Disable LTO (boo#1135211). OBS-URL: https://build.opensuse.org/request/show/703145 OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=49 --- inkscape.changes | 5 +++++ inkscape.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/inkscape.changes b/inkscape.changes index a979bb7..e8677ac 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 15 13:09:07 UTC 2019 - Martin Liška + +- Disable LTO (boo#1135211). + ------------------------------------------------------------------- Sun Jan 20 05:26:11 UTC 2019 - seanlew@opensuse.org diff --git a/inkscape.spec b/inkscape.spec index d673026..95420fd 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -163,6 +163,7 @@ Inkscape is a vector graphics editor. %patch2 -p1 %build +%define _lto_cflags %{nil} %ifarch %{arm} export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif From c53887602c8e071eb6860be79f3386fb5fd870514289cd9a9249e30933ba552a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 31 May 2019 09:27:18 +0000 Subject: [PATCH 2/2] Accepting request 706629 from home:iznogood:factory Add patch from upstream to build with new poppler releases OBS-URL: https://build.opensuse.org/request/show/706629 OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=50 --- inkscape-fix-for-poppler-0.76.patch | 44 +++++++++++++++++++++++++++++ inkscape.changes | 6 ++++ inkscape.spec | 7 ++--- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 inkscape-fix-for-poppler-0.76.patch diff --git a/inkscape-fix-for-poppler-0.76.patch b/inkscape-fix-for-poppler-0.76.patch new file mode 100644 index 0000000..e606cdd --- /dev/null +++ b/inkscape-fix-for-poppler-0.76.patch @@ -0,0 +1,44 @@ +From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001 +From: Marc Jeanmougin +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 + ++#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 + diff --git a/inkscape.changes b/inkscape.changes index e8677ac..766064c 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 31 08:43:53 UTC 2019 - Bjørn Lie + +- 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 diff --git a/inkscape.spec b/inkscape.spec index 95420fd..0b4c10a 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -35,6 +35,8 @@ Patch0: inkscape-packages.patch 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,10 +159,7 @@ Inkscape is a vector graphics editor. %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build %define _lto_cflags %{nil}