From b2a89be85a88114b9e26935abd02be5e11c159fe02d2a723ba77eac2a44f23ab Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 4 Mar 2022 11:37:52 +0000 Subject: [PATCH] Accepting request 959288 from home:iznogood:branches:graphics - Update to version 1.1.2: + Dependencies updated, fixing bitmap exports + Graphic tablet pens erasors switch to the correct tool + Fix lost styling of text converted to path + Fix relative position of clones pasted to a new document + Fix various crashes - Drop ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch: Fixed upstream. - Add Fix_build_poppler_22030.patch: Fix build with poppler 22.03.0 OBS-URL: https://build.opensuse.org/request/show/959288 OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=85 --- Fix_build_poppler_22030.patch | 35 ++++++++++++++++++ ...de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch | 30 --------------- inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz | 3 -- ...ape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz.sig | Bin 95 -> 0 bytes inkscape-1.1.2_2022-02-04_0a00cf5339.tar.xz | 3 ++ ...ape-1.1.2_2022-02-04_0a00cf5339.tar.xz.sig | Bin 0 -> 95 bytes inkscape.changes | 13 +++++++ inkscape.spec | 13 +++---- 8 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 Fix_build_poppler_22030.patch delete mode 100644 ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch delete mode 100644 inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz delete mode 100644 inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz.sig create mode 100644 inkscape-1.1.2_2022-02-04_0a00cf5339.tar.xz create mode 100644 inkscape-1.1.2_2022-02-04_0a00cf5339.tar.xz.sig diff --git a/Fix_build_poppler_22030.patch b/Fix_build_poppler_22030.patch new file mode 100644 index 0000000..41fbff2 --- /dev/null +++ b/Fix_build_poppler_22030.patch @@ -0,0 +1,35 @@ +From 15ab83e02b07018c3ffd4952a2623393187659e0 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Wed, 2 Mar 2022 19:50:02 +0200 +Subject: [PATCH] Fix build with poppler 22.03.0 + +PDFDoc's constructor now takes an std::unique_ptr as the filename and +the rest of the parameters are std::optional and can be left out. + +Also, remove an obsolete comment regarding special handling on win32; +the "ifndef _WIN32" it was referring to has been removed by commit +ad8effaa6ec3 ("Fix PDF import with non-ASCII filename on Windows"). +--- + src/extension/internal/pdfinput/pdf-input.cpp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +Index: inkscape-1.1.2_2022-02-04_0a00cf5339/src/extension/internal/pdfinput/pdf-input.cpp +=================================================================== +--- inkscape-1.1.2_2022-02-04_0a00cf5339.orig/src/extension/internal/pdfinput/pdf-input.cpp ++++ inkscape-1.1.2_2022-02-04_0a00cf5339/src/extension/internal/pdfinput/pdf-input.cpp +@@ -666,10 +666,12 @@ PdfInput::open(::Inkscape::Extension::In + // PDFDoc is from poppler. PDFDoc is used for preview and for native import. + std::shared_ptr pdf_doc; + +- // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from +- // glib gstdio.c ++#if POPPLER_CHECK_VERSION(22, 3, 0) ++ pdf_doc = std::make_shared(std::make_unique(uri)); // TODO: Could ask for password ++#else + GooString *filename_goo = new GooString(uri); +- pdf_doc = std::make_shared(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password ++ pdf_doc = std::make_shared(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password ++#endif + + if (!pdf_doc->isOk()) { + int error = pdf_doc->getErrorCode(); diff --git a/ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch b/ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch deleted file mode 100644 index 3733d91..0000000 --- a/ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras -Date: Mon, 1 Nov 2021 21:45:38 +0200 -Subject: [PATCH] Fix build with poppler 21.11.0 - -GfxFont::tag is now of type std::string instead of GooString *. -(cherry picked from commit 5724c21b9cb7b6176a7b36ca24068b148c817e82) ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index e3d04d544b..feecefa043 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) - } - if (printCommands) { - printf(" font: tag=%s name='%s' %g\n", -+#if POPPLER_CHECK_VERSION(21,11,0) -+ font->getTag().c_str(), -+#else - font->getTag()->getCString(), -+#endif - font->getName() ? font->getName()->getCString() : "???", - args[1].getNum()); - fflush(stdout); --- -GitLab - diff --git a/inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz b/inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz deleted file mode 100644 index b56d566..0000000 --- a/inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af -size 34221284 diff --git a/inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz.sig b/inkscape-1.1.1_2021-09-20_3bf5ae0d25.tar.xz.sig deleted file mode 100644 index c207813f81048643fd6811ccc01f39e80224384a26da80fb623a3173d6a3e09d..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WGQ)ZOLzurRHMSCve)sa75siQZKz^pO7wDbXW-%#fQjs%%P`OQ v{6VMK + +- Update to version 1.1.2: + + Dependencies updated, fixing bitmap exports + + Graphic tablet pens erasors switch to the correct tool + + Fix lost styling of text converted to path + + Fix relative position of clones pasted to a new document + + Fix various crashes +- Drop ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch: Fixed + upstream. +- Add Fix_build_poppler_22030.patch: Fix build with poppler 22.03.0 + ------------------------------------------------------------------- Mon Jan 17 18:59:38 UTC 2022 - Mykola Krachkovsky diff --git a/inkscape.spec b/inkscape.spec index 71b29f4..dbd251b 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -16,24 +16,23 @@ # -%define _version 1.1.1_2021-09-20_3bf5ae0d25 +%define _version 1.1.2_2022-02-04_0a00cf5339 Name: inkscape -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Vector Illustration Program License: GPL-3.0-only URL: https://inkscape.org/ -Source: https://inkscape.org/gallery/item/29255/inkscape-%{version}.tar.xz#/inkscape-%{_version}.tar.xz +Source: https://inkscape.org/gallery/item/31668/inkscape-%{version}.tar.xz#/inkscape-%{_version}.tar.xz # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.py Source98: https://media.inkscape.org/media/resources/sigs/inkscape-%{_version}.tar.xz.sig Source99: https://inkscape.org/~MarcJeanmougin/gpg#/%name.keyring - -# PATCH-FIX-UPSTREAM ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch -- Fix build with poppler 21.11.0 -Patch0: https://gitlab.com/inkscape/inkscape/-/commit/ebc4de4bfe34d6c5f2e27da47f5d62e4de0394fd.patch +# PATCH-FIX-UPSTREAM Fix_build_poppler_22030.patch -- Fix build with poppler 22.03.0 +Patch0: Fix_build_poppler_22030.patch BuildRequires: cmake BuildRequires: double-conversion-devel @@ -172,7 +171,7 @@ export CXX=g++-10 # Only useful for translators. rm %{buildroot}%{_datadir}/inkscape/extensions/genpofiles.sh # Packaging/distribution info. -rm %{buildroot}%{_datadir}/inkscape/extensions/{LICENSE.txt,MANIFEST.in,README.md,STYLEGUIDE.md,TESTING.md} +rm %{buildroot}%{_datadir}/inkscape/extensions/{LICENSE.txt,MANIFEST.in,README.md,TESTING.md} # Test framework. rm %{buildroot}%{_datadir}/inkscape/extensions/setup.{cfg,py} \ %{buildroot}%{_datadir}/inkscape/extensions/tox.ini \