From 2984761c91e10aaf6c50c73f2f37389679824742 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sun, 17 Mar 2019 01:00:49 +0100
Subject: [PATCH] scintilla: bump version

---
 .../patches/scintilla-4.1.3.patchset          | 75 -------------------
 ...la-4.1.3.recipe => scintilla-4.1.4.recipe} |  9 +--
 2 files changed, 4 insertions(+), 80 deletions(-)
 delete mode 100644 x11-libs/scintilla/patches/scintilla-4.1.3.patchset
 rename x11-libs/scintilla/{scintilla-4.1.3.recipe => scintilla-4.1.4.recipe} (88%)

diff --git a/x11-libs/scintilla/patches/scintilla-4.1.3.patchset b/x11-libs/scintilla/patches/scintilla-4.1.3.patchset
deleted file mode 100644
index 29de52363..000000000
--- a/x11-libs/scintilla/patches/scintilla-4.1.3.patchset
+++ /dev/null
@@ -1,75 +0,0 @@
-From 206eec847c17c61dcaa069da43612a5d8ad0e1ef Mon Sep 17 00:00:00 2001
-From: Kacper Kasper <kacperkasper@gmail.com>
-Date: Wed, 30 Jan 2019 18:17:11 +0100
-Subject: Apply changes made after the release
-
-* Fixes scroll bars and autoscroll.
-
-diff --git a/haiku/ScintillaHaiku.cxx b/haiku/ScintillaHaiku.cxx
-index 74ca95b..13c83c4 100644
---- a/haiku/ScintillaHaiku.cxx
-+++ b/haiku/ScintillaHaiku.cxx
-@@ -172,7 +172,6 @@ void CallTipView::Draw(BRect updateRect) {
- 
- class ScintillaHaiku : public ScintillaBase, public BView {
- public:
--	ScintillaHaiku();
- 	ScintillaHaiku(BRect rect);
- 
- 	// functions from Scintilla:
-@@ -240,17 +239,8 @@ private:
- 	BScrollView* scrollView;
- };
- 
--ScintillaHaiku::ScintillaHaiku():
--	BView("ScintillaHaikuView", B_WILL_DRAW | B_FRAME_EVENTS),
--	scrollView(NULL)
--{
--	capturedMouse = false;
--
--	Initialise();
--}
--
- ScintillaHaiku::ScintillaHaiku(BRect rect):
--	BView(rect, "ScintillaHaikuView", B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS),
-+	BView(rect, "ScintillaHaikuView", B_FOLLOW_ALL, B_WILL_DRAW),
- 	scrollView(NULL)
- {
- 	capturedMouse = false;
-@@ -430,9 +420,12 @@ bool ScintillaHaiku::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) {
- 		if(ScrollBar(B_HORIZONTAL) != NULL) {
- 			ScrollBar(B_HORIZONTAL)->SetRange(1, horizEndPreferred + 1);
- 			ScrollBar(B_HORIZONTAL)->SetSteps(charWidth, pageIncrement);
-+			ScrollBar(B_HORIZONTAL)->SetProportion(0.0);
- 		}
- 		if(ScrollBar(B_VERTICAL) != NULL) {
- 			ScrollBar(B_VERTICAL)->SetRange(1, nMax - pageScroll + 1);
-+			ScrollBar(B_VERTICAL)->SetSteps(1.0, pageScroll - 1);
-+			ScrollBar(B_VERTICAL)->SetProportion(0.0);
- 		}
- 		UnlockLooper();
- 		return true;
-@@ -823,10 +816,9 @@ void ScintillaHaiku::MouseMoved(BPoint point, uint32 transit, const BMessage* me
- 	switch(transit) {
- 		case B_ENTERED_VIEW:
- 		case B_INSIDE_VIEW:
--			ButtonMoveWithModifiers(pt, when, mod);
--		break;
- 		case B_EXITED_VIEW:
- 		case B_OUTSIDE_VIEW:
-+			ButtonMoveWithModifiers(pt, when, mod);
- 		break;
- 	};
- }
-@@ -923,7 +915,7 @@ BScintillaView::BScintillaView(BRect rect, const char* name, uint32 resizingMode
- BScintillaView::BScintillaView(const char* name, uint32 flags, bool horizontal, bool vertical, border_style border):
- 	BScrollView(name, NULL, flags, horizontal, vertical, border) {
- 	p = new BScintillaPrivate;
--	p->sciControl = new ScintillaHaiku();
-+	p->sciControl = new ScintillaHaiku(Bounds());
- 	SetTarget(p->sciControl);
- }
- 
--- 
-2.19.1
-
diff --git a/x11-libs/scintilla/scintilla-4.1.3.recipe b/x11-libs/scintilla/scintilla-4.1.4.recipe
similarity index 88%
rename from x11-libs/scintilla/scintilla-4.1.3.recipe
rename to x11-libs/scintilla/scintilla-4.1.4.recipe
index ca628d186..849da826f 100644
--- a/x11-libs/scintilla/scintilla-4.1.3.recipe
+++ b/x11-libs/scintilla/scintilla-4.1.4.recipe
@@ -15,14 +15,13 @@ COPYRIGHT="1998-2019 Neil Hodgson"
 LICENSE="Scintilla"
 REVISION="1"
 SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla${portVersion//\./}.tgz"
-CHECKSUM_SHA256="5b282b458ac2ff355338e8ba920212c1362e6ab98689fd759240942e2aec4d3c"
+CHECKSUM_SHA256="6ef89b32b066954e25dfb59b0738e8ebbe99b4a3782e4334c8b489c3f6d8570f"
 SOURCE_DIR="scintilla"
 SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku${portVersion//\./}.tgz"
-CHECKSUM_SHA256_2="54a283de8f35a7e9b165db87e0899acd947f37b0add8b1787e354099c14011cc"
-PATCHES_2="scintilla-$portVersion.patchset"
-srcGitRev3="a70d8f25bcd3b8260f044e2e3db195d884ffb283"
+CHECKSUM_SHA256_2="c1c404c7cc09f9e0d300f24bb5fe3f2e695e0ebec632c9f6d82f5dc99749e951"
+srcGitRev3="cb6a7670d27b6b32f2b32448262ada517f2b45d3"
 SOURCE_URI_3="https://github.com/KapiX/scintilla-haiku-lexers/archive/$srcGitRev3.tar.gz"
-CHECKSUM_SHA256_3="53adbad4a6d9774789d46236418a802c92a15c5e65a4dbc66d3a2ec4a9aa4af4"
+CHECKSUM_SHA256_3="9f2cac67be927205f9cec6fa0097e41f3afcd5b71beb6e9fa36a99bb5409cffa"
 SOURCE_DIR_3="scintilla-haiku-lexers-$srcGitRev3"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"