inkscape 1.3.2-7 (znver1) 2024-17699
0

Status rejected
Submitter rugyada [@T] gmail.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/418219
Packages
inkscape-1.3.2-7.znver1.binary
inkscape-1.3.2-7.znver1.source
inkscape-debuginfo-1.3.2-7.znver1.debuginfo
inkscape-debugsource-1.3.2-7.znver1.binary
lib642geom-static-devel-1.3.2-7.znver1.binary
Build Date 2024-04-24 09:38:27 +0000 UTC
Last Updated 2024-04-27 14:37:58.063919401 +0000 UTC
$ git diff --patch-with-stat --summary 0f60cdf4b5f8ca5b1e4ad5cbb9edde894f7ff23a..d2b55a2ba8aa1f8c5ea69f01500ebe573694e32b

 .abf.yml      |  2 +-
 6089.patch    | 32 +++++++++++++++++++++++++++++++
 6209.patch    | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 inkscape.spec | 14 ++++++++------
 4 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 6089.patch
 create mode 100644 6209.patch

diff --git a/.abf.yml b/.abf.yml
index cce6c00..a5a309b 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
   inkscape-icons.tar.bz2: 855b86ea3315a79b0787b0ff8e32e2fde3f6cbb0
-  inkscape-1.2.1.tar.xz: 25d1c09f39fc90872981ef0e1b4f919c623c51c9
+  inkscape-1.3.2.tar.xz: b64a3db256c2039401ca62c6a3d97303891292e2
diff --git a/6089.patch b/6089.patch
new file mode 100644
index 0000000..f30e5ed
--- /dev/null
+++ b/6089.patch
@@ -0,0 +1,32 @@
+From 694d8ae43d06efff21adebf377ce614d660b24cd Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Fri, 17 Nov 2023 22:30:42 +0100
+Subject: [PATCH] include missing header file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes build error:
+```
+/build/inkscape/src/inkscape/src/object/uri.cpp: In constructor ‘Inkscape::URI::URI(const gchar*, const char*)’:
+/build/inkscape/src/inkscape/src/object/uri.cpp:86:9: error: ‘xmlFree’ was not declared in this scope; did you mean ‘xmlFreeURI’?
+   86 |         xmlFree(full);
+```
+---
+ src/object/uri.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/object/uri.h b/src/object/uri.h
+index 381adec58cf..d5b211fe2b2 100644
+--- a/src/object/uri.h
++++ b/src/object/uri.h
+@@ -13,6 +13,7 @@
+ #define INKSCAPE_URI_H
+ 
+ #include <libxml/uri.h>
++#include <libxml/xmlmemory.h>
+ #include <memory>
+ #include <string>
+ 
+-- 
+GitLab
diff --git a/6209.patch b/6209.patch
new file mode 100644
index 0000000..f119032
--- /dev/null
+++ b/6209.patch
@@ -0,0 +1,61 @@
+From 3dd9846ab99260134e11938f0e575be822507037 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 4 Mar 2024 22:59:40 +0100
+Subject: [PATCH] Fix build with >=poppler-24.03.0
+
+Fixes build errors caused by:
+
+"Use an enum for Function getType"
+Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/extension/internal/pdfinput/svg-builder.cpp | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 525fbfec0a..bcd7b1f61b 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1175,9 +1175,13 @@ static bool svgGetShadingColor(GfxShading *shading, double offset, GfxColor *res
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+                                    _POPPLER_CONST Function *func) {
+-    int type = func->getType();
++    auto type = func->getType();
+     auto space = shading->getColorSpace();
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++    if ( type == Function::Type::Sampled || type == Function::Type::Exponential ) {  // Sampled or exponential function
++#else
+     if ( type == 0 || type == 2 ) {  // Sampled or exponential function
++#endif
+         GfxColor stop1, stop2;
+         if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) {
+             return false;
+@@ -1185,7 +1189,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+             _addStopToGradient(gradient, 0.0, &stop1, space, 1.0);
+             _addStopToGradient(gradient, 1.0, &stop2, space, 1.0);
+         }
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++    } else if ( type == Function::Type::Stitching ) { // Stitching
++#else
+     } else if ( type == 3 ) { // Stitching
++#endif
+         auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
+         const double *bounds = stitchingFunc->getBounds();
+         const double *encode = stitchingFunc->getEncode();
+@@ -1200,7 +1208,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+         for ( int i = 0 ; i < num_funcs ; i++ ) {
+             svgGetShadingColor(shading, bounds[i + 1], &color);
+             // Add stops
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++            if (stitchingFunc->getFunc(i)->getType() == Function::Type::Exponential) {    // process exponential fxn
++#else
+             if (stitchingFunc->getFunc(i)->getType() == 2) {    // process exponential fxn
++#endif
+                 double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+                 if (expE > 1.0) {
+                     expE = (bounds[i + 1] - bounds[i])/expE;    // approximate exponential as a single straight line at x=1
+-- 
+GitLab
+
diff --git a/inkscape.spec b/inkscape.spec
index 467eb10..d64053b 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -8,15 +8,16 @@
 
 Summary:	A vector-based drawing program using SVG
 Name:		inkscape
-Version:	1.2.1
+Version:	1.3.2
 Release:	7
 License:	GPLv2+
 Group:		Graphics
-Url:		http://inkscape.sourceforge.net/
-Source0:	https://inkscape.org/gallery/item/34673/inkscape-%{version}.tar.xz
+Url:		http://inkscape.org/
+Source0:	https://inkscape.org/gallery/item/44615/inkscape-%{version}.tar.xz
 Source1:	%{name}-icons.tar.bz2
 Source100:	inkscape.rpmlintrc
-Patch0:		inkscape-1.2.1-poppler-22.09.patch
+Patch0:		https://gitlab.com/inkscape/inkscape/-/merge_requests/6089.patch
+Patch1:		https://gitlab.com/inkscape/inkscape/-/merge_requests/6209.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gdk-pixbuf2.0
@@ -43,7 +44,8 @@ BuildRequires:	pkgconfig(gdkmm-3.0) >= 3.22
 BuildRequires:	pkgconfig(gtk+-3.0) >= 3.22
 BuildRequires:	pkgconfig(gdk-3.0) >= 3.22
 BuildRequires:	pkgconfig(gdl-3.0) >= 3.4
-BuildRequires:	pkgconfig(ImageMagick)
+BuildRequires:	pkgconfig(libunwind-llvm)
+BuildRequires:	pkgconfig(GraphicsMagick)
 BuildRequires:	pkgconfig(lcms2)
 BuildRequires:	pkgconfig(libpng)
 BuildRequires:	pkgconfig(libwpg-0.3)
@@ -82,7 +84,7 @@ Group:		Development/Libraries
 Static library and header files for the 2geom library
 
 %prep
-%autosetup -p1 -a1 -n %{name}-%{version}_2022-07-14_9c6d41e410
+%autosetup -p1 -a1 -n %{name}-%{version}_2023-11-25_091e20ef0f
 %cmake \
 	-DBUILD_STATIC_LIBS:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=OFF \
Not Available

rugyada [@T] gmail.comNo Comment.56d 19hrs