| 1 |
commit: fc201596cf88eddb2806776719b42b884a737ff4 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 8 19:19:41 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 8 19:20:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc201596 |
| 7 |
|
| 8 |
games-roguelike/stone-soup: Add build fix for Perl 5.26 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
.../files/stone-soup-0.16.2-perl526.patch | 48 ++++++++++++++++++++++ |
| 13 |
.../stone-soup/stone-soup-0.16.2-r1.ebuild | 5 ++- |
| 14 |
2 files changed, 51 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..a450a635153 |
| 19 |
--- /dev/null |
| 20 |
+++ b/games-roguelike/stone-soup/files/stone-soup-0.16.2-perl526.patch |
| 21 |
@@ -0,0 +1,48 @@ |
| 22 |
+diff -ruN stone_soup-0.16.2.orig/source/util/gather_abilities stone_soup-0.16.2/source/util/gather_abilities |
| 23 |
+--- source.orig/util/gather_abilities 2015-08-10 03:32:30.000000000 +0200 |
| 24 |
++++ source/util/gather_abilities 2017-07-08 20:46:16.112231100 +0200 |
| 25 |
+@@ -5,7 +5,7 @@ |
| 26 |
+ $_ = <IN>; |
| 27 |
+ close IN; |
| 28 |
+ |
| 29 |
+-s/.*Ability_List\[\] =\n{\n(.*?)};.*/$1/s |
| 30 |
++s/.*Ability_List\[\] =\n\{\n(.*?)};.*/$1/s |
| 31 |
+ or die "Can't find Ability_List[] in ability.cc\n"; |
| 32 |
+ |
| 33 |
+ print join("\n", sort /ABIL_[A-Z0-9_]+\s*,\s*"([*-Za-z0-9 '-]+)"/sg), "\n"; |
| 34 |
+diff -ruN stone_soup-0.16.2.orig/source/util/gather_cards stone_soup-0.16.2/source/util/gather_cards |
| 35 |
+--- source.orig/util/gather_cards 2015-08-10 03:32:30.000000000 +0200 |
| 36 |
++++ source/util/gather_cards 2017-07-08 20:46:45.113232307 +0200 |
| 37 |
+@@ -5,7 +5,7 @@ |
| 38 |
+ $_ = <IN>; |
| 39 |
+ close IN; |
| 40 |
+ |
| 41 |
+-s/.*card_name\(card_type card\)\n{\n\s+switch(.*?)\n}\n.*/$1/s |
| 42 |
++s/.*card_name\(card_type card\)\n\{\n\s+switch(.*?)\n}\n.*/$1/s |
| 43 |
+ or die "Can't find card_name() in decks.cc\n"; |
| 44 |
+ |
| 45 |
+ @cards = map { /case CARD_[A-Z_]+:\s+return "([^"]+)";$/ ? ("$1") : () } split /\n/; |
| 46 |
+diff -ruN stone_soup-0.16.2.orig/source/util/gather_mons stone_soup-0.16.2/source/util/gather_mons |
| 47 |
+--- source.orig/util/gather_mons 2014-07-28 17:19:20.000000000 +0200 |
| 48 |
++++ source/util/gather_mons 2017-07-08 20:47:10.378233358 +0200 |
| 49 |
+@@ -99,7 +99,7 @@ |
| 50 |
+ open IN, "util/cpp_version spl-summoning.cc|" or die "Can't read spl-summoning.cc\n"; |
| 51 |
+ while (<IN>) |
| 52 |
+ { |
| 53 |
+- $mons{$1} = 1 if (/^ { MONS_[A-Z0-9_]+, "([A-Za-z0-9 ']+)" },$/); |
| 54 |
++ $mons{$1} = 1 if (/^ \{ MONS_[A-Z0-9_]+, "([A-Za-z0-9 ']+)" },$/); |
| 55 |
+ } |
| 56 |
+ close IN; |
| 57 |
+ } |
| 58 |
+diff -ruN stone_soup-0.16.2.orig/source/util/gen-mi-enum stone_soup-0.16.2/source/util/gen-mi-enum |
| 59 |
+--- source.orig/util/gen-mi-enum 2014-07-28 17:19:20.000000000 +0200 |
| 60 |
++++ source/util/gen-mi-enum 2017-07-08 20:47:28.491234111 +0200 |
| 61 |
+@@ -5,7 +5,7 @@ |
| 62 |
+ $_=<IN>; |
| 63 |
+ s/\r//g; |
| 64 |
+ |
| 65 |
+-s/^enum monster_info_flags\n{\n//m && s/^\s*NUM_MB_FLAGS.*//ms |
| 66 |
++s/^enum monster_info_flags\n\{\n//m && s/^\s*NUM_MB_FLAGS.*//ms |
| 67 |
+ or die "Can't find monster_info_flags in mon-info.h\n"; |
| 68 |
+ open OUT, ">mi-enum.h" or die "Can't create mi-enum.h\n"; |
| 69 |
+ print OUT "// Generated by gen-mi-enum, do not edit.\n\n"; |
| 70 |
|
| 71 |
diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild |
| 72 |
index 633aa546926..ceca0ef94f0 100644 |
| 73 |
--- a/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild |
| 74 |
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2016 Gentoo Foundation |
| 77 |
+# Copyright 1999-2017 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
## TODO |
| 81 |
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="manual" |
| 82 |
inherit eutils gnome2-utils toolchain-funcs |
| 83 |
|
| 84 |
MY_P="stone_soup-${PV}" |
| 85 |
-DESCRIPTION="Dungeon Crawl Stone Soup is a role-playing roguelike game of exploration and treasure-hunting in dungeons" |
| 86 |
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons" |
| 87 |
HOMEPAGE="http://crawl.develz.org/wordpress/" |
| 88 |
SRC_URI="https://crawl.develz.org/release/stone_soup-${PV}.tar.xz |
| 89 |
https://dev.gentoo.org/~hasufell/distfiles/${PN}.png |
| 90 |
@@ -57,6 +57,7 @@ S_TEST=${WORKDIR}/${MY_P}_test/source |
| 91 |
PATCHES=( |
| 92 |
"${FILESDIR}"/${P}-respect-flags-and-compiler.patch |
| 93 |
"${FILESDIR}"/${P}-Use-pkg-config-for-linking-to-ncurses.patch |
| 94 |
+ "${FILESDIR}"/${P}-perl526.patch |
| 95 |
) |
| 96 |
|
| 97 |
pkg_setup() { |
Archives
