From 1133e73317a513d64c78b061863c519e73a09cfb Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sat, 3 Nov 2018 18:31:33 +0100 Subject: [PATCH] scintilla: add Jam lexer (#3326) --- x11-libs/scintilla/scintilla-4.1.2.recipe | 24 ++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/x11-libs/scintilla/scintilla-4.1.2.recipe b/x11-libs/scintilla/scintilla-4.1.2.recipe index b67501023..fa01dbb9c 100644 --- a/x11-libs/scintilla/scintilla-4.1.2.recipe +++ b/x11-libs/scintilla/scintilla-4.1.2.recipe @@ -13,12 +13,16 @@ colours and multiple fonts." HOMEPAGE="https://scintilla.org" COPYRIGHT="1998-2018 Neil Hodgson" LICENSE="Scintilla" -REVISION="1" +REVISION="2" SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla${portVersion//\./}.tgz" CHECKSUM_SHA256="8c54787600fbefa5240ff3c4ac1c84fa186a445091377dde8194a4f1e1471d52" SOURCE_DIR="scintilla" SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku${portVersion//\./}.tgz" CHECKSUM_SHA256_2="dc846ab45b47dcfa87829babccb50ee3da40301d6de4124ba92417957a5c0bb3" +srcGitRev3="a70d8f25bcd3b8260f044e2e3db195d884ffb283" +SOURCE_URI_3="https://github.com/KapiX/scintilla-haiku-lexers/archive/$srcGitRev3.tar.gz" +CHECKSUM_SHA256_3="53adbad4a6d9774789d46236418a802c92a15c5e65a4dbc66d3a2ec4a9aa4af4" +SOURCE_DIR_3="scintilla-haiku-lexers-$srcGitRev3" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -39,10 +43,18 @@ REQUIRES_devel=" scintilla$secondaryArchSuffix == $portVersion base " +PROVIDES_lexers=" + scintilla${secondaryArchSuffix}_lexers = $portVersion + " +REQUIRES_lexers=" + scintilla$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" + makefile_engine cmd:ar cmd:g++$secondaryArchSuffix cmd:make @@ -54,14 +66,21 @@ BUILD() 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 } 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 include/ILoader.h $INCLUDE_DIR @@ -70,6 +89,9 @@ INSTALL() cp include/Scintilla.h $INCLUDE_DIR cp haiku/ScintillaView.h $INCLUDE_DIR + cp $sourceDir3/objects/Lex* $LEXERS_DIR + prepareInstalledDevelLibs libscintilla packageEntries devel $developDir + packageEntries lexers $LEXERS_DIR }