inkscape, bump to 1.4.2 (#12645)

This commit is contained in:
Schrijvers Luc
2025-07-31 15:14:25 +02:00
committed by GitHub
parent 286a936294
commit 2eb51633df
2 changed files with 21 additions and 39 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="2024 Inkscape Developers"
COPYRIGHT="2025 Inkscape Developers"
LICENSE="GNU GPL v2"
REVISION="2"
SOURCE_URI="https://inkscape.org/gallery/item/44615/inkscape-$portVersion.tar.xz"
CHECKSUM_SHA256="dbd1844dc443fe5e10d3e9a887144e5fb7223852fff191cfb5ef7adeab0e086b"
SOURCE_DIR="inkscape-${portVersion}_2023-11-25_091e20ef0f"
REVISION="1"
SOURCE_URI="https://inkscape.org/gallery/item/56344/inkscape-$portVersion.tar.xz"
CHECKSUM_SHA256="2000530c7917e5260c9e8575a7154ff6926643d2006487d714e304a963f0c782"
SOURCE_DIR="inkscape-${portVersion}_2025-05-08_ebf0e940d0"
PATCHES="inkscape-$portVersion.patchset"
ADDITIONAL_FILES="
inkscape.rdef.in
@@ -24,18 +24,19 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
inkscape$secondaryArchSuffix = $portVersion
lib:lib2geom$secondaryArchSuffix = $portVersion
app:Inkscape = $portVersion
app:Inkview = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
boehm_gc$secondaryArchSuffix
lib:lib2geom$secondaryArchSuffix
lib:libatkmm_1.6$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libcairo$secondaryArchSuffix
lib:libcairomm_1.0$secondaryArchSuffix
lib:libcdr_0.1$secondaryArchSuffix
lib:libdouble_conversion$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
@@ -51,20 +52,19 @@ REQUIRES="
lib:libharfbuzz$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:liblcms2$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:liblcms2$secondaryArchSuffix
lib:libpango_1.0$secondaryArchSuffix
lib:libpangomm_1.4$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libpoppler$secondaryArchSuffix
lib:libpoppler_glib$secondaryArchSuffix
lib:libpotrace$secondaryArchSuffix
lib:librevenge_0.0$secondaryArchSuffix
lib:librevenge_stream_0.0$secondaryArchSuffix
lib:librsvg_2$secondaryArchSuffix
lib:libsigc_2.0$secondaryArchSuffix
lib:libsoup_2.4$secondaryArchSuffix
lib:libdouble_conversion$secondaryArchSuffix
lib:libpotrace$secondaryArchSuffix
lib:libvisio_0.1$secondaryArchSuffix
lib:libwpd_0.10$secondaryArchSuffix
lib:libwpg_0.3$secondaryArchSuffix
@@ -76,8 +76,10 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
boehm_gc${secondaryArchSuffix}_devel
devel:libboost_filesystem$secondaryArchSuffix >= 1.85.0
devel:lib2geom$secondaryArchSuffix
devel:libboost_filesystem$secondaryArchSuffix >= 1.88.0
devel:libcdr_0.1$secondaryArchSuffix
devel:libdouble_conversion$secondaryArchSuffix
devel:libfontconfig$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
@@ -90,12 +92,11 @@ BUILD_REQUIRES="
devel:liblcms2$secondaryArchSuffix
devel:libpango_1.0$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix >= 133
devel:libpoppler_glib$secondaryArchSuffix == 8.26.0
devel:libpoppler$secondaryArchSuffix >= 148
devel:libpoppler_glib$secondaryArchSuffix >= 8.29
devel:libpotrace$secondaryArchSuffix
devel:librevenge_0.0$secondaryArchSuffix
devel:libsoup_2.4$secondaryArchSuffix
devel:libdouble_conversion$secondaryArchSuffix
devel:libpotrace$secondaryArchSuffix
devel:libvisio_0.1$secondaryArchSuffix
devel:libwpd_0.10$secondaryArchSuffix
devel:libwpg_0.3$secondaryArchSuffix
@@ -106,6 +107,7 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:msgfmt$secondaryArchSuffix
cmd:ninja
cmd:pkg_config$secondaryArchSuffix
"
@@ -121,6 +123,7 @@ BUILD()
-DSHARE_INSTALL=$dataDir \
-DINKSCAPE_DATADIR=$dataDir \
-DPACKAGE_LOCALE_DIR=$dataDir/locale \
-DWITH_INTERNAL_2GEOM=OFF \
-DWITH_X11=OFF \
-Wno-dev
@@ -135,6 +138,7 @@ INSTALL()
mv $appsDir/Inkscape/inkview $appsDir/Inkscape/Inkview
rm -rf $appsDir/Inkscape/{include,share} $appsDir/Inkscape/lib/{cmake,pkgconfig}
rm -rf $dataDir/{applications,icons,metainfo}
local APP_SIGNATURE="application/x-vnd.inkscape-inkscape"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"

View File

@@ -5,11 +5,11 @@ Subject: tracedialog: Fix build under Haiku.
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 6f173aa..ca289ab 100644
index 53a3fcf..771de35 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -30,6 +30,10 @@
#include "trace/potrace/inkscape-potrace.h"
@@ -43,6 +43,10 @@
#include "ui/builder-utils.h"
#include "ui/util.h"
+#ifdef __HAIKU__
@@ -99,28 +99,6 @@ index b919b93..51718b7 100644
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