From c7695d744592bdbe56f6c3a412705368e181df85 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 1 Dec 2023 10:44:35 +0100 Subject: [PATCH] fs_uae_launcher: bump version switch to python 3.10 --- ...5.recipe => fs_uae_launcher-3.1.68.recipe} | 46 ++++++----------- .../patches/fs_uae_launcher-3.0.5.patchset | 49 ------------------- 2 files changed, 16 insertions(+), 79 deletions(-) rename app-emulation/fs-uae-launcher/{fs_uae_launcher-3.0.5.recipe => fs_uae_launcher-3.1.68.recipe} (53%) delete mode 100644 app-emulation/fs-uae-launcher/patches/fs_uae_launcher-3.0.5.patchset diff --git a/app-emulation/fs-uae-launcher/fs_uae_launcher-3.0.5.recipe b/app-emulation/fs-uae-launcher/fs_uae_launcher-3.1.68.recipe similarity index 53% rename from app-emulation/fs-uae-launcher/fs_uae_launcher-3.0.5.recipe rename to app-emulation/fs-uae-launcher/fs_uae_launcher-3.1.68.recipe index b91e24a81..d56c5df63 100644 --- a/app-emulation/fs-uae-launcher/fs_uae_launcher-3.0.5.recipe +++ b/app-emulation/fs-uae-launcher/fs_uae_launcher-3.1.68.recipe @@ -8,25 +8,25 @@ setting up FS-UAE." HOMEPAGE="https://fs-uae.net/launcher/" COPYRIGHT="2011-2017 Frode Solheim" LICENSE="GNU GPL v2" -REVISION="5" -SOURCE_URI="https://fs-uae.net/stable/$portVersion/fs-uae-launcher-$portVersion.tar.gz" -CHECKSUM_SHA256="27797a04b9fc0be2805ae992c2950ff6228383fa153eccefbdebfc6789ca76b6" +REVISION="1" +SOURCE_URI="https://fs-uae.net/files/FS-UAE-Launcher/Stable/$portVersion/fs-uae-launcher-$portVersion.tar.xz" +CHECKSUM_SHA256="e36104442db278e0f1d073dbc2be2f9a937cd33e964968b75b324c393f8ec030" SOURCE_DIR="fs-uae-launcher-$portVersion" -PATCHES="fs_uae_launcher-$portVersion.patchset" ADDITIONAL_FILES="fs-uae-launcher.rdef.in" -ARCHITECTURES="all ?x86 !x86_gcc2" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="?x86" PROVIDES=" fs_uae_launcher$secondaryArchSuffix = $portVersion + cmd:fs_uae_launcher " REQUIRES=" haiku$secondaryArchSuffix fs_uae$secondaryArchSuffix - pip_python39$secondaryArchSuffix - pyqt5_python39$secondaryArchSuffix - requests_python39$secondaryArchSuffix + pip_python310$secondaryArchSuffix + pyqt5_python310$secondaryArchSuffix + requests_python310$secondaryArchSuffix " BUILD_REQUIRES=" @@ -35,12 +35,13 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:make cmd:msgfmt - cmd:python3.9 + cmd:python3.10 " PATCH() { - sed -i -e "s|python3|python3.9|g" Makefile + sed -i -e "s|python3|python3.10|g" Makefile + sed -i -e "s|share/|data/|g" Makefile } BUILD() @@ -61,32 +62,17 @@ BUILD() INSTALL() { - local FS_UAE_LAUNCHER_NAME="FS-UAE Launcher" - - make install - - mkdir -p "$appsDir/$FS_UAE_LAUNCHER_NAME" - cp -a usr/local/share/fs-uae-launcher/* "$appsDir/$FS_UAE_LAUNCHER_NAME" - - chmod +x "$appsDir/$FS_UAE_LAUNCHER_NAME/fs-uae-launcher" + make install prefix=$prefix # Installing extra-attribs rc fs-uae-launcher.rdef - resattr -o "$appsDir/$FS_UAE_LAUNCHER_NAME/fs-uae-launcher" \ - fs-uae-launcher.rsrc - - # Rename the main program - mv "$appsDir/$FS_UAE_LAUNCHER_NAME/fs-uae-launcher" \ - "$appsDir/$FS_UAE_LAUNCHER_NAME/$FS_UAE_LAUNCHER_NAME" + resattr -o "$prefix/data/fs-uae-launcher/fs-uae-launcher" fs-uae-launcher.rsrc # Creating Deskbar link - addAppDeskbarSymlink "$appsDir/$FS_UAE_LAUNCHER_NAME/$FS_UAE_LAUNCHER_NAME" \ - "$FS_UAE_LAUNCHER_NAME" + addAppDeskbarSymlink "$binDir/fs-uae-launcher" "FS-UAE Launcher" # Copy docs mkdir -p $docDir - cp -a usr/local/share/doc/fs-uae-launcher/* $docDir - - # Tidy up - rm -rf usr + mv $prefix/data/doc/fs-uae-launcher/* $docDir + rm -rf $prefix/data/doc $prefix/share } diff --git a/app-emulation/fs-uae-launcher/patches/fs_uae_launcher-3.0.5.patchset b/app-emulation/fs-uae-launcher/patches/fs_uae_launcher-3.0.5.patchset deleted file mode 100644 index 5abb48b0b..000000000 --- a/app-emulation/fs-uae-launcher/patches/fs_uae_launcher-3.0.5.patchset +++ /dev/null @@ -1,49 +0,0 @@ -From 5c22ad1fae1b33eb3536922a07573e65534c70bb Mon Sep 17 00:00:00 2001 -From: Chris Moore -Date: Tue, 12 Sep 2017 20:02:46 +0100 -Subject: Stop linking the program to another directory - - -diff --git a/Makefile b/Makefile -index f33d513..3cc0053 100644 ---- a/Makefile -+++ b/Makefile -@@ -106,12 +106,10 @@ ifeq ($(DESTDIR),) - python3 setup.py install --install-lib=$(prefix)/share/fs-uae-launcher --install-scripts=$(prefix)/share/fs-uae-launcher - install -d $(DESTDIR)$(prefix)/bin - rm -f $(DESTDIR)$(prefix)/bin/fs-uae-launcher -- ln -s ../share/fs-uae-launcher/fs-uae-launcher $(DESTDIR)$(prefix)/bin/fs-uae-launcher - else - python3 setup.py install --root=$(DESTDIR) --install-lib=$(prefix)/share/fs-uae-launcher --install-scripts=$(prefix)/share/fs-uae-launcher - install -d $(DESTDIR)$(prefix)/bin - rm -f $(DESTDIR)$(prefix)/bin/fs-uae-launcher -- ln -s ../share/fs-uae-launcher/fs-uae-launcher $(DESTDIR)$(prefix)/bin/fs-uae-launcher - endif - - install-data: mo --- -2.13.1 - - -From d6c8205fdc64ed0af5b6a42f36026b59cf8d8bc6 Mon Sep 17 00:00:00 2001 -From: Chris Moore -Date: Tue, 12 Sep 2017 20:07:32 +0100 -Subject: Create files in local directories - - -diff --git a/Makefile b/Makefile -index 3cc0053..977a385 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ dist_name = fs-uae-launcher-$(version) - dist_dir := $(build_dir)/$(dist_name) - - DESTDIR := --prefix := /usr/local -+prefix := usr/local - - ifeq ($(wildcard OpenGL),) - OpenGL_dir := "." --- -2.13.1 -