inkscape, bump to version 1.4.3 (#13865)

This commit is contained in:
Schrijvers Luc
2026-03-27 13:50:36 +01:00
committed by GitHub
parent ec371e27cd
commit 8011bf3e9c
2 changed files with 20 additions and 20 deletions

View File

@@ -9,10 +9,10 @@ which is supported by many other applications including web browsers."
HOMEPAGE="https://inkscape.org/" HOMEPAGE="https://inkscape.org/"
COPYRIGHT="2025 Inkscape Developers" COPYRIGHT="2025 Inkscape Developers"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="4" REVISION="1"
SOURCE_URI="https://inkscape.org/gallery/item/56344/inkscape-$portVersion.tar.xz" SOURCE_URI="https://inkscape.org/gallery/item/58914/inkscape-$portVersion.tar.xz"
CHECKSUM_SHA256="2000530c7917e5260c9e8575a7154ff6926643d2006487d714e304a963f0c782" CHECKSUM_SHA256="2e25f8b78150749ae52cf0cad7e409c907761a5e5a01ce567297289de0118df8"
SOURCE_DIR="inkscape-${portVersion}_2025-05-08_ebf0e940d0" SOURCE_DIR="inkscape-${portVersion}_2025-12-25_0d15f75042"
PATCHES="inkscape-$portVersion.patchset" PATCHES="inkscape-$portVersion.patchset"
ADDITIONAL_FILES=" ADDITIONAL_FILES="
inkscape.rdef.in inkscape.rdef.in
@@ -77,7 +77,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
boehm_gc${secondaryArchSuffix}_devel boehm_gc${secondaryArchSuffix}_devel
devel:lib2geom$secondaryArchSuffix devel:lib2geom$secondaryArchSuffix
devel:libboost_filesystem$secondaryArchSuffix >= 1.88.0 devel:libboost_filesystem$secondaryArchSuffix >= 1.90.0
devel:libcdr_0.1$secondaryArchSuffix devel:libcdr_0.1$secondaryArchSuffix
devel:libdouble_conversion$secondaryArchSuffix devel:libdouble_conversion$secondaryArchSuffix
devel:libfontconfig$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix
@@ -92,8 +92,8 @@ BUILD_REQUIRES="
devel:liblcms2$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix
devel:libpango_1.0$secondaryArchSuffix devel:libpango_1.0$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix devel:libpng16$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix >= 148 devel:libpoppler$secondaryArchSuffix >= 155
devel:libpoppler_glib$secondaryArchSuffix >= 8.29 devel:libpoppler_glib$secondaryArchSuffix >= 8.31
devel:libpotrace$secondaryArchSuffix devel:libpotrace$secondaryArchSuffix
devel:librevenge_0.0$secondaryArchSuffix devel:librevenge_0.0$secondaryArchSuffix
devel:libsoup_2.4$secondaryArchSuffix devel:libsoup_2.4$secondaryArchSuffix

View File

@@ -1,4 +1,4 @@
From 617f126d4bdcf4398e7ffad2b7184d4886be2864 Mon Sep 17 00:00:00 2001 From afee8fd2b305a4f10393f02b57b393822d4e5303 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com> From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 24 Jan 2022 20:07:10 -0500 Date: Mon, 24 Jan 2022 20:07:10 -0500
Subject: tracedialog: Fix build under Haiku. Subject: tracedialog: Fix build under Haiku.
@@ -20,10 +20,10 @@ index 53a3fcf..771de35 100644
static const std::map<std::string, Inkscape::Trace::Potrace::TraceType> trace_types = { static const std::map<std::string, Inkscape::Trace::Potrace::TraceType> trace_types = {
{"SS_BC", Inkscape::Trace::Potrace::TraceType::BRIGHTNESS}, {"SS_BC", Inkscape::Trace::Potrace::TraceType::BRIGHTNESS},
-- --
2.43.2 2.52.0
From b0c0977e1a7351f1756680d5b850a89f7c3c57f9 Mon Sep 17 00:00:00 2001 From d7f7e187cf196de0392dc0732abe258dfa7269a7 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com> From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 26 Jan 2022 12:17:06 -0500 Date: Wed, 26 Jan 2022 12:17:06 -0500
Subject: Add mechanism to get the program path under Haiku. Subject: Add mechanism to get the program path under Haiku.
@@ -62,20 +62,20 @@ index e3be584..8681e43 100644
#warning get_program_name() - no known way to obtain executable name on this platform #warning get_program_name() - no known way to obtain executable name on this platform
g_info("get_program_name() - no known way to obtain executable name on this platform"); g_info("get_program_name() - no known way to obtain executable name on this platform");
-- --
2.43.2 2.52.0
From 4203c255583e46df193313e3022423ff574f880d Mon Sep 17 00:00:00 2001 From 6ad9d73ebe3889138f9ce9faa562a0955e66d661 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 28 Jan 2022 08:26:36 +1000 Date: Fri, 28 Jan 2022 08:26:36 +1000
Subject: Use glib for datadir Subject: Use glib for datadir
diff --git a/src/inkscape-main.cpp b/src/inkscape-main.cpp diff --git a/src/inkscape-main.cpp b/src/inkscape-main.cpp
index b919b93..51718b7 100644 index c9880ca..c16c3c5 100644
--- a/src/inkscape-main.cpp --- a/src/inkscape-main.cpp
+++ b/src/inkscape-main.cpp +++ b/src/inkscape-main.cpp
@@ -18,6 +18,10 @@ @@ -19,6 +19,10 @@
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#endif #endif
@@ -86,7 +86,7 @@ index b919b93..51718b7 100644
#include "inkscape-application.h" #include "inkscape-application.h"
#include "path-prefix.h" #include "path-prefix.h"
@@ -74,7 +78,7 @@ static void set_themes_env() @@ -75,7 +79,7 @@ static void set_themes_env()
if (xdg_data_dirs.empty()) { if (xdg_data_dirs.empty()) {
// initialize with reasonable defaults (should match what glib would do if the variable were unset!) // initialize with reasonable defaults (should match what glib would do if the variable were unset!)
@@ -96,17 +96,17 @@ index b919b93..51718b7 100644
// so we can just call it directly and modify XDG_DATA_DIRS later // so we can just call it directly and modify XDG_DATA_DIRS later
auto data_dirs = Glib::get_system_data_dirs(); auto data_dirs = Glib::get_system_data_dirs();
-- --
2.43.2 2.52.0
From 21bf72ecec92742a505f613e08f9d011367495a7 Mon Sep 17 00:00:00 2001 From 64a9b7a2be95d963fe9a56165db47dbd668273a0 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 Mar 2024 16:12:48 +1000 Date: Sun, 17 Mar 2024 16:12:48 +1000
Subject: Disable stack protector Subject: Disable stack protector
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 55462b3..04b6037 100644 index 26650fb..6ca0eb0 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake --- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -38,7 +38,7 @@ list(APPEND INKSCAPE_CXX_FLAGS "-DGTK_DISABLE_DEPRECATED") @@ -38,7 +38,7 @@ list(APPEND INKSCAPE_CXX_FLAGS "-DGTK_DISABLE_DEPRECATED")
@@ -114,10 +114,10 @@ index 55462b3..04b6037 100644
# Errors for common mistakes # Errors for common mistakes
-list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong") -list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong")
+#list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong") +# list(APPEND INKSCAPE_CXX_FLAGS "-fstack-protector-strong")
list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format") # e.g.: printf("%s", std::string("foo")) list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format") # e.g.: printf("%s", std::string("foo"))
list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format-security") # e.g.: printf(variable); list(APPEND INKSCAPE_CXX_FLAGS "-Werror=format-security") # e.g.: printf(variable);
list(APPEND INKSCAPE_CXX_FLAGS "-Werror=ignored-qualifiers") # e.g.: const int foo(); list(APPEND INKSCAPE_CXX_FLAGS "-Werror=ignored-qualifiers") # e.g.: const int foo();
-- --
2.43.2 2.52.0