diff --git a/x11-libs/scintilla/patches/scintilla-4.2.0.patchset b/x11-libs/scintilla/patches/scintilla-4.2.0.patchset deleted file mode 100644 index d1d090974..000000000 --- a/x11-libs/scintilla/patches/scintilla-4.2.0.patchset +++ /dev/null @@ -1,49 +0,0 @@ -From e1438fc2e46c2af6340a955ad81c48a9ec1a10dd Mon Sep 17 00:00:00 2001 -From: X512 -Date: Wed, 8 Jan 2020 23:47:41 +0900 -Subject: [PATCH] fix text drag&drop - ---- - haiku/ScintillaHaiku.cxx | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/haiku/ScintillaHaiku.cxx b/haiku/ScintillaHaiku.cxx -index a47ab50..9335654 100644 ---- a/haiku/ScintillaHaiku.cxx -+++ b/haiku/ScintillaHaiku.cxx -@@ -700,8 +700,10 @@ bool ScintillaHaiku::Drop(BMessage* message, const BPoint& point, const BPoint& - return false; - } - } -+ -+ SetDragPosition(SelectionPosition(Sci::invalidPosition)); - -- Point p(static_cast(point.x - offset.x), static_cast(point.y - offset.y + vs.lineHeight / 2)); -+ Point p(static_cast(point.x), static_cast(point.y)); - SelectionPosition movePos = SPositionFromLocation(p, false, false, UserVirtualSpace()); - - DropAt(movePos, text, textLen, move, isRectangular); -@@ -815,13 +817,17 @@ void ScintillaHaiku::MouseMoved(BPoint point, uint32 transit, const BMessage* me - const int mod = _ConvertToSciModifiers(modifiers()); - const Point pt(static_cast(point.x), static_cast(point.y)); - const int64 when = movedMsg->GetInt64("when", 0) / 1000; -+ ButtonMoveWithModifiers(pt, when, mod); - switch(transit) { - case B_ENTERED_VIEW: - case B_INSIDE_VIEW: -+ if (message != NULL && message->HasData("text/plain", B_MIME_TYPE)) { -+ SetDragPosition(SPositionFromLocation(pt, false, false, UserVirtualSpace())); -+ } -+ break; - case B_EXITED_VIEW: -- case B_OUTSIDE_VIEW: -- ButtonMoveWithModifiers(pt, when, mod); -- break; -+ SetDragPosition(SelectionPosition(Sci::invalidPosition)); -+ break; - }; - } - --- -2.24.1 - diff --git a/x11-libs/scintilla/scintilla-4.2.0.recipe b/x11-libs/scintilla/scintilla-4.3.2.recipe similarity index 84% rename from x11-libs/scintilla/scintilla-4.2.0.recipe rename to x11-libs/scintilla/scintilla-4.3.2.recipe index 58351fade..a83bf3a0e 100644 --- a/x11-libs/scintilla/scintilla-4.2.0.recipe +++ b/x11-libs/scintilla/scintilla-4.3.2.recipe @@ -11,19 +11,18 @@ choices are more open than with many editors, allowing the use of \ proportional fonts, bold and italics, multiple foreground and background \ colours and multiple fonts." HOMEPAGE="https://scintilla.org" -COPYRIGHT="1998-2019 Neil Hodgson" +COPYRIGHT="1998-2020 Neil Hodgson" LICENSE="Scintilla" -REVISION="2" +REVISION="1" SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla${portVersion//\./}.tgz" -CHECKSUM_SHA256="8278bc86635c5ddf461d5b006c08d073f5b92829d9ed218879d7b3eb0c8ad50b" +CHECKSUM_SHA256="3061386bbb66a4829c7563aa987fb0bca25758a20794f617d5cb64d400d51a35" SOURCE_DIR="scintilla" SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku${portVersion//\./}.tgz" -CHECKSUM_SHA256_2="d02552b1d274920e9cfe7d72bb925ce6a47fb04692cb72bfb4f5803cd8591dd6" -srcGitRev3="b655d76a29b8a9278137c4e1ad681de0b4a51a58" +CHECKSUM_SHA256_2="2dfe0fae8a168ed1a88c780159eb65f7b1d1e1fa5f6a82544b2a6eb0cb405dab" +srcGitRev3="0018aab724122168b4818c8ead2882f83fbc6848" SOURCE_URI_3="https://github.com/KapiX/scintilla-haiku-lexers/archive/$srcGitRev3.tar.gz" -CHECKSUM_SHA256_3="8b68fd180742786037f5121b2517a258ebd30b73d16a5721db73e91cd9c316bd" +CHECKSUM_SHA256_3="901cb864942c329a6ba98ecdb24c80bbbbfc1ec4e29060f2a963ba31de6d0861" SOURCE_DIR_3="scintilla-haiku-lexers-$srcGitRev3" -PATCHES_2="scintilla-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -78,6 +77,9 @@ BUILD() cp -R $sourceDir/lexlib/ . make all OBJ_DIR=objects SYSTEM_INCLUDE_PATHS=$sourceDir/include rm -rf objects/*.d objects/*.o + + cd $sourceDir/lexilla/src + make $jobArgs } INSTALL() @@ -90,6 +92,7 @@ INSTALL() mkdir -p $LEXERS_DIR cp -a bin/libscintilla.so $libDir/libscintilla.so + cp -a bin/lexilla.so $libDir/lexilla.so cp include/ILoader.h $INCLUDE_DIR cp include/*Lexer.h $INCLUDE_DIR cp include/Sci_Position.h $INCLUDE_DIR @@ -98,7 +101,7 @@ INSTALL() cp $sourceDir3/objects/Lex* $LEXERS_DIR - prepareInstalledDevelLibs libscintilla + prepareInstalledDevelLibs libscintilla lexilla packageEntries devel $developDir packageEntries lexers $LEXERS_DIR }