From 7795fd843f7cd8e54e3abfa37456972b3ca40d31 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Jul 2017 12:43:57 +0200
Subject: [PATCH] filwip: fix build on x86_64.

---
 haiku-apps/filwip/filwip-1.0.0.recipe         |   2 +-
 .../filwip/patches/filwip-1.0.0.patchset      | 128 +++++++++++++++++-
 2 files changed, 128 insertions(+), 2 deletions(-)

diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe
index 7f951c9da..fa3976fee 100644
--- a/haiku-apps/filwip/filwip-1.0.0.recipe
+++ b/haiku-apps/filwip/filwip-1.0.0.recipe
@@ -15,7 +15,7 @@ SOURCE_DIR="FilWip-$commit"
 ADDITIONAL_FILES="install_plugins.sh"
 PATCHES="filwip-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	filwip = $portVersion
diff --git a/haiku-apps/filwip/patches/filwip-1.0.0.patchset b/haiku-apps/filwip/patches/filwip-1.0.0.patchset
index fe9e81927..9fa5505f5 100644
--- a/haiku-apps/filwip/patches/filwip-1.0.0.patchset
+++ b/haiku-apps/filwip/patches/filwip-1.0.0.patchset
@@ -1,4 +1,4 @@
-From 1a0c9680541c3b386ea09f858a97b1cf185b8b21 Mon Sep 17 00:00:00 2001
+From 109496146bb83404fea5ae937246da2ed1946250 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 18 May 2017 22:40:48 +0200
 Subject: gcc5 patch
@@ -229,3 +229,129 @@ index cef3f29..8e03678 100644
 -- 
 2.12.2
 
+
+From 225ee633de3b62689fa3d3b6e3117a6ecab7a3b0 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 14 Jul 2017 23:11:27 +0200
+Subject: fix x86_64 build.
+
+
+diff --git a/Source/BubbleHelp/BubbleHelper.cpp b/Source/BubbleHelp/BubbleHelper.cpp
+index cfab103..2494756 100644
+--- a/Source/BubbleHelp/BubbleHelper.cpp
++++ b/Source/BubbleHelp/BubbleHelper.cpp
+@@ -33,7 +33,7 @@
+ 
+ #include "BubbleHelper.h"
+ 
+-long BubbleHelper::runcount = 0;
++int32 BubbleHelper::runcount = 0;
+ 
+ /*============================================================================================================*/
+ 
+@@ -159,7 +159,7 @@ char *BubbleHelper::GetHelp (BView *view)
+ 
+ /*============================================================================================================*/
+ 
+-long BubbleHelper::_helper (void *arg)
++int32 BubbleHelper::_helper (void *arg)
+ {
+ 	((BubbleHelper*)arg)->Helper();
+ 	return 0;
+@@ -205,7 +205,7 @@ void BubbleHelper::Helper()
+ 	while  (be_app_messenger.IsValid())
+ 	{
+ 		BPoint where;
+-		ulong buttons;
++		uint32 buttons;
+ 		if (enabled)
+ 		{
+ 			if (textwin->Lock())
+diff --git a/Source/BubbleHelp/BubbleHelper.h b/Source/BubbleHelp/BubbleHelper.h
+index 8c00711..80b5571 100644
+--- a/Source/BubbleHelp/BubbleHelper.h
++++ b/Source/BubbleHelp/BubbleHelper.h
+@@ -44,7 +44,7 @@ class BubbleHelper
+ 		BView			*FindView (BPoint where);
+ 		
+ 		/* Thread function */
+-		static long		_helper (void *arg);
++		static int32		_helper (void *arg);
+ 
+ 		/* Misc. private variables */
+ 		bigtime_t		delayTime;
+@@ -54,7 +54,7 @@ class BubbleHelper
+ 		BTextView		*textview;
+ 		bool			enabled;
+ 		
+-		static long		runcount;
++		static int32		runcount;
+ };
+ 
+ #endif /* _BUBBLEHELPER_H */
+diff --git a/Source/EraserLooper.cpp b/Source/EraserLooper.cpp
+index 4fedc01..e9e59ab 100644
+--- a/Source/EraserLooper.cpp
++++ b/Source/EraserLooper.cpp
+@@ -99,7 +99,7 @@ void EraserLooper::EraseList (bool guiMode)
+ 
+ 	for (;;)
+ 	{
+-		const char *path = (const char*)entryList.RemoveItem (0L);
++		const char *path = (const char*)entryList.RemoveItem ((int32)0);
+ 		
+ 		if (!path)
+ 			break;
+diff --git a/Source/InfoStrView.cpp b/Source/InfoStrView.cpp
+index 9772153..6e62562 100644
+--- a/Source/InfoStrView.cpp
++++ b/Source/InfoStrView.cpp
+@@ -33,6 +33,7 @@
+ #include <Messenger.h>
+ #include <Path.h>
+ 
++#include <stdlib.h>
+ #include <string>
+ #include <string.h>
+ 
+diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp
+index f951676..064e877 100644
+--- a/Source/MainWindow.cpp
++++ b/Source/MainWindow.cpp
+@@ -355,7 +355,7 @@ MainWindow::~MainWindow ()
+ 	PluginContainerItem *cItem (NULL);
+ 	do
+ 	{
+-		cItem = (PluginContainerItem*)containerItems.RemoveItem (0L);
++		cItem = (PluginContainerItem*)containerItems.RemoveItem ((int32)0);
+ 		if (cItem != NULL)
+ 			delete cItem;
+ 	} while (cItem != NULL);
+diff --git a/Source/PluginParser.cpp b/Source/PluginParser.cpp
+index bfce2a1..362a9ca 100644
+--- a/Source/PluginParser.cpp
++++ b/Source/PluginParser.cpp
+@@ -58,7 +58,7 @@ PluginContainerItem::~PluginContainerItem ()
+ 	PluginItem *sItem (NULL);
+ 	for (;;)
+ 	{
+-		sItem = (PluginItem*)subItems.RemoveItem (0L);
++		sItem = (PluginItem*)subItems.RemoveItem ((int32)0);
+ 		if (sItem == NULL)
+ 			break;
+ 		
+diff --git a/Source/PrefsView.cpp b/Source/PrefsView.cpp
+index bf1faf0..f1d593f 100644
+--- a/Source/PrefsView.cpp
++++ b/Source/PrefsView.cpp
+@@ -28,6 +28,7 @@
+ #include "PrefsView.h"
+ #include "Constants.h"
+ 
++#include <stdlib.h>
+ #include <string.h>
+ 
+ /*============================================================================================================*/
+-- 
+2.12.2
+