summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-10 08:53:19 +0000
committerSam James <sam@gentoo.org>2021-04-10 09:03:37 +0000
commit1189b6de0315cd2a9a3810b2e60bc45f5ce1be78 (patch)
tree67256d147e1fe8721204d273084c93ca68df4007 /games-roguelike
parentdev-python/requests-cache: Bump to 0.6.0 (diff)
downloadgentoo-1189b6de0315cd2a9a3810b2e60bc45f5ce1be78.tar.gz
gentoo-1189b6de0315cd2a9a3810b2e60bc45f5ce1be78.tar.bz2
gentoo-1189b6de0315cd2a9a3810b2e60bc45f5ce1be78.zip
games-roguelike/scourge: respect AR
Closes: https://bugs.gentoo.org/780450 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-roguelike')
-rw-r--r--games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch6
-rw-r--r--games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch4
-rw-r--r--games-roguelike/scourge/scourge-0.21.1-r1.ebuild2
3 files changed, 6 insertions, 6 deletions
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
index d41ee1a44439..6a5a28d1c7ab 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
@@ -1,7 +1,5 @@
-Index: scourge/configure.in
-===================================================================
---- scourge/configure.in (revision 3411)
-+++ scourge/configure.in (working copy)
+--- a/configure.in
++++ b/configure.in
@@ -56,6 +56,7 @@
# Set up binreloc (for a relocatable autopackage file)
AM_BINRELOC
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
index 6f3f7b3e2a65..c018d24ee383 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
@@ -1,5 +1,5 @@
---- a/src/squirrel/squtils.h 2012-08-30 18:06:43.474037926 +0200
-+++ b/src/squirrel/squtils.h 2012-08-30 18:14:13.300261523 +0200
+--- a/src/squirrel/squtils.h
++++ b/src/squirrel/squtils.h
@@ -8,6 +8,9 @@
#define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size);
#define SQ_REALLOC(__ptr,__oldsize,__size) sq_vm_realloc(__ptr,__oldsize,__size);
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 1a0a0a952bf2..9d4f7eec6a20 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${P}-automake-1.13.patch
"${FILESDIR}"/${P}-freetype_pkgconfig.patch
"${FILESDIR}"/${P}-Wc++11-narrowing.patch
+ "${FILESDIR}"/${PN}-0.21.1-respect-AR.patch
)
src_prepare() {
@@ -49,6 +50,7 @@ src_prepare() {
sed -i \
-e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
src/scourgehandler.cpp || die
+
mv configure.{in,ac} || die
eautoreconf
}