public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/files/, games-strategy/warzone2100/
@ 2019-08-01  3:26 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2019-08-01  3:26 UTC (permalink / raw
  To: gentoo-commits

commit:     bd142618d8a708a307bad239bc74d857bae7211a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  1 03:17:18 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 03:25:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd142618

games-strategy/warzone2100: Bump to version 3.3.0_beta1

Closes: https://bugs.gentoo.org/691202
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/warzone2100/Manifest                |   1 +
 .../warzone2100-3.3.0_beta1-gettext_version.patch  |  36 +++++++
 .../warzone2100/warzone2100-3.3.0_beta1.ebuild     | 115 +++++++++++++++++++++
 3 files changed, 152 insertions(+)

diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index bb5b63ad593..426b447104e 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,3 +1,4 @@
 DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
+DIST warzone2100-3.3.0_beta1.tar.xz 85916776 BLAKE2B ec94e6fafff103e014e063f554b6a40411577d9c415733eb7857c4cd470195f1ab9878c2d5afd6c154e1f058c2f2a645a46738518d307da42ae97e0898fdf75a SHA512 17e9d81e7eadc71ad285147ff76517a92e8ea8747a05a6a08373d994725efa6bae11f87cd6bc9068cbfd78aa24d26fea95929c65a0906d03605b96469d972f4a
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6

diff --git a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch b/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
new file mode 100644
index 00000000000..2d4b6c50a48
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
@@ -0,0 +1,36 @@
+From 5539b080824bd4bcd0f212829012993ef193dc41 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 1 Aug 2019 04:53:14 +0200
+Subject: [PATCH] configure.ac: Raise AM_GNU_GETTEXT_VERSION to 0.17
+
+the shipped copy of po/Makefile.in.in comes from gettext-0.17 and since
+m4/po.m4 has been changed to use AC_PROG_MKDIR_P (Trac ticket #4701)
+autopoint from gettext would produce a broken po/Makefile.in.in which has
+no MKDIR_P definition. This again would result in "make install" throwing
+the following error when invoking install-data-yes target in /po/ dir:
+
+  make[1]: execvp: /usr/share: Permission denied
+
+Raising AM_GNU_GETTEXT_VERSION fixes the described issue.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7e9c31433..30a732447 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,7 +71,7 @@ AC_CHECK_HEADERS(alloca.h sys/ucontext.h)
+ 
+ # Check for gettext
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.15])
++AM_GNU_GETTEXT_VERSION([0.17])
+ 
+ # Check for pkg-config
+ PKG_PROG_PKG_CONFIG
+-- 
+2.22.0
+

diff --git a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
new file mode 100644
index 00000000000..fddc0901378
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs 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="http://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
+SLOT="0"
+#[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~amd64 ~x86"
+# upstream requested debug support
+IUSE="debug nls videos"
+
+# TODO: unbundle miniupnpc and quesoglc
+# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
+CDEPEND="
+	>=dev-games/physfs-2[zip]
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/harfbuzz
+	media-libs/libogg
+	media-libs/libpng:0
+	media-libs/libsdl2[opengl,video,X]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${CDEPEND}
+	dev-libs/fribidi
+	media-libs/fontconfig
+"
+RDEPEND="
+	${CDEPEND}
+	media-fonts/dejavu
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.0_beta1-gettext_version.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+	sed '/appdata\.xml/d' -i icons/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localedir="${EPREFIX}"/usr/share/locale
+		--with-distributor="Gentoo ${PF}"
+		--with-icondir="${EPREFIX}"/usr/share/icons/hicolor/128x128/apps
+		--with-applicationdir="${EPREFIX}"/usr/share/applications
+		$(use_enable debug debug relaxed)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local HTML_DOCS=( doc/quickstartguide.html )
+	default
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	if use videos ; then
+		insinto /usr/share/${PN}
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+	doman doc/warzone2100.6
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/files/, games-strategy/warzone2100/
@ 2019-09-02 15:24 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2019-09-02 15:24 UTC (permalink / raw
  To: gentoo-commits

commit:     f99b14ca82fab63566bed35f2be25d530b0cb62b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 15:21:53 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 15:24:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f99b14ca

games-strategy/warzone2100: Bump to version 3.3.0. Removed old

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/warzone2100/Manifest                |  2 +-
 .../warzone2100-3.3.0_beta1-gettext_version.patch  | 36 ----------------------
 ...3.3.0_beta1.ebuild => warzone2100-3.3.0.ebuild} | 12 +++-----
 3 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 426b447104e..a237586ef41 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,4 +1,4 @@
 DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
