diff --git a/2f3101417.patch b/2f3101417.patch deleted file mode 100644 index 929d8bc..0000000 --- a/2f3101417.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2f3101417a04721c42b6b101dde07fa961a56f1b Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 6 Sep 2022 10:10:25 +0000 -Subject: [PATCH] Fix build with Poppler 22.09.0 - -Adapt to changes in Poppler's getLineDash/setLineDash interface to allow building with Poppler 22.09.0. ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++ - src/extension/internal/pdfinput/svg-builder.cpp | 9 ++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index cca1e84096..80d64c9b86 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/) - _POPPLER_FREE(obj); - } - } -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ state->setLineDash(std::vector (dash, dash + length), args[1].getNum()); -+#else - state->setLineDash(dash, length, args[1].getNum()); -+#endif - builder->updateStyle(state); - } - -diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp -index 12f71dd921..9fc56fe63c 100644 ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) { - sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str()); - - // Line dash -- double *dash_pattern; - int dash_length; - double dash_start; -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ const double *dash_pattern; -+ const std::vector &dash = state->getLineDash(&dash_start); -+ dash_pattern = dash.data(); -+ dash_length = dash.size(); -+#else -+ double *dash_pattern; - state->getLineDash(&dash_pattern, &dash_length, &dash_start); -+#endif - if ( dash_length > 0 ) { - Inkscape::CSSOStringStream os_array; - for ( int i = 0 ; i < dash_length ; i++ ) { --- -GitLab - diff --git a/inkscape-1.2.1_2022-07-14_9c6d41e410.tar.xz b/inkscape-1.2.1_2022-07-14_9c6d41e410.tar.xz deleted file mode 100644 index 396585a..0000000 --- a/inkscape-1.2.1_2022-07-14_9c6d41e410.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b -size 98048464 diff --git a/inkscape-1.2.1_2022-07-14_9c6d41e410.tar.xz.sig b/inkscape-1.2.1_2022-07-14_9c6d41e410.tar.xz.sig deleted file mode 100644 index 3a9395a..0000000 Binary files a/inkscape-1.2.1_2022-07-14_9c6d41e410.tar.xz.sig and /dev/null differ diff --git a/inkscape-1.2.2_2022-12-01_b0a8486541.tar.xz b/inkscape-1.2.2_2022-12-01_b0a8486541.tar.xz new file mode 100644 index 0000000..e1860f2 --- /dev/null +++ b/inkscape-1.2.2_2022-12-01_b0a8486541.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4 +size 39392040 diff --git a/inkscape-1.2.2_2022-12-01_b0a8486541.tar.xz.sig b/inkscape-1.2.2_2022-12-01_b0a8486541.tar.xz.sig new file mode 100644 index 0000000..6158a5b Binary files /dev/null and b/inkscape-1.2.2_2022-12-01_b0a8486541.tar.xz.sig differ diff --git a/inkscape.changes b/inkscape.changes index 72df343..7aa8194 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Dec 18 14:02:37 UTC 2022 - thod_@gmx.de + +- Update to version 1.2.2: + + 4 crash fixes, over 25 bug fixes, 5 fixes for extension bugs + and 13 improved user interface translations + + 2f3101417.patch merged upstream + + See the full release notes for Inkscape 1.2.2 at + https://media.inkscape.org/media/doc/release_notes/1.2.2/Inkscape_1.2.2.html + ------------------------------------------------------------------- Wed Dec 7 15:25:33 UTC 2022 - Stefan Brüns diff --git a/inkscape.spec b/inkscape.spec index a58743d..7bcf26b 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -16,23 +16,21 @@ # -%define _version 1.2.1_2022-07-14_9c6d41e410 +%define _version 1.2.2_2022-12-01_b0a8486541 Name: inkscape -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: Vector Illustration Program License: GPL-3.0-only URL: https://inkscape.org/ -Source: https://inkscape.org/gallery/item/34673/inkscape-%{version}.tar.xz#/inkscape-%{_version}.tar.xz +Source: https://inkscape.org/gallery/item/37360/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 2f3101417.patch -- Fix build with Poppler 22.09.0 -Patch0: https://gitlab.com/inkscape/inkscape/-/commit/2f3101417.patch BuildRequires: cmake BuildRequires: double-conversion-devel @@ -59,7 +57,7 @@ BuildRequires: python3-gobject-devel BuildRequires: python3-xml BuildRequires: readline-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(2geom) +BuildRequires: pkgconfig(2geom) >= 1.2.2 BuildRequires: pkgconfig(GraphicsMagick++) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1)