* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/, games-strategy/warzone2100/files/
@ 2023-01-21 21:09 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-01-21 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 11c14efa0f7c41e5d8bf5ffec38957bcc583f827
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 21:09:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 21:09:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c14efa
games-strategy/warzone2100: add 4.3.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/warzone2100/Manifest | 1 +
.../files/warzone2100-4.3.3-gcc13.patch | 24 +++++
.../warzone2100/warzone2100-4.3.3.ebuild | 118 +++++++++++++++++++++
3 files changed, 143 insertions(+)
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 581f780c01ed..d41cd02ad9b6 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,3 +1,4 @@
DIST warzone2100-4.2.7.tar.xz 338687576 BLAKE2B b504f8ed6b5c1b040b4368429394b7f077c279979ef7847734eeb333512fc374799c73119924fba206a6fc925db54697569a756e113d0a322dd46768c80d0b72 SHA512 af538f3bdf6ec543e5f919377c95c35c730fa6efa5c3ea8d140347595dd9f8056677d4b494677ea20c98da305e0fb588cdb00a3da1c497f96edc58ca8772e45b
DIST warzone2100-4.3.1.tar.xz 320493184 BLAKE2B 98f3fb13e36f3455532f0f054eaddb495b1f5fbf55fa30f356ab7d315536cd198697b0a084b47c5e1cb9ec0a5cc4bc0159be45669317469bdd2f7b24a62d46d2 SHA512 914d18a8226c11faa8bd03ab5b8f0a52e6e2b8531db501244ceb27f19b76209cbf668e51be59ce35b7203f74c5e62ad78e02ef0fb8505243948fa681f25d583e
+DIST warzone2100-4.3.3.tar.xz 320439712 BLAKE2B 15d29a0d7dc8c10b41dabf210e2113f079731e7976932a44054fa86b90dddee68e46faa5e4cf1d25ba57fc5d14c6ddedaea0f1544deb5755d19ca2ff02b7cb56 SHA512 46ccf2720d09481dfc89c1e3abb9802a379d1bfe0b3823566b51f2ea177fd793653d5b2592f07c724f0121cafd014c1ea6226b8c2bc22ec12ac3ca1bfaf298f4
DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
diff --git a/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch b/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch
new file mode 100644
index 000000000000..a9b8c42cfe00
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch
@@ -0,0 +1,24 @@
+https://github.com/Warzone2100/warzone2100/pull/3090
+
+From 0b8eed53d99c0491ffbcd903463a3b6eb0081525 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 21 Jan 2023 21:00:02 +0000
+Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> is no longer transitively included.
+
+Explicitly include <cstdint> for uint32_t.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/lib/framework/wzstring.h
++++ b/lib/framework/wzstring.h
+@@ -20,6 +20,7 @@
+ #ifndef _LIB_FRAMEWORK_WZSTRING_H
+ #define _LIB_FRAMEWORK_WZSTRING_H
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include <locale>
+
diff --git a/games-strategy/warzone2100/warzone2100-4.3.3.ebuild b/games-strategy/warzone2100/warzone2100-4.3.3.ebuild
new file mode 100644
index 000000000000..2e921f4e824e
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.3.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
+inherit cmake plocale xdg
+
+MY_PV=$(ver_cut 1-2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="https://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
+ videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Upstream requested debug support
+IUSE="debug discord nls videos vulkan"
+
+CDEPEND="
+ >=dev-games/physfs-2[zip]
+ dev-db/sqlite:3
+ >=dev-libs/libsodium-1.0.14:=
+ media-libs/freetype:2
+ media-libs/harfbuzz:=
+ media-libs/libogg
+ media-libs/libpng:=
+ media-libs/libsdl2[opengl,video,X]
+ media-libs/libtheora
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ nls? ( virtual/libintl )
+ vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+ ${CDEPEND}
+ dev-libs/fribidi
+ media-libs/fontconfig
+"
+RDEPEND="
+ ${CDEPEND}
+ media-fonts/dejavu
+"
+BDEPEND="
+ app-arch/zip
+ app-text/asciidoc
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
+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.3.3-gcc13.patch
+)
+
+src_unpack() {
+ unpack ${P}.tar.xz
+}
+
+src_prepare() {
+ sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+
+ # Delete translations we're not using
+ cleanup_po() {
+ local locale=${1}
+ einfo "Cleaning up disabled locale: ${locale}"
+ rm po/${locale}.po || die
+ }
+
+ plocale_for_each_disabled_locale cleanup_po
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # TODO: unbundle basisu (needs packaging)
+ # TODO: unbundle nlohmann-json
+ # TODO: unbundle fmt
+ local mycmakeargs=(
+ -DWZ_DISTRIBUTOR="Gentoo Linux"
+ -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF
+ -DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan)
+ -DBUILD_SHARED_LIBS=OFF
+ -DENABLE_NLS=$(usex nls)
+ -DENABLE_DISCORD=$(usex discord)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ asciidoc -b html5 doc/quickstartguide.asciidoc || die
+}
+
+src_install() {
+ cmake_src_install
+
+ # We cover licencing within the ebuild itself
+ rm "${ED}"/usr/share/doc/${PF}/COPYING* \
+ "${ED}"/usr/share/doc/${PF}/copyright || die
+
+ if use videos ; then
+ insinto /usr/share/${PN}
+ newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/, games-strategy/warzone2100/files/
@ 2023-06-27 11:28 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-06-27 11:28 UTC (permalink / raw
To: gentoo-commits
commit: 0621470a72cc2fe143061c4a07c5a91fa2d5f1b8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 11:09:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 11:27:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0621470a
games-strategy/warzone2100: drop 4.3.3-r3, 4.3.4
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/warzone2100/Manifest | 2 -
.../files/warzone2100-4.3.3-gcc13.patch | 24 ----
.../warzone2100/warzone2100-4.3.3-r3.ebuild | 119 --------------------
.../warzone2100/warzone2100-4.3.4.ebuild | 121 ---------------------
4 files changed, 266 deletions(-)
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 4d31b6de0c1f..2db06a7390ea 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,4 +1,2 @@
-DIST warzone2100-4.3.3.tar.xz 320439712 BLAKE2B 15d29a0d7dc8c10b41dabf210e2113f079731e7976932a44054fa86b90dddee68e46faa5e4cf1d25ba57fc5d14c6ddedaea0f1544deb5755d19ca2ff02b7cb56 SHA512 46ccf2720d09481dfc89c1e3abb9802a379d1bfe0b3823566b51f2ea177fd793653d5b2592f07c724f0121cafd014c1ea6226b8c2bc22ec12ac3ca1bfaf298f4
-DIST warzone2100-4.3.4.tar.xz 320385680 BLAKE2B 4c0e26dfe0bc1c80eef0620a81d50d1e8fcf93ad7f125a860d5cfc842e24b5458189c932452353e6e5cb86adc7be4ef0509d006961736afda8292f083285b79e SHA512 75d1b75c452f0c5e3c518efd5378be003c4040f4202408d344341849f534a93573b235191451eb9b8b8e2945754ca2355a44547607e21e1cf60453176dce8f2a
DIST warzone2100-4.3.5.tar.xz 320369492 BLAKE2B 526568cd25e7600e4f45714f4cd2a8ef9da8a1a3f6691d9cb07f4ed6c9367fc412f0fa77b4a547c4a4eac6d42624ac5b9d1e105e4606f801f773ce6028740286 SHA512 ec65f22a0aad9fe482c4ea916cb321d171b10f0a9b181fea7db2eb17bf54e32b3828c8259082fff266713e2cab4e32dcc455d0d5b923a5ca221fc77b11137062
DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
diff --git a/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch b/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch
deleted file mode 100644
index a9b8c42cfe00..000000000000
--- a/games-strategy/warzone2100/files/warzone2100-4.3.3-gcc13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/Warzone2100/warzone2100/pull/3090
-
-From 0b8eed53d99c0491ffbcd903463a3b6eb0081525 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 21 Jan 2023 21:00:02 +0000
-Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <cstdint> is no longer transitively included.
-
-Explicitly include <cstdint> for uint32_t.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/lib/framework/wzstring.h
-+++ b/lib/framework/wzstring.h
-@@ -20,6 +20,7 @@
- #ifndef _LIB_FRAMEWORK_WZSTRING_H
- #define _LIB_FRAMEWORK_WZSTRING_H
-
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include <locale>
-
diff --git a/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild b/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild
deleted file mode 100644
index 3c5a613b3679..000000000000
--- a/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
-inherit cmake plocale xdg
-
-MY_PV=$(ver_cut 1-2)
-VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
-DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="https://wz2100.net/"
-SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
- videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Upstream requested debug support
-IUSE="debug discord nls videos vulkan"
-
-COMMON_DEPEND="
- dev-libs/fribidi
- >=dev-games/physfs-2[zip]
- dev-db/sqlite:3
- >=dev-libs/libsodium-1.0.14:=
- media-libs/freetype:2
- media-libs/harfbuzz:=
- media-libs/libogg
- media-libs/libpng:=
- media-libs/libsdl2[opengl,video,X]
- media-libs/libtheora
- media-libs/libvorbis
- media-libs/openal
- media-libs/opus
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- nls? ( virtual/libintl )
- vulkan? ( media-libs/libsdl2:=[vulkan] )
-"
-DEPEND="
- ${COMMON_DEPEND}
- media-libs/fontconfig
-"
-RDEPEND="
- ${COMMON_DEPEND}
- media-fonts/dejavu
-"
-BDEPEND="
- app-arch/zip
- app-text/asciidoc
- games-util/basis_universal
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
-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.3.3-gcc13.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.xz
-}
-
-src_prepare() {
- sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-
- # Delete translations we're not using
- cleanup_po() {
- local locale=${1}
- einfo "Cleaning up disabled locale: ${locale}"
- rm po/${locale}.po || die
- }
-
- plocale_for_each_disabled_locale cleanup_po
-
- cmake_src_prepare
-}
-
-src_configure() {
- # TODO: unbundle nlohmann-json
- # TODO: unbundle fmt
- local mycmakeargs=(
- -DWZ_DISTRIBUTOR="Gentoo Linux"
- -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF
- -DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan)
- -DBUILD_SHARED_LIBS=OFF
- -DENABLE_NLS=$(usex nls)
- -DENABLE_DISCORD=$(usex discord)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- asciidoc -b html5 doc/quickstartguide.asciidoc || die
-}
-
-src_install() {
- cmake_src_install
-
- # We cover licencing within the ebuild itself
- rm "${ED}"/usr/share/doc/${PF}/COPYING* \
- "${ED}"/usr/share/doc/${PF}/copyright || die
-
- if use videos ; then
- insinto /usr/share/${PN}
- newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
- fi
-}
diff --git a/games-strategy/warzone2100/warzone2100-4.3.4.ebuild b/games-strategy/warzone2100/warzone2100-4.3.4.ebuild
deleted file mode 100644
index 8a663d4f672e..000000000000
--- a/games-strategy/warzone2100/warzone2100-4.3.4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
-inherit cmake plocale xdg
-
-MY_PV=$(ver_cut 1-2)
-VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
-
-DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="https://wz2100.net/"
-SRC_URI="
- mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
- videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Upstream requested debug support
-IUSE="debug discord nls videos vulkan"
-
-COMMON_DEPEND="
- dev-libs/fribidi
- >=dev-games/physfs-2[zip]
- dev-db/sqlite:3
- >=dev-libs/libsodium-1.0.14:=
- media-libs/freetype:2
- media-libs/harfbuzz:=
- media-libs/libogg
- media-libs/libpng:=
- media-libs/libsdl2[opengl,video,X]
- media-libs/libtheora
- media-libs/libvorbis
- media-libs/openal
- media-libs/opus
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- nls? ( virtual/libintl )
- vulkan? ( media-libs/libsdl2:=[vulkan] )
-"
-DEPEND="
- ${COMMON_DEPEND}
- media-libs/fontconfig
-"
-RDEPEND="
- ${COMMON_DEPEND}
- media-fonts/dejavu
-"
-BDEPEND="
- app-arch/zip
- app-text/asciidoc
- games-util/basis_universal
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
-DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
-)
-
-src_unpack() {
- unpack ${P}.tar.xz
-}
-
-src_prepare() {
- sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-
- # Delete translations we're not using
- cleanup_po() {
- local locale=${1}
- einfo "Cleaning up disabled locale: ${locale}"
- rm po/${locale}.po || die
- }
-
- plocale_for_each_disabled_locale cleanup_po
-
- cmake_src_prepare
-}
-
-src_configure() {
- # TODO: unbundle nlohmann-json
- # TODO: unbundle fmt
- local mycmakeargs=(
- -DWZ_DISTRIBUTOR="Gentoo Linux"
- -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF
- -DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan)
- -DBUILD_SHARED_LIBS=OFF
- -DENABLE_NLS=$(usex nls)
- -DENABLE_DISCORD=$(usex discord)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- asciidoc -b html5 doc/quickstartguide.asciidoc || die
-}
-
-src_install() {
- cmake_src_install
-
- # We cover licencing within the ebuild itself
- rm "${ED}"/usr/share/doc/${PF}/COPYING* \
- "${ED}"/usr/share/doc/${PF}/copyright || die
-
- if use videos ; then
- insinto /usr/share/${PN}
- newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/, games-strategy/warzone2100/files/
@ 2024-08-06 11:32 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-08-06 11:32 UTC (permalink / raw
To: gentoo-commits
commit: 79fab52ed6f9b7e0d07529460ef05ed338c45efa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 6 11:30:49 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 11:30:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79fab52e
games-strategy/warzone2100: fix build w/ gcc-15
Not sent upstream as we should really bump warzone2100 first.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/warzone2100-4.4.2-gcc15-cstdint.patch | 30 ++++++++++++++++++++++
.../warzone2100/warzone2100-4.4.2.ebuild | 1 +
2 files changed, 31 insertions(+)
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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-06 11:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-21 21:09 [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/, games-strategy/warzone2100/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-06-27 11:28 Sam James
2024-08-06 11:32 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox