diff --git a/srcpkgs/Maelstrom/patches/include-time_h.patch b/srcpkgs/Maelstrom/patches/include-time_h.patch deleted file mode 100644 index 986c3dd8149448..00000000000000 --- a/srcpkgs/Maelstrom/patches/include-time_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Maelstrom-netd.c 2021-02-01 16:46:31.000000000 +0100 -+++ b/Maelstrom-netd.c 2021-02-08 10:34:17.661600013 +0100 -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - - /* We wait in a loop for players to connect and tell us how many people diff --git a/srcpkgs/Maelstrom/patches/struct-button-typedef.patch b/srcpkgs/Maelstrom/patches/struct-button-typedef.patch deleted file mode 100644 index 178c9cdaa0ca74..00000000000000 --- a/srcpkgs/Maelstrom/patches/struct-button-typedef.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/buttonlist.h 2000-01-25 17:41:32.000000000 +0100 -+++ b/buttonlist.h 2021-02-08 10:38:39.377296739 +0100 -@@ -16,7 +16,7 @@ - - void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, - void (*callback)(void)) { -- struct button *belem; -+ ButtonList::button *belem; - - for ( belem=&button_list; belem->next; belem=belem->next ); - belem->next = new button; -@@ -30,7 +30,7 @@ - } - - void Activate_Button(Uint16 x, Uint16 y) { -- struct button *belem; -+ ButtonList::button *belem; - - for ( belem=button_list.next; belem; belem=belem->next ) { - if ( (x >= belem->x1) && (x <= belem->x2) && -@@ -42,7 +42,7 @@ - } - - void Delete_Buttons(void) { -- struct button *belem, *btemp; -+ ButtonList::button *belem, *btemp; - - for ( belem=button_list.next; belem; ) { - btemp = belem; diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template index 68f1ce33cddeb5..d4e0dfac6983f0 100644 --- a/srcpkgs/Maelstrom/template +++ b/srcpkgs/Maelstrom/template @@ -1,35 +1,26 @@ # Template file for 'Maelstrom' pkgname=Maelstrom -version=3.0.7 -revision=2 -build_style=gnu-configure -hostmakedepends="automake libtool SDL2_net-devel" -makedepends="SDL2_net-devel" -short_desc="Guide your ship through the Maelstrom asteroid belt" -maintainer="Orphaned " -license="GPL-2.0-or-later" +version=4.0.1 +revision=1 +build_style=cmake +configure_args="-DSTEAM=OFF -DUSE_VENDORED_SDL=OFF -DSTANDALONE_INSTALL=OFF" +makedepends="SDL3-devel" +short_desc="Guide your ship through the \"Maelstrom\" asteroid belt" +maintainer="orahcio " +license="Zlib" homepage="https://www.libsdl.org/projects/Maelstrom/" -distfiles="https://www.libsdl.org/projects/Maelstrom/src/Maelstrom-${version}.tar.gz" -checksum=93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036 -broken="Certificate verification failed for /CN=libsdl.org on builders" +_physfs_commit="49cfd5fdd46f38b4c2611556b44ee9b0d308e162" # Maelstrom links this commit +_sdlnet_commit="5af3b068ea13f888be954801c0b8c17993811850" # idem +distfiles="https://github.com/libsdl-org/Maelstrom/archive/refs/tags/release-${version}.tar.gz + https://github.com/icculus/physfs/archive/${_physfs_commit}.tar.gz>physfs-49cfd5f.tar.gz + https://github.com/libsdl-org/SDL_net/archive/${_sdlnet_commit}.tar.gz>sdlnet-5af3b06.tar.gz" +checksum="ed4e5d84aa4a6d57a447d46d74d6641bac595b6d67ee5ab725f053300972574d + 4a7cef19b0794b2631a43e1b53edaf4f7aa75a139526d4abc866d20ecda87646 + 3c382a676738207e2556793e724543a8b44b0b0b564c8af9bb3c04ceac7f9730" -CXXFLAGS="-Wno-error -Wno-write-strings -Wno-unused-result" +skip_extraction="physfs-49cfd5f.tar.gz sdlnet-5af3b06.tar.gz" -post_patch() { - awk '/^# KDE Config File$/{p=1;next} /^__EOF__$/{exit} p{print}' Maelstrom.spec.in > Maelstrom.desktop - vsed -i -e 's/\[KDE Desktop Entry\]/[Desktop Entry]/' Maelstrom.desktop -} - -pre_configure() { - mv configure.{in,ac} - ./autogen.sh -} - -post_install() { - make target=${DESTDIR}/usr/share/doc/$pkgname install_gamedocs - vbin Maelstrom - vmkdir usr/share/applications - vinstall Maelstrom.desktop 644 usr/share/applications - vmkdir usr/share/pixmaps - ln -s ../$pkgname/icon.xpm ${DESTDIR}/usr/share/pixmaps/$pkgname.xpm +post_extract() { + vsrcextract -C "${wrksrc}/external/physfs" physfs-49cfd5f.tar.gz + vsrcextract -C "${wrksrc}/external/SDL_net" sdlnet-5af3b06.tar.gz }