From b0dc38c722b6cd5af2bb0bf2eb79fcc764d964d3 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Wed, 18 Jul 2018 17:17:06 +0200
Subject: [PATCH] scintilla: fix 32-bit build

* Minor reordering to follow guidelines.
---
 .../patches/scintilla-4.1.0.patchset          | 23 +++++++++++++++++++
 x11-libs/scintilla/scintilla-4.1.0.recipe     | 13 ++++++-----
 2 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 x11-libs/scintilla/patches/scintilla-4.1.0.patchset

diff --git a/x11-libs/scintilla/patches/scintilla-4.1.0.patchset b/x11-libs/scintilla/patches/scintilla-4.1.0.patchset
new file mode 100644
index 000000000..283016801
--- /dev/null
+++ b/x11-libs/scintilla/patches/scintilla-4.1.0.patchset
@@ -0,0 +1,23 @@
+From 0a8aea4cac2953deecdcdfadfab82c2e54dc38cb Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Wed, 18 Jul 2018 17:07:19 +0200
+Subject: Remove wrong check
+
+* On 32-bit Haiku ptrdiff_t is long, not int. This causes
+  undefined symbol errors when loading the shared object.
+
+diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx
+index 44d6942..06b3852 100644
+--- a/src/RunStyles.cxx
++++ b/src/RunStyles.cxx
+@@ -309,7 +309,5 @@ void RunStyles<DISTANCE, STYLE>::Check() const {
+ 
+ template class Scintilla::RunStyles<int, int>;
+ template class Scintilla::RunStyles<int, char>;
+-#if PTRDIFF_MAX != INT_MAX
+ template class Scintilla::RunStyles<ptrdiff_t, int>;
+ template class Scintilla::RunStyles<ptrdiff_t, char>;
+-#endif
+-- 
+2.16.4
+
diff --git a/x11-libs/scintilla/scintilla-4.1.0.recipe b/x11-libs/scintilla/scintilla-4.1.0.recipe
index fbb3f0871..afd0b9c1a 100644
--- a/x11-libs/scintilla/scintilla-4.1.0.recipe
+++ b/x11-libs/scintilla/scintilla-4.1.0.recipe
@@ -13,12 +13,13 @@ colours and multiple fonts."
 HOMEPAGE="http://scintilla.org"
 COPYRIGHT="1998-2018 Neil Hodgson"
 LICENSE="Scintilla"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla410.tgz"
 CHECKSUM_SHA256="3b070bd73f612ee91b3251036257c2bfd0c0cd32821e00874faec44d90d9c594"
 SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku410.tgz"
 CHECKSUM_SHA256_2="822bdf86af3ac72ee2d88a96412bb0c43b709c52472c354bf36d87eb32165db6"
 SOURCE_DIR="scintilla"
+PATCHES="scintilla-4.1.0.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -27,16 +28,16 @@ PROVIDES="
 	scintilla$secondaryArchSuffix = $portVersion
 	lib:libscintilla$secondaryArchSuffix = $portVersion
 	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
 PROVIDES_devel="
 	scintilla${secondaryArchSuffix}_devel = $portVersion
 	devel:libscintilla$secondaryArchSuffix = $portVersion
 	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
 REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
+	scintilla$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="