Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17570 from suvari/master

Browse Source 
inkscape: version bump to 1.4.2
This commit is contained in:
Kamil ATLI
2025-10-22 15:50:51 +03:00
committed by GitHub
parent 7ed5971be6 908f8583d6
commit 3ca20527ad
2 changed files with 135 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/graphics/inkscape/files/inkscape-1.4-poppler-25.06.0.patch
+123
View File
@@ -0,0 +1,123 @@
From https://gitlab.com/inkscape/inkscape/-/merge_requests/7264
From 97bd8f29a61e691ceea98ca2444b974cf4256ae0 Mon Sep 17 00:00:00 2001
From: Rafael Siejakowski <rs@rs-math.net>
Date: Sun, 8 Jun 2025 21:30:44 +0200
Subject: [PATCH] Fix build against Poppler 25.06
Accommodate for the private API change, whereby an array of pointers
has been replaced with a vector of unique_ptr.
Backported from MR 7261
https://gitlab.com/inkscape/inkscape/-/merge_requests/7261
Fixes https://gitlab.com/inkscape/inkscape/-/issues/5836
---
.../internal/pdfinput/pdf-parser.cpp | 23 +++++++++++--------
.../pdfinput/poppler-transition-api.h | 12 ++++++++++
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 01d7bf6ef0e..0d31eda16f4 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -27,6 +27,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
+#include <memory>
#include <mutex> // std::call_once()
#include <utility>
#include <vector>
@@ -686,7 +687,6 @@ void PdfParser::opSetLineWidth(Object args[], int /*numArgs*/)
void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
{
Object obj1, obj2, obj3, obj4, obj5;
- Function *funcs[4] = {nullptr, nullptr, nullptr, nullptr};
GfxColor backdropColor;
GBool haveBackdropColor = gFalse;
GBool alpha = gFalse;
@@ -744,13 +744,14 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
state->setLineWidth(obj2.getNum());
}
+ _POPPLER_DECLARE_TRANSFER_FUNCTION_VECTOR(funcs);
+
// transfer function
if (_POPPLER_CALL_ARGS_DEREF(obj2, obj1.dictLookup, "TR2").isNull()) {
_POPPLER_CALL_ARGS(obj2, obj1.dictLookup, "TR");
}
if (obj2.isName(const_cast<char *>("Default")) || obj2.isName(const_cast<char *>("Identity"))) {
- funcs[0] = funcs[1] = funcs[2] = funcs[3] = nullptr;
- state->setTransfer(funcs);
+ state->setTransfer(std::move(funcs));
} else if (obj2.isArray() && obj2.arrayGetLength() == 4) {
int pos = 4;
for (int i = 0; i < 4; ++i) {
@@ -763,12 +764,14 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
}
_POPPLER_FREE(obj3);
if (pos == 4) {
- state->setTransfer(funcs);
+ state->setTransfer(std::move(funcs));
}
} else if (obj2.isName() || obj2.isDict() || obj2.isStream()) {
if ((funcs[0] = Function::parse(&obj2))) {
- funcs[1] = funcs[2] = funcs[3] = nullptr;
- state->setTransfer(funcs);
+ funcs[1] = nullptr;
+ funcs[2] = nullptr;
+ funcs[3] = nullptr;
+ state->setTransfer(std::move(funcs));
}
} else if (!obj2.isNull()) {
error(errSyntaxError, getPos(), "Invalid transfer function in ExtGState");
@@ -790,8 +793,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
funcs[0] = Function::parse(&obj3);
if (funcs[0]->getInputSize() != 1 || funcs[0]->getOutputSize() != 1) {
error(errSyntaxError, getPos(), "Invalid transfer function in soft mask in ExtGState");
- delete funcs[0];
- funcs[0] = nullptr;
+ _POPPLER_DELETE_TRANSFER_FUNCTION(funcs[0]);
}
}
_POPPLER_FREE(obj3);
@@ -835,9 +837,10 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
}
}
}
- doSoftMask(&obj3, alpha, blendingColorSpace.get(), isolated, knockout, funcs[0], &backdropColor);
+ doSoftMask(&obj3, alpha, blendingColorSpace.get(), isolated, knockout,
+ _POPPLER_GET_TRANSFER_FUNCTION_POINTER(funcs[0]), &backdropColor);
if (funcs[0]) {
- delete funcs[0];
+ _POPPLER_DELETE_TRANSFER_FUNCTION(funcs[0]);
}
} else {
error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group");
diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
index a67132ba6bd..d04412757bc 100644
--- a/src/extension/internal/pdfinput/poppler-transition-api.h
+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
@@ -15,6 +15,18 @@
#include <glib/poppler-features.h>
#include <poppler/UTF.h>
+#if POPPLER_CHECK_VERSION(25, 6, 0)
+#define _POPPLER_DECLARE_TRANSFER_FUNCTION_VECTOR(name) std::vector<std::unique_ptr<Function>> name(4)
+#define _POPPLER_DELETE_TRANSFER_FUNCTION(name) name.reset()
+#define _POPPLER_GET_TRANSFER_FUNCTION_POINTER(name) name.get()
+#else
+#define _POPPLER_DECLARE_TRANSFER_FUNCTION_VECTOR(name) Function *name[4] = {}
+#define _POPPLER_DELETE_TRANSFER_FUNCTION(name) \
+ delete name; \
+ name = nullptr
+#define _POPPLER_GET_TRANSFER_FUNCTION_POINTER(name) name
+#endif
+
#if POPPLER_CHECK_VERSION(25,2,0)
#define _POPPLER_GET_CODE_TO_GID_MAP(ff, len) getCodeToGIDMap(ff)
#define _POPPLER_GET_CID_TO_GID_MAP(len) getCIDToGIDMap()
--
GitLab
multimedia/graphics/inkscape/pspec.xml
+12 -10
View File
@@ -15,8 +15,8 @@
<IsA>app:gui</IsA>
<Summary>SVG vector graphics application.</Summary>
<Description>Inkscape is an application to create, edit, and convert SVG vector graphics images that can also import from and export to bitmap image files.</Description>
<Archive sha1sum="d4db06230fdd069c11bf50abc40725148cc6876a" type="tarxz">
https://inkscape.org/gallery/item/53679/inkscape-1.4.tar.xz
<Archive sha1sum="9b8ae93a7e73b561491adc2c5cd37c68284096e5" type="tarxz">
https://inkscape.org/gallery/item/56344/inkscape-1.4.2.tar.xz
</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
@@ -60,7 +60,6 @@
<Dependency>libwpd-devel</Dependency>
<Dependency>liblqr-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>libsoup-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>boost-python3</Dependency>
<Dependency>poppler-devel</Dependency>
@@ -68,6 +67,7 @@
<Dependency>libyaml-devel</Dependency>
<Dependency>libvisio-devel</Dependency>
<Dependency>libspiro-devel</Dependency>
<Dependency>pstoedit-devel</Dependency>
<Dependency>gtkspell3-devel</Dependency>
<Dependency>dbus-glib-devel</Dependency>
<Dependency>librevenge-devel</Dependency>
@@ -81,12 +81,7 @@
<Dependency>python3-pygobject3-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>inkscape-1.4-cmake4.patch</Patch>
<Patch>inkscape-1.4-gcc15.patch</Patch>
<Patch>inkscape-1.4-poppler-24.10-fix-backport.patch</Patch>
<Patch>inkscape-1.4-poppler-24.11.0.patch</Patch>
<Patch>inkscape-1.4-poppler-24.12.0.patch</Patch>
<Patch>inkscape-1.4-poppler-25.02.0.patch</Patch>
<Patch>inkscape-1.4-poppler-25.06.0.patch</Patch>
</Patches>
</Source>
@@ -118,7 +113,6 @@
<Dependency>potrace</Dependency>
<Dependency>cairomm</Dependency>
<Dependency>libgomp</Dependency>
<Dependency>libsoup</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>pangomm</Dependency>
@@ -130,6 +124,7 @@
<Dependency>libvisio</Dependency>
<Dependency>libspiro</Dependency>
<Dependency>libepoxy</Dependency>
<Dependency>pstoedit</Dependency>
<Dependency>dbus-glib</Dependency>
<Dependency>gtkspell3</Dependency>
<Dependency>libsigc++</Dependency>
@@ -192,6 +187,13 @@
</Package>
<History>
<Update release="22">
<Date>2025-10-22</Date>
<Version>1.4.2</Version>
<Comment>Version bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="21">
<Date>2025-04-29</Date>
<Version>1.4</Version>