9 files changed, 131 insertions, 1 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index cf123cc6f8ff..3ac9ce2c83cf 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest
index 12b59654a12b..ef1ce45f08e0 100644
--- a/games-strategy/dunelegacy/Manifest
+++ b/games-strategy/dunelegacy/Manifest
@@ -1,4 +1,9 @@
 AUX dunelegacy-0.96.4-init-mid.patch 1926 BLAKE2B 47c2f502e9428f0534a1684db50aa1a41103464770f8da66f69b0add7687f42e07e4f5e612f3c425f3d0f932da29d7a6049342b6bbd0b0166cbec4d5076703c6 SHA512 a10fb87b3bceb367e53dd3687354871fc8bec3dff2025b37c4426994a206c7afbd416c003f2eddfe3d1cef7e845942d2a8db4529e84c38d4b29d75d016fa8729
+AUX dunelegacy-0.97.02-flags.patch 1004 BLAKE2B 8638fb2dfb3ed635a3c811632bcda75a4d36355a7d7662d9bb95b95e2d4e8b6f1386bef9c02f8b9fc9233a2b1fa6742e4e4b55fb9523c9029d6cc3b78516dc64 SHA512 4dba160f49cb6147ee54eccb8d8b08a975b273675851f1655a1cd4230ff29177e468f6d9529a6bc873eab680f2ce7476915fd3e5cbeecb48e9158382ee4361ae
+AUX dunelegacy-0.97.02-flickering.patch 382 BLAKE2B 8f74815dfc0912de0b19528bb95f05fe645355f0580563a1a34333f5c2c2bfa43786f25ed0a425304ff91a321da6f7b54de34e38eb379d6c0aed1666b3e1950f SHA512 3139652f0278c2f629a405ad9b396cd2e100f7bccd30251bce84d89ea21e622fc016f653d04d2b7f0c98c285ab0bf1087954fa7df20f5d30ff91ff44c9b7c825
+AUX dunelegacy-0.97.02-text-manager.patch 393 BLAKE2B 30e10ca65bdb6255db04b63acf758db202e7e94b526f25cef9655845bfb2a7a77606fcc78f6e3f2d9367466ce04a8d70fc6cac8a2e282b4f5c8cdeb015008482 SHA512 350cd228e030f44471ac32a6e1e581c117887cffdd2d9dc40eb551c3a3b3956b97597e097e4b27f5774a41692c3fa85a0da0e7ee06df51b2e62bc5769f6d17c3
 DIST dunelegacy-0.96.4-src.tar.bz2 2513167 BLAKE2B 119ccabc319a54fbc85906a215ccb44079dabf82568dbd446447bbc6fade873c4760da83a50351acf63aec49bf8364c50386eef2b0681bc7a895db870673340f SHA512 d6e152da4bc526ed05ac89fafc2e3467b1a95b3670987eeca262b7207e7dbe67dd228483cb5a432fe08232e34a52d4cb500b42cd186adb4bcde5da17419f7db0
+DIST dunelegacy-0.97.02.zip 3241175 BLAKE2B bd99c0d186e3ea2ee94fa77aa9587990ffae51fad30178669a4686c1bf0793c5949c5f13c360359ba44fb6989c00a2a509d746e071b9dc578d966d346b932a74 SHA512 07dd04b3348ed9dc729eabfb7d1646d4ac30351911ca3024991fad58d6ee48f478068fbab25855d637890d5e549ae687af57231c8bf0af1ef8e815fedfbdfd54
 EBUILD dunelegacy-0.96.4-r1.ebuild 832 BLAKE2B 7a8a5cecbef19730442a24e7d296e5063752454c66aefbf2e9475df610e06dbfdac71b27a85418e41812bc82b099fe2ce7b055bb74bc151dcf9236b7798816a9 SHA512 6103ec66e4f6b288ebfbc7e693037805204bd7661e26c8b7e2f686e84621314119b98673a91af4f20d2c5f0aa42091fc0cdc5f5d13134eefd58831f06cd26d99
+EBUILD dunelegacy-0.97.02.ebuild 1006 BLAKE2B 407d8cd7fd71865d254f9e5af8214c4ddd726d2f11f145f7fe4a4ab30df0e375679685ee93dc7231bb640d73933641ed95cd689ac02554844d52a947af249be4 SHA512 ef283e71e3038199316f66c1dfaf35ceca548e56e98e191a5da9538ad8bf689754c3f5f649fa60f916f4c81ed51bf57d7fd8e5f4bbb64168974095dfbc3cb851
 MISC metadata.xml 990 BLAKE2B 061e344e58047df210eea2e672e1c38cacb01ac09b9c56828e4ac253ebff8b7aba40249dbffe696dc2b0343074c3c280b677dcb8e8bc64028c9ca85b51f260fd SHA512 b43c0f161108abd41a3fbe73ca1c1751e828d8fc909be52dd46ff145b5a3efeb6c8876d94d9cf4c7fb24e7f711830af1645ff9595500def47ad5833341f4d3e0
diff --git a/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild b/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild
new file mode 100644
index 000000000000..990a7648d9ac
--- /dev/null
+++ b/games-strategy/dunelegacy/dunelegacy-0.97.02.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Updated clone of Westood Studios' Dune II"
+HOMEPAGE="https://dunelegacy.sourceforge.net"
+
+COMMIT="6ea9ac96854daa8c75ba429e78dc6716b147e106"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.zip"
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
+RDEPEND="
+	media-libs/libsdl2[sound,threads(+),video]
+	media-libs/sdl2-mixer[midi]
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flickering.patch
+	"${FILESDIR}"/${P}-text-manager.patch
+	"${FILESDIR}"/${P}-flags.patch
+)
+
+src_prepare() {
+	default
+	sed -i "s/0\.96\.4/${PV}/g" configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	doicon -s scalable ${PN}.svg
+	doicon -s 48 ${PN}.png
+	newicon -s 128 ${PN}-128x128.png ${PN}.png
+	make_desktop_entry ${PN} "Dune Legacy"
+}
diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flags.patch b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flags.patch
new file mode 100644
index 000000000000..1c18bc0bd0c1
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flags.patch
@@ -0,0 +1,14 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2022-12-29 05:22:09.000000000 +0000
++++ b/configure.ac	2024-07-28 21:30:14.793202700 +0100
+@@ -19,8 +19,8 @@
+ AC_SUBST(dunelegacydatadir)
+ 
+ dnl Some flags for gcc
+-CXXFLAGS="-std=c++14 -pthread -fPIC -O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -Wno-unknown-pragmas -D__STDC_FORMAT_MACROS -DNDEBUG"
+-CFLAGS="-std=c99 -pthread -fPIC -O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -Wno-unknown-pragmas -D__STDC_FORMAT_MACROS -DNDEBUG"
++CXXFLAGS="$CXXFLAGS -std=c++14 -pthread -fPIC -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -Wno-unknown-pragmas -D__STDC_FORMAT_MACROS -DNDEBUG"
++CFLAGS="$CFLAGS -std=c99 -pthread -fPIC -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-shift-negative-value -Wno-unknown-pragmas -D__STDC_FORMAT_MACROS -DNDEBUG"
+ dnl Additional flags: -Wconversion -Wno-sign-conversion -Wlogical-op
+ 
+ dnl Some flags for clang
diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flickering.patch b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flickering.patch
new file mode 100644
index 000000000000..19a125f8c797
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-flickering.patch
@@ -0,0 +1,15 @@
+# https://sourceforge.net/p/dunelegacy/bugs/75/#12bf
+
+    Fix flickering in the game
+
+--- a/src/Game.cpp
++++ b/src/Game.cpp
+@@ -1094,8 +1094,6 @@ void Game::runMainLoop() {
+ 
+         drawScreen();
+ 
+-        SDL_RenderPresent(renderer);
+-
+         SDL_SetRenderTarget(renderer, nullptr);
+         SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
+         SDL_RenderClear(renderer);
diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.97.02-text-manager.patch b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-text-manager.patch
new file mode 100644
index 000000000000..25c339198ab7
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.97.02-text-manager.patch
@@ -0,0 +1,15 @@
+# https://aur.archlinux.org/packages/dunelegacy
+# https://aur.archlinux.org/cgit/aur.git/tree/text_manager.patch?h=dunelegacy
+
+    Fix missing <array> inclusion
+
+--- a/include/FileClasses/TextManager.h
++++ b/include/FileClasses/TextManager.h
+@@ -21,6 +21,7 @@
+ #include "IndexedTextFile.h"
+ #include "MentatTextFile.h"
+ 
++#include <array>
+ #include <string>
+ #include <vector>
+ #include <map>
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 450473907c26..0feba659501b 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,5 +1,6 @@
 AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558
+AUX warzone2100-4.4.2-gcc15-cstdint.patch 697 BLAKE2B 33e86cb9c5240429ba3a49c5e838d61b77889321bc74f397b025926b2a706cdbf21eb96c78b1d1c41d4c98df2e82d240dd48048b3c2164c45fe52e3074c53e61 SHA512 49920e67e02502e19a5b607420f7c4dd34065475a2870e67f683a2be2e5dca915ba4f35dd61787dcaa408e840ff68a5095d41501bd60a615a5420e23b3212ae7
 DIST warzone2100-4.4.2.tar.xz 490182768 BLAKE2B 4b8f6825072c8dd29e1d4699b21123ff015e87da9b4f5043e40398ec5ec41ba12d414bbb01dd616a9e7f74f45407341e87a071ef38eb7c191e3845016f8df330 SHA512 8edfae77853826fda4bafafc513d9c6d999861fc4a7f0cf22318df7ebf9df3d7f98c3859eec8e8eeb02f4243b7e2e152c8d46881f4f8d414787ef0d0735ea4e6
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-4.4.2.ebuild 2971 BLAKE2B 16ddc7f0737d8e2c5b108f9f23251c7d96db7728033d1ad4f64947d4b583eddb985482d63ee9d486d99dda31995e1eb0d52ba346f455dc921968467e4774b45c SHA512 92192a0a13ec4e826c7c42cffcab16c15ee3bdbbc165cd33d490f17123cb2a99eb6a8aea7381d84bb69bbad8a29d4b716e42cb2ed897f5bcbd5300bc2db47225
+EBUILD warzone2100-4.4.2.ebuild 3018 BLAKE2B 34c18a3ca337352051e0dc218fe29437f1e360c982c23ec216d504f24e2fac762de27b67089c4576612373adba1a97f3d71b82bf96ce9a453a4bdedbf3f1ca9f SHA512 2c50188fa41760320ffb41877d3c10ef2531378af831c085a778c5c006898e9bd1d67bceb327eae64f199ea86162cce620641aaa2048dc717b6f5bb3bac05547
 MISC metadata.xml 761 BLAKE2B b936989bcdaef01522f294635531f699a2db868a80fd696051a60a10c70fb1f24cb721a34064d222938333f2fa956bb07463ce60a5490c0cadfca2b9c69e987f SHA512 5e422b7b539f95705be9ef4cede8b3029e9bfc38e9fdd0002712432671956d946cb893a069839bad88a07ee4fc33bc6fa7e1042b1efdc8ea55823165fc77cb54
diff --git a/games-strategy/warzone2100/files/warzone2100-4.4.2-gcc15-cstdint.patch b/games-strategy/warzone2100/files/warzone2100-4.4.2-gcc15-cstdint.patch
new file mode 100644
index 000000000000..75e1aaeb97a0
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-4.4.2-gcc15-cstdint.patch
@@ -0,0 +1,30 @@
+--- a/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h
++++ b/3rdparty/SQLiteCpp/include/SQLiteCpp/Statement.h
+@@ -14,6 +14,7 @@
+ #include <SQLiteCpp/Exception.h>
+ #include <SQLiteCpp/Utils.h> // SQLITECPP_PURE_FUNC
+ 
++#include <cstdint>
+ #include <string>
+ #include <map>
+ #include <memory>
+--- a/lib/wzmaplib/include/wzmaplib/map_io.h
++++ b/lib/wzmaplib/include/wzmaplib/map_io.h
+@@ -21,6 +21,7 @@
+ #pragma once
+ 
+ #include <cstddef>
++#include <cstdint>
+ #include <string>
+ #include <memory>
+ #include <vector>
+--- a/lib/wzmaplib/src/map_script.h
++++ b/lib/wzmaplib/src/map_script.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <vector>
+ #include <string>
+ #include <memory>
diff --git a/games-strategy/warzone2100/warzone2100-4.4.2.ebuild b/games-strategy/warzone2100/warzone2100-4.4.2.ebuild
index 3125e1492345..1d21880339b4 100644
--- a/games-strategy/warzone2100/warzone2100-4.4.2.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.4.2.ebuild
@@ -65,6 +65,7 @@ DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
+	"${FILESDIR}"/${PN}-4.4.2-gcc15-cstdint.patch
 )
 
 src_unpack() {