ale: bump version, add secondaryArch support (#12796)

The patches have been upstreamed.

haiku-libs/ale/ale-0.9.2~git.recipe

@@ -17,50 +17,54 @@ http://www.youtube.com/watch?v=ZPv58AWWGRQ"
 HOMEPAGE="https://github.com/czeidler/ALEditor"
 COPYRIGHT="2009-2014 UniAuckland Team"
 LICENSE="MIT"
-REVISION="10"
-srcGitRev="90c1db5b38eedbb101dfc4648c13e65d552fc033"
+REVISION="1"
+srcGitRev="51acfddce12e4a9c0b16cad610a9d0c8bd9c437e"
 SOURCE_URI="https://github.com/czeidler/ALEditor/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="e20bffa0dd5d840a55ab79f4e04fb3d7955e1604b9eb40a5d7f047eb47c52fd8"
+CHECKSUM_SHA256="6d4ff5852183cd807d63e52ac8d126c7f22ac815495a7ad923887a3f831aadd7"
 SOURCE_FILENAME="ALEditor-$srcGitRev.tar.gz"
 SOURCE_DIR="ALEditor-$srcGitRev"
-PATCHES="ale-$portVersion.patchset"
 
 ARCHITECTURES="all"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	ale = $portVersion
-	app:ALEditor = $portVersion
-	devel:libale = $portVersion
+	ale$secondaryArchSuffix = $portVersion
+	devel:libale$secondaryArchSuffix = $portVersion
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES+="
+		app:ALEditor = $portVersion
+		"
+fi
 REQUIRES="
-	haiku
-	ale_libs == $portVersion base
+	haiku$secondaryArchSuffix
+	ale${secondaryArchSuffix}_libs == $portVersion base
 	"
 
 SUMMARY_libs="Runtime libraries for the Auckland Layout Editor"
 DESCRIPTION_libs="This package provides libale.so for use in other applications."
 PROVIDES_libs="
-	ale_libs = $portVersion
-	lib:libale = $portVersion
+	ale${secondaryArchSuffix}_libs = $portVersion
+	lib:libale$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_libs="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
-	cmake -DCMAKE_BUILD_TYPE=Release .
-	make $jobArgs
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release
+	make -Cbuild $jobArgs
 }
 
 INSTALL()
@@ -68,15 +72,17 @@ INSTALL()
 	mkdir -pv $includeDir/ale
 	cp -afv headers/editor/LayoutArchive.h $includeDir/ale/
 
-	mkdir -pv $dataDir/ale/example
-	cp -afv example/* $dataDir/ale/example/
+	if [ -z "$secondaryArchSuffix" ]; then
+		mkdir -pv $dataDir/ale/example
+		cp -afv example/* $dataDir/ale/example/
 
-	mkdir -pv $appsDir
-	cp -afv ALEditor $appsDir/ALEditor
-	addAppDeskbarSymlink $appsDir/ALEditor ALEditor
+		mkdir -pv $appsDir
+		cp -afv build/ALEditor $appsDir/ALEditor
+		addAppDeskbarSymlink $appsDir/ALEditor ALEditor
+	fi
 
 	mkdir -pv $libDir
-	cp -afv libale.so $libDir/libale.so
+	cp -afv build/libale.so $libDir/libale.so
 	prepareInstalledDevelLib libale
 	packageEntries libs $libDir
 }

haiku-libs/ale/patches/ale-0.9.1.patchset

@@ -1,51 +0,0 @@
-From 481fd9ee2cb2e8ecd4be152d7a8101afcbf116e9 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 29 Sep 2018 15:41:42 +0200
-Subject: gcc7 fix
-
-
-diff --git a/src/editor/LayoutEditView.cpp b/src/editor/LayoutEditView.cpp
-index 02b476f..e886be8 100644
---- a/src/editor/LayoutEditView.cpp
-+++ b/src/editor/LayoutEditView.cpp
-@@ -1157,12 +1157,12 @@ StrokeRect(areaFrame);
- 	} else if (dynamic_cast<BLayout*>(item) != NULL)
- 		region.Exclude(item->Frame());
- 
--	const int8 shade = 240;
-+	const uint8 shade = 240;
- 	rgb_color backgoundColor = {shade, shade, shade};
- 	SetHighColor(backgoundColor);
- 	FillRegion(&region);
- 
--	const int8 shadeDark = 220;
-+	const uint8 shadeDark = 220;
- 	rgb_color borderColor = {shadeDark, shadeDark, shadeDark};
- 	SetHighColor(borderColor);
- 	StrokeRect(region.Frame());
--- 
-2.43.2
-
-
-From fcc92af352ef1fc5287729924022a39ed365e74a Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Fri, 8 Mar 2024 22:54:58 -0700
-Subject: link libale against libshared
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4cc403a..c0453a8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,6 +45,8 @@ add_library(ale SHARED
- 	src/editor/LayoutArchive.cpp
- )
- 
-+target_link_libraries(ale shared)
-+
- add_executable(ALEditor ALEditor.cpp)
- ADD_CUSTOM_COMMAND(TARGET ALEditor COMMAND rc -o ALEditor.rsrc ${CMAKE_CURRENT_SOURCE_DIR}/res/ALEditor.rdef COMMENT "Compiling resources")
- ADD_CUSTOM_COMMAND(TARGET ALEditor COMMAND xres -o ALEditor ALEditor.rsrc COMMENT "Adding resources to executable")
--- 
-2.43.2
-