Update Scintilla and Koder (#7928)

* Disable Ideam, it needs to be updated to Scintilla 5
  and it's not trivial.

haiku-apps/ideam/ideam-0.7.7.recipe

@@ -10,8 +10,9 @@ CHECKSUM_SHA256="542e0cffed3c51a14ddd5be526d15eaaf5a498b9d1ac9c3b70b4ea25f1cddbd
 SOURCE_DIR="ideam-ver-$portVersion"
 PATCHES="ideam-$portVersion.patchset"
 
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+# needs update to Scintilla 5
+ARCHITECTURES="?all !x86_gcc2"
+SECONDARY_ARCHITECTURES="?x86"
 
 USER_SETTINGS_FILES="
 	settings/Ideam directory

haiku-apps/koder/koder-0.6.0.recipe

@@ -5,11 +5,11 @@ and additional languages can be added by the user. It also features multiline \
 editing, folding, brace highlighting, and some other things supported by \
 Scintilla."
 HOMEPAGE="https://github.com/KapiX/Koder"
-COPYRIGHT="2016-2020 Kacper Kasper"
+COPYRIGHT="2016-2023 Kacper Kasper"
 LICENSE="MIT"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/KapiX/Koder/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="7a873283f8439a885b908f9c933a7433929df65b7fe8d4304b9bb21947f195e2"
+CHECKSUM_SHA256="21c6961112ac2b38512617d72a22ec7d16b0d78b93e24bf1e516cda03a7c90d8"
 SOURCE_DIR="Koder-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -25,14 +25,15 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	scintilla${secondaryArchSuffix}_lexers
-	lib:libscintilla$secondaryArchSuffix
+	lib:libscintilla$secondaryArchSuffix >= 5
+	lib:liblexilla$secondaryArchSuffix
 	lib:libyaml_cpp$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libscintilla$secondaryArchSuffix
+	devel:libscintilla$secondaryArchSuffix >= 5
+	devel:liblexilla$secondaryArchSuffix
 	devel:libyaml_cpp$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="

x11-libs/lexilla/lexilla-5.2.4.recipe

@@ -0,0 +1,88 @@
+SUMMARY="A free library of language lexers for use with Scintilla"
+DESCRIPTION="Lexilla is a free library of language lexers that can be used \
+with the Scintilla editing component. It comes with complete source code and \
+a license that permits use in any free project or commercial product.
+Originally, this functionality was incorporated inside Scintilla. \
+It has been extracted as a separate project to make it easier for \
+contributors to work on support for new languages and to fix bugs in existing \
+lexers. It also defines a protocol where projects can implement their own \
+lexers and distribute them as they wish."
+HOMEPAGE="https://scintilla.org"
+COPYRIGHT="1998-2023 Neil Hodgson"
+LICENSE="Scintilla"
+REVISION="1"
+SOURCE_URI="https://prdownloads.sf.net/scintilla/lexilla${portVersion//\./}.tgz"
+CHECKSUM_SHA256="a4ab4e2a2ee79c92ad598c8fecab7c100c30224ccf589bf9173ddf9971ad87d0"
+SOURCE_DIR="lexilla"
+srcGitRev2="e391de7b72f7cc58c8d267524d9581e1a875d6e9"
+SOURCE_URI_2="https://github.com/KapiX/scintilla-haiku-lexers/archive/$srcGitRev2.tar.gz"
+CHECKSUM_SHA256_2="a3a0121dd641355fbb1a5ff8fe8896d574ad809975867a5ffdefc609448194c7"
+SOURCE_DIR_2="scintilla-haiku-lexers-$srcGitRev2"
+SCINTILLA_VERSION="5.3.4"
+SOURCE_URI_3="https://prdownloads.sf.net/scintilla/scintilla${SCINTILLA_VERSION//\./}.tgz"
+CHECKSUM_SHA256_3="3f01b1aef2b7e98f628af2cff965876f5d15ee2801d9df96dd3aced8f087cb46"
+SOURCE_DIR_3="scintilla"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	lexilla$secondaryArchSuffix = $portVersion
+	lib:liblexilla$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	lexilla${secondaryArchSuffix}_devel = $portVersion
+	devel:liblexilla$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	lexilla$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:ar
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	local SCINTILLA_INCLUDE=$sourceDir/../scintilla/include
+	mkdir -p $SCINTILLA_INCLUDE
+	cp -R $sourceDir3/include/* $SCINTILLA_INCLUDE
+
+	ls -la $sourceDir/../scintilla/include
+	cd src
+	make $jobArgs
+
+	cd $sourceDir2
+	cp -R $sourceDir/lexlib/ .
+	make all OBJ_DIR=objects SYSTEM_INCLUDE_PATHS="$sourceDir3/include $sourceDir/include"
+	rm -rf objects/*.d objects/*.o
+}
+
+INSTALL()
+{
+	INCLUDE_DIR=$includeDir/lexilla
+	LEXERS_DIR=$libDir/lexilla
+
+	mkdir -p $libDir
+	mkdir -p $INCLUDE_DIR
+	mkdir -p $LEXERS_DIR
+
+	cp -a bin/liblexilla.so $libDir/liblexilla.so
+	cp include/Lexilla.h $INCLUDE_DIR
+	cp include/SciLexer.h $INCLUDE_DIR
+
+	cp $sourceDir2/objects/Lex* $LEXERS_DIR
+
+	prepareInstalledDevelLibs liblexilla
+	packageEntries devel $developDir
+}

x11-libs/lexilla/licenses/Scintilla

@@ -0,0 +1,20 @@
+License for Scintilla and SciTE
+
+Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved 
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that 
+both that copyright notice and this permission notice appear in 
+supporting documentation. 
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
+OR PERFORMANCE OF THIS SOFTWARE.

x11-libs/scintilla/scintilla-5.3.4.recipe

@@ -11,18 +11,14 @@ 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-2020 Neil Hodgson"
+COPYRIGHT="1998-2023 Neil Hodgson"
 LICENSE="Scintilla"
 REVISION="1"
 SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla${portVersion//\./}.tgz"
-CHECKSUM_SHA256="3061386bbb66a4829c7563aa987fb0bca25758a20794f617d5cb64d400d51a35"
+CHECKSUM_SHA256="3f01b1aef2b7e98f628af2cff965876f5d15ee2801d9df96dd3aced8f087cb46"
 SOURCE_DIR="scintilla"
 SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku${portVersion//\./}.tgz"
-CHECKSUM_SHA256_2="2dfe0fae8a168ed1a88c780159eb65f7b1d1e1fa5f6a82544b2a6eb0cb405dab"
-srcGitRev3="0018aab724122168b4818c8ead2882f83fbc6848"
-SOURCE_URI_3="https://github.com/KapiX/scintilla-haiku-lexers/archive/$srcGitRev3.tar.gz"
-CHECKSUM_SHA256_3="901cb864942c329a6ba98ecdb24c80bbbbfc1ec4e29060f2a963ba31de6d0861"
-SOURCE_DIR_3="scintilla-haiku-lexers-$srcGitRev3"
+CHECKSUM_SHA256_2="9a4d46ebca064bc4484f1bc33e765774b2af669d61d4a26ddd4aa8cda1536c27"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -43,13 +39,6 @@ REQUIRES_devel="
 	scintilla$secondaryArchSuffix == $portVersion base
 	"
 
-PROVIDES_lexers="
-	scintilla${secondaryArchSuffix}_lexers = $portVersion
-	"
-REQUIRES_lexers="
-	scintilla$secondaryArchSuffix == $portVersion base
-	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -60,48 +49,33 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PATCH()
-{
-	sed -i -e 's#SymbolValue() noexcept = #SymbolValue() = #' \
-		$sourceDir/lexers/LexCPP.cxx
-}
-
 BUILD()
 {
 	mkdir -p haiku
 	cp -R $sourceDir2/haiku/ .
 	cd haiku
 	make $jobArgs
-
-	cd $sourceDir3
-	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()
 {
 	INCLUDE_DIR=$includeDir/scintilla
-	LEXERS_DIR=$dataDir/scintilla/lexers
 
 	mkdir -p $libDir
 	mkdir -p $INCLUDE_DIR
-	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/ILexer.h $INCLUDE_DIR
 	cp include/Sci_Position.h $INCLUDE_DIR
 	cp include/Scintilla.h $INCLUDE_DIR
+	cp include/ScintillaCall.h $INCLUDE_DIR
+	cp include/ScintillaMessages.h $INCLUDE_DIR
+	cp include/ScintillaStructures.h $INCLUDE_DIR
+	cp include/ScintillaTypes.h $INCLUDE_DIR
 	cp haiku/ScintillaView.h $INCLUDE_DIR
 
-	cp $sourceDir3/objects/Lex* $LEXERS_DIR
 
-	prepareInstalledDevelLibs libscintilla lexilla
+	prepareInstalledDevelLibs libscintilla
 	packageEntries devel $developDir
-	packageEntries lexers $LEXERS_DIR
 }