diff --git a/srcpkgs/Maelstrom/patches/gcc82.patch b/srcpkgs/Maelstrom/patches/gcc82.patch deleted file mode 100644 index b111c1736b7..00000000000 --- a/srcpkgs/Maelstrom/patches/gcc82.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- load.h 2016-10-08 10:10:38.000000000 +0200 -+++ load.h 2018-08-22 10:13:31.696766996 +0200 -@@ -108,9 +108,9 @@ - delete[] path; - path = new char[strlen(directory)+1+strlen(filename)+1]; - if ( strcmp(directory, DIR_SEP) == 0 ) { -- sprintf(path, DIR_SEP"%s", filename); -+ sprintf(path, DIR_SEP "%s", filename); - } else { -- sprintf(path, "%s"DIR_SEP"%s", directory, filename); -+ sprintf(path, "%s" DIR_SEP "%s", directory, filename); - } - return(path); - } ---- load.cpp 2000-02-15 03:47:39.000000000 +0100 -+++ load.cpp 2018-08-22 10:23:36.123798178 +0200 -@@ -81,7 +81,7 @@ - SDL_Surface *bmp, *title; - - /* Open the title file -- we know its colormap is our global one */ -- sprintf(file, "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id); -+ sprintf(file, "Images" DIR_SEP "Maelstrom_Titles#%d.bmp", title_id); - bmp = SDL_LoadBMP(path.Path(file)); - if ( bmp == NULL ) { - return(NULL); -@@ -103,7 +103,7 @@ - Uint16 w, h; - - /* Open the cicn sprite file.. */ -- sprintf(file, "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id); -+ sprintf(file, "Images" DIR_SEP "Maelstrom_Icon#%hd.cicn", cicn_id); - if ( (cicn_src=SDL_RWFromFile(path.Path(file), "r")) == NULL ) { - error("GetCIcon(%hd): Can't open CICN %s: ", - cicn_id, path.Path(file)); ---- Maelstrom-netd.c 2000-02-12 10:58:59.000000000 +0100 -+++ Maelstrom-netd.c 2018-08-22 10:14:38.352770435 +0200 -@@ -2,6 +2,8 @@ - /* Here we go... */ - - #include -+#include -+#include - #include - #include - #include ---- buttonlist.h 2000-01-25 17:41:32.000000000 +0100 -+++ buttonlist.h 2018-08-22 10:17:36.182779609 +0200 -@@ -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; -@@ -58,7 +58,7 @@ - Uint16 x1, y1; - Uint16 x2, y2; - void (*callback)(void); -- struct button *next; -+ struct ButtonList::button *next; - } button; - button button_list; - }; ---- dialog.h 2001-07-20 17:08:10.000000000 +0200 -+++ dialog.h 2018-08-22 10:21:41.404792260 +0200 -@@ -402,7 +402,7 @@ - /* Loop to end of radio box list */; - /* Which is ANSI C++? */ - #ifdef linux -- radio->next = new struct Mac_RadioList::radio; -+ radio->next = new Mac_RadioList::radio; - #else - radio->next = new struct radio; - #endif diff --git a/srcpkgs/Maelstrom/patches/include-time_h.patch b/srcpkgs/Maelstrom/patches/include-time_h.patch new file mode 100644 index 00000000000..d66afafb586 --- /dev/null +++ b/srcpkgs/Maelstrom/patches/include-time_h.patch @@ -0,0 +1,10 @@ +--- Maelstrom-netd.c 2021-02-01 16:46:31.000000000 +0100 ++++ 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/install_dirs.patch b/srcpkgs/Maelstrom/patches/install_dirs.patch deleted file mode 100644 index 7778b1cc0cc..00000000000 --- a/srcpkgs/Maelstrom/patches/install_dirs.patch +++ /dev/null @@ -1,35 +0,0 @@ - ---- Makefile.in 2002-10-20 00:19:42.000000000 -0400 -+++ Makefile.in 2009-04-14 14:45:59.000000000 -0400 -@@ -431,7 +431,7 @@ - - # Special install rule for the game - install: -- make install_gamedata target=@GAME_INSTALLDIR@ -+ make install_gamedata target=$(DESTDIR)/@GAME_INSTALLDIR@ - - install_gamedata: - sh mkinstalldirs $(target)/ -@@ -444,8 +444,8 @@ - chmod 666 $(target)/Maelstrom-Scores - - install_gamedocs: -- sh mkinstalldirs $(target)/ -- cp -rv README* COPYING* Docs* $(target)/ -+ sh mkinstalldirs $(DESTDIR)/$(target)/ -+ cp -rv README* COPYING* Docs* $(DESTDIR)/$(target)/ - - # Rule to build tar-gzipped distribution package - $(PACKAGE)-$(VERSION).tar.gz: dist - ---- configure 2002-10-19 23:43:07.000000000 -0400 -+++ configure 2009-04-14 14:47:33.000000000 -0400 -@@ -3232,7 +3232,7 @@ - GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" - ;; - *) -- GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE" -+ GAME_INSTALLDIR="\$(prefix)/share/$PACKAGE" - ;; - esac - diff --git a/srcpkgs/Maelstrom/patches/struct-button-typedef.patch b/srcpkgs/Maelstrom/patches/struct-button-typedef.patch new file mode 100644 index 00000000000..b551a393d0c --- /dev/null +++ b/srcpkgs/Maelstrom/patches/struct-button-typedef.patch @@ -0,0 +1,29 @@ +--- buttonlist.h 2000-01-25 17:41:32.000000000 +0100 ++++ 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 7b857125bd9..4cb1f301b4e 100644 --- a/srcpkgs/Maelstrom/template +++ b/srcpkgs/Maelstrom/template @@ -1,19 +1,19 @@ # Template file for 'Maelstrom' pkgname=Maelstrom -version=3.0.6a -revision=2 +version=3.0.7 +revision=1 wrksrc="${pkgname}-${version%a}" build_style=gnu-configure -hostmakedepends="automake libtool SDL_net-devel" -makedepends="SDL_net-devel" +hostmakedepends="automake libtool SDL2_net-devel" +makedepends="SDL2_net-devel" short_desc="Guide your ship through the Maelstrom asteroid belt" maintainer="Jürgen Buchmüller " -license="GPL-2" -homepage="https://www.libsdl.org/projects/${pkgname}/" +license="GPL-2.0-or-later" +homepage="https://www.libsdl.org/projects/Maelstrom/" distfiles="${homepage}/src/${pkgname}-${version}.tar.gz" -checksum=342557bcc89eea57af4272778d3511be95fe46cf75e291298a15caa49a2f0e29 +checksum=93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036 -CXXFLAGS="-Wno-error -Wno-write-strings" +CXXFLAGS="-Wno-error -Wno-write-strings -Wno-unused-result" pre_configure() { mv configure.{in,ac} @@ -22,8 +22,7 @@ pre_configure() { post_install() { make target=${DESTDIR}/usr/share/doc/$pkgname install_gamedocs - # Remove useless file - rm -vf ${DESTDIR}/usr/share/doc/$pkgname/Docs/Makefile + vbin Maelstrom vman ${FILESDIR}/Maelstrom.6 vmkdir usr/share/applications vinstall ${FILESDIR}/Maelstrom.desktop 644 usr/share/applications