haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

paladin: bump git commit

Browse Source
This commit is contained in:
Jerome Duval
2024-03-16 18:07:26 +01:00
parent fdac96378e
commit 88f1c76243
2 changed files with 3 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
haiku-apps/paladin/paladin-2.9.recipe
View File

@@ -25,15 +25,11 @@ COPYRIGHT="2001-2010 DarkWyrm
2018-2019 Adam Fowler
2023 Michael Brumbelow"
LICENSE="MIT"
REVISION="1"
srcGitRev="aa3896f05646b2e89c0e3925c245eec9b4fdb99c"
REVISION="2"
srcGitRev="8b0cd5b1a9696f4e895953301d9ab06d6d0d4330"
SOURCE_URI="https://github.com/HaikuArchives/Paladin/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="bf05d86b028fd3c27e9c586822826cf077073b39a4bcf5cf9d2fb637d3581798"
CHECKSUM_SHA256="880eb53613c42daf79bc0a14996ca3ab57d34f0dafdded2df9075a00a0e88fed"
SOURCE_DIR="Paladin-$srcGitRev"
if [ $effectiveTargetArchitecture == 'x86_gcc2' ]; then
PATCHES="$PATCHES
paladin-$portVersion-gcc2.patchset"
fi
ARCHITECTURES="all"

45
haiku-apps/paladin/patches/paladin-2.9-gcc2.patchset
View File

@@ -1,45 +0,0 @@
From 42b1ab75e6658bb190fd6d406529ec0c6067f530 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.37.3
From 58a2301f3b937dba90c8cc9e27bc2397e22c718f 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 38b3191..34a222d 100755
--- a/Tests/compile.sh
+++ b/Tests/compile.sh
@@ -10,7 +10,7 @@ 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.37.3