xaos, bump to 4.3.4 (#13084)

Switch to Qt6

x11-misc/xaos/patches/xaos-4.2.1.patchset

@@ -1,45 +0,0 @@
-From ee11a06c2625b9753bc074df78bf1968c9e04191 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Fri, 8 Oct 2021 16:16:32 +0000
-Subject: Fix finding catalogs when launched from Deskbar
-
-
-diff --git a/src/ui/main.cpp b/src/ui/main.cpp
-index c913284..7724c07 100644
---- a/src/ui/main.cpp
-+++ b/src/ui/main.cpp
-@@ -46,6 +46,11 @@
- #include "grlib.h"
- #include "i18n.h"
- 
-+#ifdef __HAIKU__
-+#include <libgen.h>
-+#include <unistd.h>
-+#endif
-+
- /* Command line variables */
- int printspeed;
- int delaytime = 0;
-@@ -557,6 +562,11 @@ static void ui_registermenus_i18n(void)
- 
- int main(int argc, char *argv[])
- {
-+	char *binpath = realpath(argv[0], NULL);
-+	if (binpath != NULL) {
-+		chdir(dirname(binpath));
-+		free(binpath);
-+	}
- #ifdef _WIN32
-     // On Windows, attach to parent console to allow command-line output
-     if (AttachConsole(ATTACH_PARENT_PROCESS)) {
-@@ -565,6 +575,7 @@ int main(int argc, char *argv[])
-     }
- #endif
- 
-+
-     QCoreApplication::setApplicationName("XaoS");
-     QCoreApplication::setApplicationVersion(XaoS_VERSION);
-     QCoreApplication::setOrganizationName("XaoS Project");
--- 
-2.30.2
-

x11-misc/xaos/patches/xaos-4.3.4.patchset

@@ -0,0 +1,39 @@
+From 8c5440ad8f9be91445bb8b17f75bcead5541cbb0 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 8 Oct 2021 16:16:32 +0000
+Subject: Fix finding catalogs when launched from Deskbar
+
+
+diff --git a/src/ui/main.cpp b/src/ui/main.cpp
+index a71d860..bed5497 100644
+--- a/src/ui/main.cpp
++++ b/src/ui/main.cpp
+@@ -51,6 +51,11 @@
+ #include "windows.h"
+ #endif
+ 
++#ifdef __HAIKU__
++#include <libgen.h>
++#include <unistd.h>
++#endif
++
+ /* Command line variables */
+ int printspeed;
+ int delaytime = 0;
+@@ -592,6 +597,13 @@ static void ui_registermenus_i18n(void)
+ 
+ int main(int argc, char *argv[])
+ {
++#ifdef __HAIKU__
++       char *binpath = realpath(argv[0], NULL);
++       if (binpath != NULL) {
++               chdir(dirname(binpath));
++               free(binpath);
++       }
++#endif
+ #ifdef _WIN32
+     // On Windows, attach to parent console to allow command-line output
+     if (AttachConsole(ATTACH_PARENT_PROCESS)) {
+-- 
+2.51.0
+

x11-misc/xaos/xaos-3.4.recipe

@@ -1,88 +0,0 @@
-SUMMARY="Real-time interactive fractal zoomer"
-DESCRIPTION="
-XaoS is an interactive fractal zoomer. It allows the user to continuously \
-zoom in or out of a fractal in a fluid, continuous motion. This capability \
-makes XaoS great for exploring fractals, and it’s fun!
-
-If you don’t know what fractals are, don’t worry. \
-XaoS includes many animated tutorials that make learning about fractals fun \
-and easy. These tutorials are also a great introduction to all of XaoS’s \
-features.
-
-XaoS can display many different fractal types, including Mandelbrot, \
-Barnsley, Newton, Phoenix, and many more. Fractals can be rendered using \
-various coloring methods and planes for an almost endless variety of images. \
-XaoS also supports switching between Julia and Mandelbrot sets for each formula.
-
-XaoS currently runs on Windows, Mac OS X, Linux, and other Unix-like systems. \
-Older versions are available for DOS, BeoS, and more. Download a copy for your \
-operating system today.
-
-XaoS is free software, licensed under the GPL. It was originally written by \
-Thomas Marsh and Jan Hubicka, and it is currently maintained by Zoltan Kovacs \
-and J.B. Langston. Countless other improvements have been contributed by \
-volunteers around the world. You can help improve XaoS, too."
-HOMEPAGE="http://xaos.sourceforge.net/"
-COPYRIGHT="2008 GNU XaoS Contributors"
-LICENSE="GNU GPL v2"
-REVISION="4"
-SOURCE_URI="https://github.com/xaos-project/XaoS/archive/release-$portVersion.zip"
-CHECKSUM_SHA256="7b2a802c638ed880a86db4b2feccc7fc949599916329b799807758dca61d6eb8"
-SOURCE_DIR="XaoS-release-$portVersion"
-PATCHES="xaos-$portVersion.patchset"
-
-ARCHITECTURES="all ?x86"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
-	xaos$secondaryArchSuffix = $portVersion
-	app:XaoS = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	"
-if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-REQUIRES+="
-	lib:libgsl$secondaryArchSuffix
-	"
-fi
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
-	devel:libintl$secondaryArchSuffix
-	"
-if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-BUILD_REQUIRES+="
-	devel:libgsl$secondaryArchSuffix
-	"
-fi
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:nasm
-	"
-
-BUILD()
-{
-	rc -o src/ui/ui-drv/BeOS/XaoS.rsrc src/ui/ui-drv/BeOS/XaoS.rdef
-	libtoolize --force --copy --install
-	ldflags="-lintl -liconv"
-	configureFlags=
-	if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-		ldflags="$ldflags -lstdc++"
-		configureFlags=--disable-cffe
-	fi
-	LDFLAGS=$ldflags sh configure $configureFlags
-	make $jobArgs
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir
-	cp bin/xaos $appsDir/XaoS
-	addAppDeskbarSymlink $appsDir/XaoS
-}

x11-misc/xaos/xaos-4.3.4.recipe

@@ -21,18 +21,18 @@ XaoS is free software, licensed under the GPL. It was originally written by \
 Thomas Marsh and Jan Hubicka, and it is currently maintained by Zoltan Kovacs \
 and J.B. Langston. Countless other improvements have been contributed by \
 volunteers around the world. You can help improve XaoS, too."
-HOMEPAGE="http://xaos.sourceforge.net/"
-COPYRIGHT="1996-2020 GNU XaoS Contributors"
+HOMEPAGE="https://xaos-project.github.io/"
+COPYRIGHT="1996-2025 XaoS Contributors"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/xaos-project/XaoS/archive/release-$portVersion.zip"
-CHECKSUM_SHA256="ac96eeac990da3a7377d7a209c49a5a794c7be5d45ae4b1fe97ad2d7aa00af51"
+CHECKSUM_SHA256="1a9e089c9f0963053162348572a2ee9aa5574d322e2d63825790ce4816c7b6be"
 SOURCE_FILENAME="xaos-release-$portVersion.zip"
 SOURCE_DIR="XaoS-release-$portVersion"
 PATCHES="xaos-$portVersion.patchset"
 
-ARCHITECTURES="?all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	xaos$secondaryArchSuffix = $portVersion
@@ -41,39 +41,36 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
+	qt6_tools${secondaryArchSuffix}_devel
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Widgets$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
-	cmd:qmake$secondaryArchSuffix
-	qthaikuplugins$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	export DEFINES='USE_OPENGL USE_FLOAT128'
-	qmake PREFIX=$appsDir/XaoS
-	make $jobArgs
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=$appsDir/XaoS
+
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	mkdir -p $appsDir/XaoS/{bin,catalogs} $manDir/man6
-	cp bin/xaos $appsDir/XaoS/bin
-	cp catalogs/*.cat $appsDir/XaoS/catalogs
-	cp -rf tutorial $appsDir/XaoS/
-	cp doc/*.6 $manDir/man6
-	addAppDeskbarSymlink $appsDir/XaoS/bin/xaos XaoS
+	make -C build install
+
+	addAppDeskbarSymlink $appsDir/XaoS/bin/XaoS
 }