[gentoo-commits] repo/gentoo:master commit in: games-strategy/augustus/, games-strategy/augustus/files/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/augustus/, games-strategy/augustus/files/

[Sam James]

commit:     3e173f2ec58049876cd16fe25714747932eed092
Author:     brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jul 11 14:24:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 18:39:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e173f2e

games-strategy/augustus: Fix build on musl

musl doesn't provide execinfo.h, so include it only on glibc systems

Closes: https://bugs.gentoo.org/829345

Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26348
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/augustus/augustus-3.1.0.ebuild                |  1 +
 .../augustus/files/augustus-3.1.0-musl-fix-execinfo.patch    | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/games-strategy/augustus/augustus-3.1.0.ebuild b/games-strategy/augustus/augustus-3.1.0.ebuild
index 1adb27ab8703..254e4efc5a77 100644
--- a/games-strategy/augustus/augustus-3.1.0.ebuild
+++ b/games-strategy/augustus/augustus-3.1.0.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-desktop_rename.patch"
+	"${FILESDIR}/${PN}-3.1.0-musl-fix-execinfo.patch"
 )
 
 src_prepare() {

diff --git a/games-strategy/augustus/files/augustus-3.1.0-musl-fix-execinfo.patch b/games-strategy/augustus/files/augustus-3.1.0-musl-fix-execinfo.patch
new file mode 100644
index 000000000000..97b96cf61e59
--- /dev/null
+++ b/games-strategy/augustus/files/augustus-3.1.0-musl-fix-execinfo.patch
@@ -0,0 +1,12 @@
+# Closes: https://bugs.gentoo.org/829345
+--- a/src/platform/crash_handler.c
++++ b/src/platform/crash_handler.c
+@@ -7,7 +7,7 @@
+
+ #if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && \
+     !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__) && \
+-    !defined(__HAIKU__) && !defined(__EMSCRIPTEN__)
++    !defined(__HAIKU__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
+
+ #include <execinfo.h>
+ #include <signal.h>

[gentoo-commits] repo/gentoo:master commit in: games-strategy/augustus/, games-strategy/augustus/files/

[Ionen Wolkens]

commit:     f97e47bbe6aeb70c7647b2bde5f61c8d6e8117c4
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 06:58:31 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 07:37:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97e47bb

games-strategy/augustus: drop 3.0.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/augustus/Manifest                   |  1 -
 games-strategy/augustus/augustus-3.0.1.ebuild      | 52 ----------------------
 .../files/augustus-3.0.1-musl-fix-execinfo.patch   | 13 ------
 .../augustus/files/augustus-3.0.1-uncapped.patch   | 16 -------
 games-strategy/augustus/metadata.xml               |  3 --
 5 files changed, 85 deletions(-)

diff --git a/games-strategy/augustus/Manifest b/games-strategy/augustus/Manifest
index 4028502c621b..2e72e0661d09 100644
--- a/games-strategy/augustus/Manifest
+++ b/games-strategy/augustus/Manifest
@@ -1,2 +1 @@
-DIST augustus-3.0.1.tar.gz 47539500 BLAKE2B 43e808959f176e4024866074c227814e2be75175cbbca60fbc430a7617941766b8a00ae6f56c08239c5ed8cd60d637109e963eba859c78d60f7b37d54079e7c4 SHA512 4929763a4436863525c4d3f93570090ce066ea2abfe56766d991b7ebc03b34fc53fc8c6dcbb7f5c96e2e10d233bb5966581d148db7d7ea2eac5c1435cc4327bd
 DIST augustus-3.1.0.tar.gz 97754907 BLAKE2B 2f30458538a3395b15da1ff1da68e6be4618e51e5e6b0ab89d5215292ff8d67beb5467152caa698bd408bd4c890183ac7109c02a4bbb1e72dc0e94d3c33f6cc3 SHA512 b1831cbaa4d3bac5991aca8fdc1299a4536147d780e328d0e09bb68f71c155eccfd0b087aa9a412868aee6853fd327922481251b8c510a131148d9b31c424536

diff --git a/games-strategy/augustus/augustus-3.0.1.ebuild b/games-strategy/augustus/augustus-3.0.1.ebuild
deleted file mode 100644
index e9e88193f601..000000000000
--- a/games-strategy/augustus/augustus-3.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake readme.gentoo-r1
-
-DESCRIPTION="Feature-enhanced open source re-implementation of Caesar III"
-HOMEPAGE="https://github.com/Keriew/augustus"
-SRC_URI="https://github.com/Keriew/augustus/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="uncapped"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,video,sound]
-	media-libs/sdl2-mixer
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-desktop_rename.patch"
-	"${FILESDIR}/${PN}-3.0.1-musl-fix-execinfo.patch"
-)
-
-src_prepare() {
-	use uncapped && eapply "${FILESDIR}"/${PN}-3.0.1-uncapped.patch
-	cmake_src_prepare
-}
-
-src_install() {
-	cmake_src_install
-	dodir /usr/libexec
-	mv "${ED}/usr/bin/augustus"  "${ED}/usr/libexec/augustus-game" ||
-		die "Failed to rename executable (required to set default resources location)."
-	newbin - augustus-game <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/usr/libexec/augustus-game" "\${1:-\${HOME}/.local/share/julius/app}"
-	EOF
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}

diff --git a/games-strategy/augustus/files/augustus-3.0.1-musl-fix-execinfo.patch b/games-strategy/augustus/files/augustus-3.0.1-musl-fix-execinfo.patch
deleted file mode 100644
index e79e87702429..000000000000
--- a/games-strategy/augustus/files/augustus-3.0.1-musl-fix-execinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/backtrace.c b/src/core/backtrace.c
-index 374fcdd..daf5c71 100644
---- a/src/core/backtrace.c
-+++ b/src/core/backtrace.c
-@@ -2,7 +2,7 @@
- 
- #include "core/log.h"
- 
--#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__) && !defined(__HAIKU__)
-+#if defined(__GNUC__) && defined(__GLIBC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__) && !defined(__HAIKU__)
- 
- #include <execinfo.h>
- 

diff --git a/games-strategy/augustus/files/augustus-3.0.1-uncapped.patch b/games-strategy/augustus/files/augustus-3.0.1-uncapped.patch
deleted file mode 100644
index 6bd4f93c1a14..000000000000
--- a/games-strategy/augustus/files/augustus-3.0.1-uncapped.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From 1d3a24d74bbea85198c2c5d739a16dcc139af18b Mon Sep 17 00:00:00 2001
-From: Horea Christian <chr@chymera.eu>
-Date: Sat, 26 Dec 2020 12:59:15 -0500
-Subject: [PATCH] Unlimited number of Grand Temples.
-
---- a/src/building/monument.h
-+++ b/src/building/monument.h
-@@ -6,7 +6,7 @@
-
- #define MONUMENT_FINISHED -1
- #define MONUMENT_START 1
--#define MAX_GRAND_TEMPLES_PER_CITY 2
-+#define MAX_GRAND_TEMPLES_PER_CITY 99
- #define MARS_OFFERING_FREQUENCY 16
-
- typedef enum {

diff --git a/games-strategy/augustus/metadata.xml b/games-strategy/augustus/metadata.xml
index 15f72dff5e6d..70c52d57757d 100644
--- a/games-strategy/augustus/metadata.xml
+++ b/games-strategy/augustus/metadata.xml
@@ -18,7 +18,4 @@
 	<upstream>
 		<remote-id type="github">Keriew/augustus</remote-id>
 	</upstream>
-	<use>
-		<flag name="uncapped">Uncap grand temple count</flag>
-	</use>
 </pkgmetadata>