From 1620dbd83d30ca60ef82127f299ecad1fe7385a7 Mon Sep 17 00:00:00 2001 From: OscarL Date: Wed, 10 May 2023 15:56:23 -0300 Subject: [PATCH] paladin: now kenmays' patchset (gcc2 only) applies cleanly. (#8620) Closes #8608. --- .../paladin/patches/paladin-2.8~git-gcc2.patchset | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/haiku-apps/paladin/patches/paladin-2.8~git-gcc2.patchset b/haiku-apps/paladin/patches/paladin-2.8~git-gcc2.patchset index e33772ed9..79dd2e928 100644 --- a/haiku-apps/paladin/patches/paladin-2.8~git-gcc2.patchset +++ b/haiku-apps/paladin/patches/paladin-2.8~git-gcc2.patchset @@ -1,4 +1,4 @@ -From 87d022361c1aea4ab695fd94530b89da4773a746 Mon Sep 17 00:00:00 2001 +From 42b1ab75e6658bb190fd6d406529ec0c6067f530 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Wed, 22 Jul 2020 07:09:11 +0200 Subject: Fix MessageReceived override for GCC2 build @@ -18,27 +18,28 @@ index 25c765d..391ccc2 100644 protected: -- -2.27.0 +2.37.3 -From 55726f14eb57f8b006db69a744e832b70fd53c4a Mon Sep 17 00:00:00 2001 +From 58a2301f3b937dba90c8cc9e27bc2397e22c718f Mon Sep 17 00:00:00 2001 From: Ken Mays 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 +index 38b3191..34a222d 100755 --- a/Tests/compile.sh +++ b/Tests/compile.sh -@@ -8,6 +8,6 @@ g++ Main.cpp \ +@@ -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.27.0 +2.37.3