wonderbrush: patch is upstreamed, 64bit build fixed.

This commit is contained in:
Adrien Destugues
2020-12-10 18:09:27 +01:00
parent 96baa653e6
commit 7e8ed0061b
2 changed files with 5 additions and 59 deletions

View File

@@ -1,53 +0,0 @@
From 44f7cdd8c5244007bff5732e77c0d4cc29c0cdfe Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 Feb 2020 21:08:55 +0100
Subject: fix build
diff --git a/WonderBrush/src/Jamfile b/WonderBrush/src/Jamfile
index c1b5d1b..5becd29 100644
--- a/WonderBrush/src/Jamfile
+++ b/WonderBrush/src/Jamfile
@@ -99,7 +99,7 @@ RSRCS = WonderBrush.rsrc ;
# and it's name
# library: my_lib.a entry: my_lib.a or path/my_lib.a
LIBS = libagg.a libybcommon.a libwarpsharp.a
- be tracker translation stdc++ textencoding freetype layout expat z ;
+ be tracker translation $(LIBSTDC++) textencoding freetype layout expat z ;
if $(TARGET_PLATFORM) = zeta {
LIBS += zeta ;
diff --git a/build/BuildSettings b/build/BuildSettings
index 1ab39ad..3ad5114 100644
--- a/build/BuildSettings
+++ b/build/BuildSettings
@@ -55,6 +55,13 @@ switch $(TARGET_PLATFORM)
LIBSTDC++ = stdc++.r4 ;
}
+ case haiku64 :
+ {
+ AS = yasm ;
+ DEFINES += TARGET_PLATFORM_HAIKU ;
+ LIBSTDC++ = stdc++ ;
+ }
+
case r5 :
{
AS = nasm ;
diff --git a/common/src/gui/BubbleHelper.h b/common/src/gui/BubbleHelper.h
index 73b49be..9bedc46 100644
--- a/common/src/gui/BubbleHelper.h
+++ b/common/src/gui/BubbleHelper.h
@@ -57,7 +57,7 @@ class BubbleHelper {
void _DisplayHelp(const char* text,
BPoint where);
void _Helper();
- static int _helper(void* arg);
+ static status_t _helper(void* arg);
char* _GetHelp(BView* view);
BView* _FindView(BPoint where);
--
2.24.0

View File

@@ -18,16 +18,15 @@ change most of an objects properties later on. This could be called \
non-destructive editing, because adding another object (like a filter) does \
not actually destroy any pixel data."
HOMEPAGE="http://yellowbites.com/wonderbrush.html"
COPYRIGHT="2005-2019, Stephan Aßmus und Ingo Weinhold GbR"
COPYRIGHT="2005-2020, Stephan Aßmus und Ingo Weinhold GbR"
LICENSE="WonderBrush"
REVISION="9"
srcGitRev="714967ef1e5f02d9807ed78cbab1583f758078e7"
REVISION="10"
srcGitRev="a876a28b99c13414184b8f5a27567b03edc2b32e"
SOURCE_URI="https://github.com/stippi/WonderBrush-v2/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="f6f3bddd81c9de690fb076ae51afa29b3565217fe2b2f04f76bc8f18728bfc35"
SOURCE_DIR="WonderBrush-v2-$srcGitRev"
PATCHES="wonderbrush-$portVersion.patchset"
CHECKSUM_SHA256="16a4fd0582289bbdf8a509ca45c2f8fa9731af9b7aa44a9507daa0cba6239e59"
ARCHITECTURES="x86_gcc2 !x86_64"
ARCHITECTURES="x86_gcc2 x86_64"
USER_SETTINGS_FILES="
settings/WonderBrush directory