commit: 6dc13ff7116e54b344c535e89d59e9bdae1a839f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jan 11 20:57:44 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jan 11 21:08:40 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc13ff7
media-gfx/inkscape: 1.4.3 version bump, fix build w/ poppler-26.01 Fix CMake <3.10 warning (set CMake minimum to 3.12) Closes: https://bugs.gentoo.org/965915 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/inkscape/Manifest | 1 + ...scape-1.4.3-libcroco-cmake-minreqver-3.12.patch | 20 +++++++ .../files/inkscape-1.4.3-poppler-26.01.patch | 61 ++++++++++++++++++++++ ...{inkscape-9999.ebuild => inkscape-1.4.3.ebuild} | 9 +++- media-gfx/inkscape/inkscape-9999.ebuild | 4 +- 5 files changed, 91 insertions(+), 4 deletions(-) diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 0ee422c1043d..37e0f4e220de 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1 +1,2 @@ DIST inkscape-1.4.2.tar.xz 53278452 BLAKE2B f42d675c51af7d5c8e01851a5eeb74d03b5b75436eabf25237559839b092b7382d03e388594aae97c511b143680f822940890fa787eab9bf78f1a91838456a49 SHA512 e7d69f477d11aee296efe48d3a9dd24f76fd5e64e5f2a29574f387bc681ced3d806d30b0f98d842c485443624dbf31fd9dabdb92848ee852121bc9d9e90191a1 +DIST inkscape-1.4.3.tar.xz 53907460 BLAKE2B 68cb04a34d82a5374ef0052e7932cb3d0bac0d11ffdb8da889167d8bdede826c6c44664d0242e8d5a2daf1581605c5c83e828147dc9ff76a13039b162a2de4cb SHA512 8bf8047f656f472ecac7a35badf83765873688901e94e93ec8388f920e1b8370e8c8c88d06ba91c26d668714b912f444b49bed59a8d1cf3e14d3ab206c3aff60 diff --git a/media-gfx/inkscape/files/inkscape-1.4.3-libcroco-cmake-minreqver-3.12.patch b/media-gfx/inkscape/files/inkscape-1.4.3-libcroco-cmake-minreqver-3.12.patch new file mode 100644 index 000000000000..192bf5939d1d --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.4.3-libcroco-cmake-minreqver-3.12.patch @@ -0,0 +1,20 @@ +Source: https://gitlab.com/inkscape/libcroco/-/commit/2fb152e7 + +From 2fb152e7d9928256b75d51a8a139d02186245d34 Mon Sep 17 00:00:00 2001 +From: PBS <[email protected]> +Date: Fri, 26 Dec 2025 19:54:03 +0100 +Subject: [PATCH] Fix cmake deprecation warning + +--- + src/3rdparty/libcroco/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/3rdparty/libcroco/CMakeLists.txt ++++ b/src/3rdparty/libcroco/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.6) ++cmake_minimum_required(VERSION 3.12) + + project(libcroco LANGUAGES C) + +-- diff --git a/media-gfx/inkscape/files/inkscape-1.4.3-poppler-26.01.patch b/media-gfx/inkscape/files/inkscape-1.4.3-poppler-26.01.patch new file mode 100644 index 000000000000..c74de91c7c91 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.4.3-poppler-26.01.patch @@ -0,0 +1,61 @@ +From 3a528728ebe33e10bb44d152f47cfedfddbfe18a Mon Sep 17 00:00:00 2001 +From: Thomas Holder <[email protected]> +Date: Sat, 10 Jan 2026 23:44:10 +0100 +Subject: [PATCH] Fix build with poppler 26.01.0 + +--- + src/extension/internal/pdfinput/pdf-input.cpp | 1 + + src/extension/internal/pdfinput/svg-builder.cpp | 9 +++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp +index 89d90ff0fe..bba8633e18 100644 +--- a/src/extension/internal/pdfinput/pdf-input.cpp ++++ b/src/extension/internal/pdfinput/pdf-input.cpp +@@ -32,6 +32,7 @@ + #include <poppler/glib/poppler.h> + #include <poppler/glib/poppler-document.h> + #include <poppler/glib/poppler-page.h> ++#include <poppler/goo/gmem.h> + #endif + + #include <gdkmm/general.h> +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +index 1b15b425b1..e1de266111 100644 +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -29,6 +29,7 @@ + #include <poppler/GfxState.h> + #include <poppler/Page.h> + #include <poppler/Stream.h> ++#include <poppler/goo/gmem.h> + + #ifdef _WIN32 + #undef near +@@ -2145,7 +2146,11 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height + } else { + image_stream = new ImageStream(str, width, 1, 1); + } ++#if POPPLER_CHECK_VERSION(26, 0, 0) ++ image_stream->rewind(); ++#else + image_stream->reset(); ++#endif + + // Convert grayscale values + unsigned char *buffer = new unsigned char[width]; +@@ -2171,7 +2176,11 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height + image_stream = new ImageStream(str, width, + color_map->getNumPixelComps(), + color_map->getBits()); ++#if POPPLER_CHECK_VERSION(26, 0, 0) ++ image_stream->rewind(); ++#else + image_stream->reset(); ++#endif + + // Convert RGB values + unsigned int *buffer = new unsigned int[width]; +-- +GitLab + diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.4.3.ebuild similarity index 96% copy from media-gfx/inkscape/inkscape-9999.ebuild copy to media-gfx/inkscape/inkscape-1.4.3.ebuild index 8ee60e5e1fed..a41853989093 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-1.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 # Remember to check the release notes for a 'Important Changes for Packagers' # section, e.g. https://inkscape.org/doc/release_notes/1.4/Inkscape_1.4.html#Important_Changes_for_Packagers. -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) PYTHON_REQ_USE="xml(+)" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 @@ -112,6 +112,11 @@ DEPEND="${COMMON_DEPEND} test? ( dev-cpp/gtest ) " +PATCHES=( + "${FILESDIR}"/${P}-poppler-26.01.patch # in git master + "${FILESDIR}"/${P}-libcroco-cmake-minreqver-3.12.patch # bug 965915 +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index 8ee60e5e1fed..438ae7269afe 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 # Remember to check the release notes for a 'Important Changes for Packagers' # section, e.g. https://inkscape.org/doc/release_notes/1.4/Inkscape_1.4.html#Important_Changes_for_Packagers. -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) PYTHON_REQ_USE="xml(+)" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