-DIST warzone2100-3.3.0_beta1.tar.xz 85916776 BLAKE2B ec94e6fafff103e014e063f554b6a40411577d9c415733eb7857c4cd470195f1ab9878c2d5afd6c154e1f058c2f2a645a46738518d307da42ae97e0898fdf75a SHA512 17e9d81e7eadc71ad285147ff76517a92e8ea8747a05a6a08373d994725efa6bae11f87cd6bc9068cbfd78aa24d26fea95929c65a0906d03605b96469d972f4a
+DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6

diff --git a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch b/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
deleted file mode 100644
index 2d4b6c50a48..00000000000
--- a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5539b080824bd4bcd0f212829012993ef193dc41 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 1 Aug 2019 04:53:14 +0200
-Subject: [PATCH] configure.ac: Raise AM_GNU_GETTEXT_VERSION to 0.17
-
-the shipped copy of po/Makefile.in.in comes from gettext-0.17 and since
-m4/po.m4 has been changed to use AC_PROG_MKDIR_P (Trac ticket #4701)
-autopoint from gettext would produce a broken po/Makefile.in.in which has
-no MKDIR_P definition. This again would result in "make install" throwing
-the following error when invoking install-data-yes target in /po/ dir:
-
-  make[1]: execvp: /usr/share: Permission denied
-
-Raising AM_GNU_GETTEXT_VERSION fixes the described issue.
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7e9c31433..30a732447 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@ AC_CHECK_HEADERS(alloca.h sys/ucontext.h)
- 
- # Check for gettext
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.15])
-+AM_GNU_GETTEXT_VERSION([0.17])
- 
- # Check for pkg-config
- PKG_PROG_PKG_CONFIG
--- 
-2.22.0
-

diff --git a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
similarity index 91%
rename from games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
rename to games-strategy/warzone2100/warzone2100-3.3.0.ebuild
index d8ab1ae7bb7..fe91974e0f3 100644
--- a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
@@ -4,17 +4,17 @@
 EAPI=7
 inherit autotools toolchain-funcs xdg
 
-MY_PV=$(ver_cut 1-2)
+MY_PV="$(ver_cut 1-2)"
 VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+VIDEOS_P="${PN}-videos-${VIDEOS_PV}.wz"
 DESCRIPTION="3D real-time strategy game"
 HOMEPAGE="http://wz2100.net/"
-SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
+SRC_URI="mirror://sourceforge/warzone2100/${P}_src.tar.xz
 	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
 SLOT="0"
-#[[ "${PV}" == *_beta* ]] || \
+[[ "${PV}" == *_beta* ]] || \
 KEYWORDS="~amd64 ~x86"
 # upstream requested debug support
 IUSE="debug nls videos"
@@ -64,10 +64,6 @@ BDEPEND="
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.0_beta1-gettext_version.patch
-)
-
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/files/, games-strategy/warzone2100/
@ 2021-08-17 21:29 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-08-17 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     d4ec1dbe751e78da0a90486cd8d0715cf23e8aaf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 21:28:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 21:28:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ec1dbe

games-strategy/warzone2100: don't compress man pages, fix applying patches

Closes: https://bugs.gentoo.org/808120
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../warzone2100-4.1.3-no-compress-manpages.patch   | 60 ++++++++++++++++++++++
 .../warzone2100/warzone2100-4.1.3-r4.ebuild        |  6 ++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch b/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch
