From d09196dc421b0ca1ab1aa41e7aa6027baca3a74b Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 11 Oct 2021 08:44:34 +0200 Subject: [PATCH] xaos, bump version, move to x11-misc following Gentoo's layout (#6255) --- .../xaos/patches/xaos-3.4.patchset | 0 x11-misc/xaos/patches/xaos-4.2.1.patchset | 45 +++++++++++ {haiku-apps => x11-misc}/xaos/xaos-3.4.recipe | 0 x11-misc/xaos/xaos-4.2.1.recipe | 79 +++++++++++++++++++ 4 files changed, 124 insertions(+) rename {haiku-apps => x11-misc}/xaos/patches/xaos-3.4.patchset (100%) create mode 100644 x11-misc/xaos/patches/xaos-4.2.1.patchset rename {haiku-apps => x11-misc}/xaos/xaos-3.4.recipe (100%) create mode 100644 x11-misc/xaos/xaos-4.2.1.recipe diff --git a/haiku-apps/xaos/patches/xaos-3.4.patchset b/x11-misc/xaos/patches/xaos-3.4.patchset similarity index 100% rename from haiku-apps/xaos/patches/xaos-3.4.patchset rename to x11-misc/xaos/patches/xaos-3.4.patchset diff --git a/x11-misc/xaos/patches/xaos-4.2.1.patchset b/x11-misc/xaos/patches/xaos-4.2.1.patchset new file mode 100644 index 000000000..40f4449f8 --- /dev/null +++ b/x11-misc/xaos/patches/xaos-4.2.1.patchset @@ -0,0 +1,45 @@ +From ee11a06c2625b9753bc074df78bf1968c9e04191 Mon Sep 17 00:00:00 2001 +From: begasus +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 ++#include ++#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 + diff --git a/haiku-apps/xaos/xaos-3.4.recipe b/x11-misc/xaos/xaos-3.4.recipe similarity index 100% rename from haiku-apps/xaos/xaos-3.4.recipe rename to x11-misc/xaos/xaos-3.4.recipe diff --git a/x11-misc/xaos/xaos-4.2.1.recipe b/x11-misc/xaos/xaos-4.2.1.recipe new file mode 100644 index 000000000..c5191c621 --- /dev/null +++ b/x11-misc/xaos/xaos-4.2.1.recipe @@ -0,0 +1,79 @@ +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="1996-2020 GNU XaoS Contributors" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://github.com/xaos-project/XaoS/archive/release-$portVersion.zip" +CHECKSUM_SHA256="ac96eeac990da3a7377d7a209c49a5a794c7be5d45ae4b1fe97ad2d7aa00af51" +SOURCE_FILENAME="xaos-release-$portVersion.zip" +SOURCE_DIR="XaoS-release-$portVersion" +PATCHES="xaos-$portVersion.patchset" + +ARCHITECTURES="?all !x86_gcc2" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + xaos$secondaryArchSuffix = $portVersion + app:XaoS = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + 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 +} + +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 +}