haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

wonderbrush: fix build on newer gcc

Browse Source
This commit is contained in:
Jérôme Duval
2025-10-22 21:44:41 +02:00
parent 4ce2e97b9c
commit e4b843cc9d
2 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
haiku-apps/wonderbrush/patches/wonderbrush-2.1.2.patchset Normal file
View File

@@ -0,0 +1,55 @@
From 1961fc86eb83ba59e95c651cffaa39bf6d2c3d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Wed, 22 Oct 2025 21:42:17 +0200
Subject: fix build on newer gcc
diff --git a/build/BuildServiceRules b/build/BuildServiceRules
index e60d55e..5aa0f2f 100644
--- a/build/BuildServiceRules
+++ b/build/BuildServiceRules
@@ -99,6 +99,11 @@ rule SysSubDirHdrs
SYSSUBDIRHDRS += [ FDirName $(<) ] ;
}
+rule FIncludes
+{
+ return $(HDRS_LOCAL_INCLUDES_OPTION)$(<) ;
+}
+
rule FSysIncludes
{
return $(HDRS_SYSTEM_INCLUDES_OPTION)$(<) ;
diff --git a/build/OverriddenJamRules b/build/OverriddenJamRules
index b22139c..22b6866 100644
--- a/build/OverriddenJamRules
+++ b/build/OverriddenJamRules
@@ -32,7 +32,11 @@ actions Chmod1
# changes to rules for sake of discrimination between system and non-system
# headers
-if $(OSPLAT) = X86 {
+if $(TARGET_PLATFORM) = haiku64 {
+ HDRS_INCLUDES_SEPARATOR ?= ;
+ HDRS_LOCAL_INCLUDES_OPTION ?= -iquote ;
+ HDRS_SYSTEM_INCLUDES_OPTION ?= -I ;
+} else if $(OSPLAT) = X86 {
HDRS_INCLUDES_SEPARATOR ?= -I- ;
HDRS_LOCAL_INCLUDES_OPTION ?= -I ;
HDRS_SYSTEM_INCLUDES_OPTION ?= -I ;
diff --git a/third_party/agg/font_freetype/agg_font_freetype.cpp b/third_party/agg/font_freetype/agg_font_freetype.cpp
index 7b580a3..91e0c65 100644
--- a/third_party/agg/font_freetype/agg_font_freetype.cpp
+++ b/third_party/agg/font_freetype/agg_font_freetype.cpp
@@ -157,7 +157,7 @@ namespace agg
FT_Vector* point;
FT_Vector* limit;
- char* tags;
+ unsigned char* tags;
int n; // index of contour in outline
int first; // index of first point in contour
--
2.51.0

3
haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
View File

@@ -27,11 +27,12 @@ vector editor."
HOMEPAGE="https://github.com/stippi/WonderBrush-v2"
COPYRIGHT="2005-2021, Stephan Aßmus und Ingo Weinhold GbR"
LICENSE="WonderBrush"
REVISION="11"
REVISION="12"
srcGitRev="f6df82a9021534130c1649080a26d21f9742610d"
SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
SOURCE_DIR="WonderBrush-v2-$srcGitRev"
CHECKSUM_SHA256="6e6e9c3294c2f1036e93b18283b6d80d5b7b072bab408ede0a5e0a0a7473e236"
PATCHES="wonderbrush-$portVersion.patchset"
ARCHITECTURES="all"