new file mode 100644
index 00000000000..b90ad05bc75
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/808120
+
+From e65b71cec99b2c3a4d0ed6aa448e7a2dc28fabac Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 17 Aug 2021 22:22:40 +0100
+Subject: [PATCH] Don't compress manpages
+
+---
+ doc/CMakeLists.txt | 34 ++++++----------------------------
+ 1 file changed, 6 insertions(+), 28 deletions(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 3d27a1a..f3c702b 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -236,35 +236,13 @@ install(FILES ${wz2100_doc_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}${WZ_OUTPU
+ if(UNIX)
+ 	# Man-page gzip and installation
+ 
+-	find_program(GZIP_BIN NAMES gzip PATHS /bin /usr/bin /usr/local/bin)
+-	if (GZIP_BIN)
+-		set(_warzone2100_6_uncompressed_orig "${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6")
+-		set(_warzone2100_6_uncompressed "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6")
+-		set(_warzone2100_6_compressed "${_warzone2100_6_uncompressed}.gz")
+-
+-		add_custom_target(wz2100_manpages ALL)
+-		set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc")
+-		add_dependencies(wz2100_manpages wz2100_doc)
+-
+-		if (NOT "${_warzone2100_6_uncompressed_orig}" STREQUAL "${_warzone2100_6_uncompressed}")
+-			add_custom_command(
+-				TARGET wz2100_manpages
+-				COMMAND ${CMAKE_COMMAND} -E copy "${_warzone2100_6_uncompressed_orig}" "${_warzone2100_6_uncompressed}"
+-				COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed}
+-				VERBATIM
+-			)
+-		else()
+-			add_custom_command(
+-				TARGET wz2100_manpages
+-				COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed}
+-				VERBATIM
+-			)
+-		endif()
++	set(_warzone2100_6 "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6")
+ 
+-		install(FILES "${_warzone2100_6_compressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
+-	else()
+-		message( WARNING "Unable to find gzip tool; skipping Unix man page generation" )
+-	endif()
++	add_custom_target(wz2100_manpages ALL)
++	set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc")
++	add_dependencies(wz2100_manpages wz2100_doc)
++
++	install(FILES "${_warzone2100_6}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
+ endif()
+ 
+ set(wz2100_doc_IMAGES_FILES ${wz2100_doc_IMAGES_FILES} PARENT_SCOPE)
+-- 
+2.33.0
+

diff --git a/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild b/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild
index ae4e109622e..1259fe012c7 100644
--- a/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild
@@ -58,13 +58,15 @@ BDEPEND="
 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() {
-	default
-
 	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
 
 	# Delete translations we're not using


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/files/, games-strategy/warzone2100/
@ 2025-01-23  2:46 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-01-23  2:46 UTC (permalink / raw
  To: gentoo-commits

commit:     eab0146634a94c376407c8ffc157c9afc59db82f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 02:35:52 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 02:45:29 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab01466

games-strategy/warzone2100: add 4.5.5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/warzone2100/Manifest                |   1 +
 .../files/warzone2100-4.5.5-gcc15-cstdint.patch    |  10 ++
 .../warzone2100/warzone2100-4.5.5.ebuild           | 130 +++++++++++++++++++++
 3 files changed, 141 insertions(+)

diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index bb1b26192306..049861d67890 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,2 +1,3 @@
 DIST warzone2100-4.4.2.tar.xz 490182768 BLAKE2B 4b8f6825072c8dd29e1d4699b21123ff015e87da9b4f5043e40398ec5ec41ba12d414bbb01dd616a9e7f74f45407341e87a071ef38eb7c191e3845016f8df330 SHA512 8edfae77853826fda4bafafc513d9c6d999861fc4a7f0cf22318df7ebf9df3d7f98c3859eec8e8eeb02f4243b7e2e152c8d46881f4f8d414787ef0d0735ea4e6
+DIST warzone2100-4.5.5.tar.xz 507815568 BLAKE2B cc4ff66e2df7666ebb834ead839e2ac2345f3e105232c53d0ec72be375ae01530ff0532368549b196a1a8cbbf9b9903ab5467b7e30248d618bf6fc6e3030d8b0 SHA512 b153306ea8a55334a37580c2862579f6b6a283ba3c082901fcb97fe4da3a6ae4b7bc9bd7c1fa33f39a3b5113876080b90422174f376a7ed148a18f21f57ee8b3
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6

diff --git a/games-strategy/warzone2100/files/warzone2100-4.5.5-gcc15-cstdint.patch b/games-strategy/warzone2100/files/warzone2100-4.5.5-gcc15-cstdint.patch
new file mode 100644
index 000000000000..e3af62d1ffcd
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-4.5.5-gcc15-cstdint.patch
@@ -0,0 +1,10 @@
+--- 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>

diff --git a/games-strategy/warzone2100/warzone2100-4.5.5.ebuild b/games-strategy/warzone2100/warzone2100-4.5.5.ebuild
new file mode 100644
index 000000000000..58670ad3ae60
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.5.5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ar_SA 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 it ja_JP ko la lt my_MM nb nl pl pt pt_BR ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
+inherit cmake flag-o-matic 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="
+	https://downloads.sourceforge.net/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
+	videos? ( https://downloads.sourceforge.net/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 ~arm64 ~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
+	media-libs/opusfile
+	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.5.5-gcc15-cstdint.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() {
+	# ODR violations (bison, yy_*, bug #859268)
+	filter-lto
+
+	# TODO: unbundle dev-cpp/nlohmann_json
+	# TODO: unbundle dev-libs/libfmt
+	# TODO: unbundle SQLiteCpp
+	# TODO: unbundle dev-libs/inih
+	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)
+
+		-DFMT_INSTALL=OFF
+	)
+
+	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] 4+ messages in thread

end of thread, other threads:[~2025-01-23  2:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-23  2:46 [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/files/, games-strategy/warzone2100/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2021-08-17 21:29 Sam James
2019-09-02 15:24 Lars Wendler
2019-08-01  3:26 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox