paladin: bump version (#5200)

Co-authored with @Begasus
This commit is contained in:
kenmays
2020-08-06 05:09:35 -07:00
committed by GitHub
parent 998b28e316
commit 5069910cfd
4 changed files with 52 additions and 160 deletions

View File

@@ -1,80 +0,0 @@
SUMMARY="An open source integrated development environment (IDE)"
DESCRIPTION="Paladin is an open source integrated development environment (IDE) \
modeled after BeOS' BeIDE.
Paladin's feature set includes:
- Command-line build support
- Multithreaded builds
- Revision control-friendly project files
- More run options for projects
- Explicit support for debugging with gdb under Haiku
- Bundled helper tools
- Streamlined project settings
- Out-of-the-box support for Lex and Yacc
- Support for text and binary resource files
- Projects can include notes and other files that aren't source code
- Project templates
- Out-of-the-box makefile generation
- Integrated source code management
- 1-click project backups"
HOMEPAGE="https://github.com/HaikuArchives/Paladin"
COPYRIGHT="2001-2010 DarkWyrm
2014 John Scipione"
LICENSE="MIT"
REVISION="4"
srcGitRev="c480d7107bfd01dae302fd6e13098aeccec22548"
SOURCE_URI="https://github.com/HaikuArchives/Paladin/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="3f071bae6960581fdd744a171402d359b8d89b8f83c5d39980f4cea31f2c2d3f"
SOURCE_DIR="Paladin-$srcGitRev"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
USER_SETTINGS_FILES="settings/Paladin_settings"
PROVIDES="
paladin$secondaryArchSuffix = $portVersion
app:Paladin$secondaryArchSuffix
app:SymbolFinder$secondaryArchSuffix
cmd:luagrep
cmd:luare
"
REQUIRES="
haiku$secondaryArchSuffix
cmd:lua
lib:libpcre$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libpcre$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
makefile_engine
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
./buildsuite.sh $jobs
}
INSTALL()
{
mkdir -p $appsDir/Paladin $appsDir/Paladin/Documentation
mkdir -p $binDir
cp -r Documentation $appsDir/Paladin
rm $appsDir/Paladin/Documentation/KeltFont.zip
cp -r Paladin/Paladin Paladin/Templates $appsDir/Paladin/
cp SymbolFinder/SymbolFinder $appsDir/Paladin/
cp luagrep luare $binDir
addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin
}

View File

@@ -1,76 +0,0 @@
SUMMARY="An open source integrated development environment (IDE)"
DESCRIPTION="Paladin is an open source integrated development environment (IDE) \
modeled after BeOS' BeIDE.
Paladin's feature set includes:
- Command-line build support
- Multithreaded builds
- Revision control-friendly project files
- More run options for projects
- Explicit support for debugging with gdb under Haiku
- Bundled helper tools
- Streamlined project settings
- Out-of-the-box support for Lex and Yacc
- Support for text and binary resource files
- Projects can include notes and other files that aren't source code
- Project templates
- Out-of-the-box makefile generation
- Integrated source code management
- 1-click project backups"
HOMEPAGE="https://github.com/adamfowleruk/Paladin"
COPYRIGHT="2001-2010 DarkWyrm
2014 John Scipione
2018-2019 Adam Fowler"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://github.com/adamfowleruk/Paladin/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="12410bb9948e81eedd25c6f114dd6a80ce909774b3c460a215e6adccdfd94bd6"
SOURCE_FILENAME="paladin-$portVersion.tar.gz"
SOURCE_DIR="Paladin-$portVersion"
ARCHITECTURES="x86_gcc2 x86_64"
USER_SETTINGS_FILES="settings/Paladin_settings"
PROVIDES="
paladin = $portVersion
app:Paladin
app:SymbolFinder
"
REQUIRES="
haiku
lib:libpcre
lib:libz
"
BUILD_REQUIRES="
haiku_devel
devel:libpcre
devel:libz
"
BUILD_PREREQUIRES="
makefile_engine
cmd:find
cmd:gcc
cmd:ld
cmd:make
"
BUILD()
{
./buildsuite.sh $jobs
}
INSTALL()
{
mkdir -p $appsDir/Paladin $appsDir/Paladin/Documentation
mkdir -p $binDir
cp -r Documentation $appsDir/Paladin
rm $appsDir/Paladin/Documentation/KeltFont.zip
cp -r Paladin/Paladin Paladin/Templates $appsDir/Paladin/
cp SymbolFinder/SymbolFinder $appsDir/Paladin/
addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin
}

View File

@@ -25,10 +25,14 @@ COPYRIGHT="2001-2010 DarkWyrm
2018-2019 Adam Fowler"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://github.com/adamfowleruk/Paladin/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="e2f6467719421d46cf9380c755fce7595cd3f102ff8a1101b9594899b3f2d1e2"
SOURCE_FILENAME="paladin-$portVersion.tar.gz"
SOURCE_DIR="Paladin-$portVersion"
srcGitRev="9ea26012d1dc05f3bb42bcd3c971ac7a611570b9"
SOURCE_URI="https://github.com/adamfowleruk/Paladin/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="6cdb0ed4020d1a65e509dae8328ead14f1de3b9a6931d6fcbd351d2b39ad74e3"
SOURCE_DIR="Paladin-$srcGitRev"
if [ $effectiveTargetArchitecture == 'x86_gcc2' ]; then
PATCHES="$PATCHES
paladin-$portVersion-gcc2.patchset"
fi
ARCHITECTURES="x86_gcc2 x86_64"

View File

@@ -0,0 +1,44 @@
From 87d022361c1aea4ab695fd94530b89da4773a746 Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Wed, 22 Jul 2020 07:09:11 +0200
Subject: Fix MessageReceived override for GCC2 build
diff --git a/Paladin/PreviewFeatures/CommandOutputHandler.h b/Paladin/PreviewFeatures/CommandOutputHandler.h
index 25c765d..391ccc2 100644
--- a/Paladin/PreviewFeatures/CommandOutputHandler.h
+++ b/Paladin/PreviewFeatures/CommandOutputHandler.h
@@ -26,7 +26,7 @@ public:
bool HasFailed() const;
// BHandler
- virtual void MessageReceived(BMessage* msg) override;
+ virtual void MessageReceived(BMessage* msg);
protected:
--
2.27.0
From 55726f14eb57f8b006db69a744e832b70fd53c4a Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Wed, 22 Jul 2020 07:09:11 +0200
Subject: Fix -lgcov for GCC2 build
diff --git a/Tests/compile.sh b/Tests/compile.sh
index 4225f9d..e308f83 100755
--- a/Tests/compile.sh
+++ b/Tests/compile.sh
@@ -8,6 +8,6 @@ g++ Main.cpp \
ProjectTests.cpp \
CompileCommandsJSONTests.cpp \
CommandOutputHandlerTests.cpp \
- ../Paladin/objects*/paladin.a -o ./tests.o -Wall -lUnitTest++ -I../Paladin -I../Paladin/SourceControl -I../Paladin/BuildSystem -I../Paladin/ThirdParty -I../Paladin/PreviewFeatures -fprofile-arcs -ftest-coverage -lgcov -lbe -llocalestub
+ ../Paladin/objects*/paladin.a -o ./tests.o -Wall -lUnitTest++ -I../Paladin -I../Paladin/SourceControl -I../Paladin/BuildSystem -I../Paladin/ThirdParty -I../Paladin/PreviewFeatures -fprofile-arcs -ftest-coverage -lbe -llocalestub
echo "Done. Now execute ./tests.o"
--
2.27.0