Accepting request 981522 from graphics

OBS-URL: https://build.opensuse.org/request/show/981522
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=121

Fix_build_poppler_22030.patch

@@ -1,51 +0,0 @@
-From f7857a4fc2b916e64d9689ccc89914ad19f3ef0a Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 20 Mar 2022 22:41:51 -0300
-Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
-
-This change ensures that Inkscape will build against Poppler 22.03 after
-the changes that were made to the constructor of `PDFDoc`.
-
-See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
-
-Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
-(cherry picked from commit a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75)
----
- src/extension/internal/pdfinput/pdf-input.cpp            | 3 +--
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index e6204f650c..82b0d97765 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -668,8 +668,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
-
-     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
-     // glib gstdio.c
--    GooString *filename_goo = new GooString(uri);
--    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
-+    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
-
-     if (!pdf_doc->isOk()) {
-         int error = pdf_doc->getErrorCode();
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 87a19d4c42..50b617c25c 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
-+#else
-+#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 83, 0)
- #define _POPPLER_CONST_83 const
- #else
---
-GitLab
-

Fix_build_poppler_22040.patch

@@ -1,144 +0,0 @@
-From 08b2f3d93c08bcf1e363f4284112fd14a7cbd09c Mon Sep 17 00:00:00 2001
-From: Rafael Siejakowski <rs@rs-math.net>
-Date: Mon, 4 Apr 2022 22:09:39 -0300
-Subject: [PATCH] Compatibility with Poppler 22.04
-
-Replace vanilla pointers with std::shared_ptr for pointers to fonts;
-eliminate manual ref-counting.
-Cherry-picked from 6a7b9ec0af088baa08b92fd76b33eca26537fb35.
-
-Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
----
- src/extension/internal/pdfinput/pdf-parser.cpp     | 14 ++++++++------
- .../internal/pdfinput/poppler-transition-api.h     |  6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp    |  7 +------
- src/extension/internal/pdfinput/svg-builder.h      |  1 -
- 4 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index feecefa043..d6e2ede4f3 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -30,6 +30,7 @@
- #include "Gfx.h"
- #include "pdf-parser.h"
- #include "util/units.h"
-+#include "poppler-transition-api.h"
-
- #include "glib/poppler-features.h"
- #include "goo/gmem.h"
-@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
- // TODO not good that numArgs is ignored but args[] is used:
- void PdfParser::opSetFont(Object args[], int /*numArgs*/)
- {
--  GfxFont *font = res->lookupFont(args[0].getName());
-+  auto font = res->lookupFont(args[0].getName());
-
-   if (!font) {
-     // unsetting the font (drawing no text) is better than using the
-@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-     fflush(stdout);
-   }
-
-+#if !POPPLER_CHECK_VERSION(22, 4, 0)
-   font->incRefCnt();
-+#endif
-   state->setFont(font, args[1].getNum());
-   fontChanged = gTrue;
- }
-@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
- #else
- void PdfParser::doShowText(GooString *s) {
- #endif
--  GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
-@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
- #endif
-   int len, n, uLen;
-
--  font = state->getFont();
-+  auto font = state->getFont();
-   wMode = font->getWMode();
-
-   builder->beginString(state);
-@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
-       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
- 			       code, u, uLen)) {*/
--        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
--	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
-+    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
- 	  pushResources(resDict);
--	}
-+    }
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 50b617c25c..dc9e47e45b 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
-
- #include <glib/poppler-features.h>
-
-+#if POPPLER_CHECK_VERSION(22, 4, 0)
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
-+#else
-+#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
-+#endif
-+
- #if POPPLER_CHECK_VERSION(22, 3, 0)
- #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 461a4fb788..8ad0331b97 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
-
- void SvgBuilder::_init() {
-     _font_style = nullptr;
--    _current_font = nullptr;
-     _font_specification = nullptr;
-     _font_scaling = 1;
-     _need_font_update = true;
-@@ -1021,11 +1020,8 @@ void SvgBuilder::updateFont(GfxState *state) {
-     _need_font_update = false;
-     updateTextMatrix(state);    // Ensure that we have a text matrix built
-
--    if (_font_style) {
--        //sp_repr_css_attr_unref(_font_style);
--    }
-     _font_style = sp_repr_css_attr_new();
--    GfxFont *font = state->getFont();
-+    auto font = state->getFont();
-     // Store original name
-     if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-@@ -1171,7 +1167,6 @@ void SvgBuilder::updateFont(GfxState *state) {
-         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
-     }
-
--    _current_font = font;
-     _invalidated_style = true;
- }
-
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index 050465d4bf..9422a0e5ba 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -203,7 +203,6 @@ private:
-     std::vector<SvgGraphicsState> _state_stack;
-
-     SPCSSAttr *_font_style;          // Current font style
--    GfxFont *_current_font;
-     const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
---
-GitLab
-

inkscape-1.1.2_2022-02-04_0a00cf5339.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ffe54a06d0b25a4cd8b6eb424536ef1ed205be13443a39cd437c8c7b89b96d1
-size 34222832

inkscape-1.2_2022-05-15_dc2aedaf03.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad
+size 39157952

inkscape.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Thu Jun  9 13:08:07 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix version: it's 1.2, not 1.2.0 (fixes download of upstream
+  assets referenced by URL).
+
+-------------------------------------------------------------------
+Sat Jun  4 16:30:50 UTC 2022 - thod_@gmx.de
+
+- Update to version 1.2:
+  + Inkscape documents can now hold multiple pages
+  + Editable markers and dash patterns
+  + Layers and objects dialog merged
+  + On-canvas alignment snapping and Snap settings redesign
+  + New 'Tiling' Live Path Effect
+  + Redesigned Export dialog with preview
+  + Import SVG images from Open Clipart, Wikimedia Commons and others
+  + Selectable object origin for numerical scaling and moving
+  + All alignment options in a single dialog
+  + Gradient editing in the Fill and Stroke dialog
+  + Gradient dithering
+  + SVG Font Editor updated
+  + Flowing text around shapes and text padding
+  + Convenience Boolean operation for splitting paths
+  + Configurable Tool bar
+- Drop patches: Fixed upstream
+  * Fix_build_poppler_22030.patch
+  * Fix_build_poppler_22040.patch
+
 -------------------------------------------------------------------
 Fri Apr 22 09:08:10 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 

