From ef9b86e59c488d35fb38ef50fe18d4df6d381636 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sun, 7 Oct 2018 20:20:05 +0200
Subject: [PATCH] scintilla: bump version

---
 .../patches/scintilla-4.1.0.patchset          | 23 -------------------
 ...la-4.1.0.recipe => scintilla-4.1.2.recipe} | 11 ++++-----
 2 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 x11-libs/scintilla/patches/scintilla-4.1.0.patchset
 rename x11-libs/scintilla/{scintilla-4.1.0.recipe => scintilla-4.1.2.recipe} (87%)

diff --git a/x11-libs/scintilla/patches/scintilla-4.1.0.patchset b/x11-libs/scintilla/patches/scintilla-4.1.0.patchset
deleted file mode 100644
index 283016801..000000000
--- a/x11-libs/scintilla/patches/scintilla-4.1.0.patchset
+++ /dev/null
@@ -1,23 +0,0 @@
-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.2.recipe
similarity index 87%
rename from x11-libs/scintilla/scintilla-4.1.0.recipe
rename to x11-libs/scintilla/scintilla-4.1.2.recipe
index 595f7596e..b67501023 100644
--- a/x11-libs/scintilla/scintilla-4.1.0.recipe
+++ b/x11-libs/scintilla/scintilla-4.1.2.recipe
@@ -13,13 +13,12 @@ colours and multiple fonts."
 HOMEPAGE="https://scintilla.org"
 COPYRIGHT="1998-2018 Neil Hodgson"
 LICENSE="Scintilla"
-REVISION="4"
-SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla410.tgz"
-CHECKSUM_SHA256="3b070bd73f612ee91b3251036257c2bfd0c0cd32821e00874faec44d90d9c594"
+REVISION="1"
+SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla${portVersion//\./}.tgz"
+CHECKSUM_SHA256="8c54787600fbefa5240ff3c4ac1c84fa186a445091377dde8194a4f1e1471d52"
 SOURCE_DIR="scintilla"
-SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku410.tgz"
-CHECKSUM_SHA256_2="822bdf86af3ac72ee2d88a96412bb0c43b709c52472c354bf36d87eb32165db6"
-PATCHES="scintilla-4.1.0.patchset"
+SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku${portVersion//\./}.tgz"
+CHECKSUM_SHA256_2="dc846ab45b47dcfa87829babccb50ee3da40301d6de4124ba92417957a5c0bb3"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"