inkscape: bump version

This commit is contained in:
Gerasim Troeglazov
2024-03-17 17:36:07 +10:00
parent b0f3cc11ff
commit 27f186d21e
2 changed files with 66 additions and 21 deletions

View File

@@ -7,12 +7,12 @@ unlimited resolution and is not bound to a fixed number of pixels like raster \
graphics. Inkscape uses the standardized SVG file format as its main format, \
which is supported by many other applications including web browsers."
HOMEPAGE="https://inkscape.org/"
COPYRIGHT="2022 Inkscape Developers"
COPYRIGHT="2024 Inkscape Developers"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://inkscape.org/gallery/item/37360/inkscape-$portVersion.tar.xz"
CHECKSUM_SHA256="a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4"
SOURCE_DIR="inkscape-${portVersion}_2022-12-01_b0a8486541"
SOURCE_URI="https://inkscape.org/gallery/item/44615/inkscape-$portVersion.tar.xz"
CHECKSUM_SHA256="dbd1844dc443fe5e10d3e9a887144e5fb7223852fff191cfb5ef7adeab0e086b"
SOURCE_DIR="inkscape-${portVersion}_2023-11-25_091e20ef0f"
PATCHES="inkscape-$portVersion.patchset"
ADDITIONAL_FILES="
inkscape.rdef.in
@@ -76,7 +76,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
boehm_gc${secondaryArchSuffix}_devel
devel:libboost_filesystem$secondaryArchSuffix >= 1.70.0
devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0
devel:libcdr_0.1$secondaryArchSuffix
devel:libfontconfig$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
@@ -90,7 +90,7 @@ BUILD_REQUIRES="
devel:liblcms2$secondaryArchSuffix
devel:libpango_1.0$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix >= 117
devel:libpoppler$secondaryArchSuffix >= 131
devel:librevenge_0.0$secondaryArchSuffix
devel:libsoup_2.4$secondaryArchSuffix
devel:libdouble_conversion$secondaryArchSuffix

View File

@@ -1,14 +1,14 @@
From fdc2d8a6febc35aeb2485b9f73606930cf47d716 Mon Sep 17 00:00:00 2001
From 617f126d4bdcf4398e7ffad2b7184d4886be2864 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 24 Jan 2022 20:07:10 -0500
Subject: tracedialog: Fix build under Haiku.
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 114e341..29a6b8b 100644
index 6f173aa..ca289ab 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -32,6 +32,10 @@
@@ -30,6 +30,10 @@
#include "trace/potrace/inkscape-potrace.h"
#include "ui/util.h"
@@ -18,19 +18,19 @@ index 114e341..29a6b8b 100644
+
// This maps the column ids in the glade file to useful enums
static const std::map<std::string, Inkscape::Trace::Potrace::TraceType> trace_types = {
{"SS_BC", Inkscape::Trace::Potrace::TRACE_BRIGHTNESS},
{"SS_BC", Inkscape::Trace::Potrace::TraceType::BRIGHTNESS},
--
2.37.3
2.43.2
From 6be65721e566605f84172a08b671ac71e53d7132 Mon Sep 17 00:00:00 2001
From b0c0977e1a7351f1756680d5b850a89f7c3c57f9 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 26 Jan 2022 12:17:06 -0500
Subject: Add mechanism to get the program path under Haiku.
diff --git a/src/path-prefix.cpp b/src/path-prefix.cpp
index 1d61748..a8e8da1 100644
index e3be584..8681e43 100644
--- a/src/path-prefix.cpp
+++ b/src/path-prefix.cpp
@@ -31,6 +31,10 @@
@@ -44,7 +44,7 @@ index 1d61748..a8e8da1 100644
#include <cassert>
#include <glib.h>
#include <glibmm.h>
@@ -152,6 +156,16 @@ char const *get_program_name()
@@ -236,6 +240,16 @@ char const *get_program_name()
} else {
g_warning("get_program_name() - sysctl failed");
}
@@ -62,20 +62,20 @@ index 1d61748..a8e8da1 100644
#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");
--
2.37.3
2.43.2
From 1794c22439d09a2937db58145a1e73787648ca25 Mon Sep 17 00:00:00 2001
From 4203c255583e46df193313e3022423ff574f880d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 28 Jan 2022 08:26:36 +1000
Subject: Use glib for datadir
diff --git a/src/inkscape-main.cpp b/src/inkscape-main.cpp
index 4b67220..0bbabdc 100644
index b919b93..51718b7 100644
--- a/src/inkscape-main.cpp
+++ b/src/inkscape-main.cpp
@@ -16,6 +16,10 @@
@@ -18,6 +18,10 @@
#include <boost/algorithm/string/join.hpp>
#endif
@@ -85,8 +85,8 @@ index 4b67220..0bbabdc 100644
+
#include "inkscape-application.h"
#include "path-prefix.h"
#include "streq.h"
@@ -71,7 +75,7 @@ static void set_themes_env()
@@ -74,7 +78,7 @@ static void set_themes_env()
if (xdg_data_dirs.empty()) {
// initialize with reasonable defaults (should match what glib would do if the variable were unset!)
@@ -96,5 +96,50 @@ index 4b67220..0bbabdc 100644
// so we can just call it directly and modify XDG_DATA_DIRS later
auto data_dirs = Glib::get_system_data_dirs();
--
2.37.3
2.43.2
From 93cbebe37cb2bc5ea38924aa745020630ad511be Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 17 Nov 2023 22:30:42 +0100
Subject: include missing header file
diff --git a/src/object/uri.h b/src/object/uri.h
index 381adec..d5b211f 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>
--
2.43.2
From 21bf72ecec92742a505f613e08f9d011367495a7 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 Mar 2024 16:12:48 +1000
Subject: Disable stack protector
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 55462b3..04b6037 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -38,7 +38,7 @@ list(APPEND INKSCAPE_CXX_FLAGS "-DGTK_DISABLE_DEPRECATED")
list(APPEND INKSCAPE_CXX_FLAGS "-DGDK_DISABLE_DEPRECATED")
# 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 "-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=ignored-qualifiers") # e.g.: const int foo();
--
2.43.2