inkscape.spec

@@ -16,25 +16,21 @@
 #
 
 
-%define _version 1.1.2_2022-02-04_0a00cf5339
+%define _version 1.2_2022-05-15_dc2aedaf03
 
 Name:           inkscape
-Version:        1.1.2
+Version:        1.2
 Release:        0
 Summary:        Vector Illustration Program
 License:        GPL-3.0-only
 URL:            https://inkscape.org/
 
-Source:         https://inkscape.org/gallery/item/31668/inkscape-%{version}.tar.xz#/inkscape-%{_version}.tar.xz
+Source:         https://inkscape.org/gallery/item/33449/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 Fix_build_poppler_22030.patch -- Fix build with poppler 22.03.0
-Patch0:         Fix_build_poppler_22030.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         Fix_build_poppler_22040.patch
 BuildRequires:  cmake
 BuildRequires:  double-conversion-devel
 BuildRequires:  fdupes
@@ -172,13 +168,15 @@ 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,TESTING.md}
+rm %{buildroot}%{_datadir}/inkscape/extensions/{LICENSE.txt,MANIFEST.in,README.md,TESTING.md,CONTRIBUTING.md}
 # Test framework.
-rm %{buildroot}%{_datadir}/inkscape/extensions/setup.{cfg,py} \
+rm %{buildroot}%{_datadir}/inkscape/extensions/tox.ini        \
-   %{buildroot}%{_datadir}/inkscape/extensions/tox.ini        \
    %{buildroot}%{_datadir}/inkscape/extensions/.pylintrc      \
    %{buildroot}%{_datadir}/inkscape/extensions/doxygen-main.dox
 rm -rf %{buildroot}%{_datadir}/inkscape/extensions/.pytest_cache
+# extensions/doc
+rm -rf %{buildroot}%{_datadir}/inkscape/extensions/docs
+rm %{buildroot}%{_datadir}/inkscape/extensions/{.darglint,.pre-commit-config.yaml,inkscape.extension.schema,poetry.lock,pyproject.toml}
 
 install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/inkscape/palettes/