From 653967bfd7fdbde0d8fef4ae463bec00eaf3e27c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 Feb 2020 21:50:13 +0100
Subject: [PATCH] wonderbrush: fix build.

disable on x86_64, it builds but doesn't work.
---
 .../patches/wonderbrush-2.1.2.patchset        | 53 +++++++++++++++++++
 .../wonderbrush/wonderbrush-2.1.2.recipe      |  7 ++-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 haiku-apps/wonderbrush/patches/wonderbrush-2.1.2.patchset

diff --git a/haiku-apps/wonderbrush/patches/wonderbrush-2.1.2.patchset b/haiku-apps/wonderbrush/patches/wonderbrush-2.1.2.patchset
new file mode 100644
index 000000000..691aedb03
--- /dev/null
+++ b/haiku-apps/wonderbrush/patches/wonderbrush-2.1.2.patchset
@@ -0,0 +1,53 @@
+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
+
diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
index 6013a060f..4902a1549 100644
--- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
+++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
@@ -25,8 +25,9 @@ srcGitRev="714967ef1e5f02d9807ed78cbab1583f758078e7"
 SOURCE_URI="https://github.com/stippi/WonderBrush-v2/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="f6f3bddd81c9de690fb076ae51afa29b3565217fe2b2f04f76bc8f18728bfc35"
 SOURCE_DIR="WonderBrush-v2-$srcGitRev"
+PATCHES="wonderbrush-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86_64"
+ARCHITECTURES="x86_gcc2 !x86_64"
 
 USER_SETTINGS_FILES="
 	settings/WonderBrush directory
@@ -59,7 +60,9 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	# multi-job builds don't work reliably
-	jam
+	[ $targetArchitecture = x86_64 ] && TARGET_PLATFORM=haiku64
+	[ $targetArchitecture = x86_gcc2 ] && TARGET_PLATFORM=haiku
+	jam -sTARGET_PLATFORM=$TARGET_PLATFORM
 }
 
 INSTALL()