commit: 77d57c5ed3841b20b1856cf1126fc8030152e651
Author: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail <DOT> com>
AuthorDate: Tue Mar 9 04:11:39 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 17:45:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d57c5e
games-roguelike/tome: update patches to work with -p1
Signed-off-by: Wolfgang E. Sanyer <ezzieyguywuf <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tome/files/2.3.5-gentoo-paths.patch | 12 +++++-----
games-roguelike/tome/files/tome-2.3.5-format.patch | 28 +++++++++++-----------
games-roguelike/tome/files/tome-2.3.5-noX.patch | 4 ++--
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/games-roguelike/tome/files/2.3.5-gentoo-paths.patch
b/games-roguelike/tome/files/2.3.5-gentoo-paths.patch
index d171a1cf540..b3ef7fd98e6 100644
--- a/games-roguelike/tome/files/2.3.5-gentoo-paths.patch
+++ b/games-roguelike/tome/files/2.3.5-gentoo-paths.patch
@@ -1,6 +1,6 @@
-diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
---- tome-225-src.orig/src/files.c 2004-01-14 11:17:02.423263360 -0500
-+++ tome-225-src/src/files.c 2004-01-14 11:17:50.074019344 -0500
+diff -rU 1 a/files.c b/files.c
+--- a/files.c 2004-01-14 11:17:02.423263360 -0500
++++ b/files.c 2004-01-14 11:17:50.074019344 -0500
@@ -5670,3 +5670,3 @@
/* Build the filename */
- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
@@ -21,9 +21,9 @@ diff -rU 1 tome-225-src.orig/src/files.c
tome-225-src/src/files.c
- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
+ sprintf(buf, "GENTOO_DIR/tome-scores.raw");
-diff -rU 1 tome-225-src.orig/src/init2.c tome-225-src/src/init2.c
---- tome-225-src.orig/src/init2.c 2004-01-14 11:17:02.473255760 -0500
-+++ tome-225-src/src/init2.c 2004-01-14 11:17:58.286770816 -0500
+diff -rU 1 a/init2.c b/init2.c
+--- a/init2.c 2004-01-14 11:17:02.473255760 -0500
++++ b/init2.c 2004-01-14 11:17:58.286770816 -0500
@@ -6686,3 +6686,3 @@
/* Build the filename */
- path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
diff --git a/games-roguelike/tome/files/tome-2.3.5-format.patch
b/games-roguelike/tome/files/tome-2.3.5-format.patch
index f3ce1cc96fa..90057b44d19 100644
--- a/games-roguelike/tome/files/tome-2.3.5-format.patch
+++ b/games-roguelike/tome/files/tome-2.3.5-format.patch
@@ -1,5 +1,5 @@
---- dungeon.c.old 2016-02-07 20:12:39.258150130 +0100
-+++ dungeon.c 2016-02-07 20:12:58.239805610 +0100
+--- a/dungeon.c 2016-02-07 20:12:39.258150130 +0100
++++ b/dungeon.c 2016-02-07 20:12:58.239805610 +0100
@@ -1489,7 +1489,7 @@
{
char buf[20];
@@ -9,8 +9,8 @@
cmsg_format(TERM_L_GREEN,
"Today it is %s of the %s year of the third age.",
get_month_name(bst(DAY, turn), wizard, FALSE), buf);
---- files.c.old 2016-02-07 20:15:07.736451417 +0100
-+++ files.c 2016-02-07 20:15:27.595089867 +0100
+--- a/files.c 2016-02-07 20:15:07.736451417 +0100
++++ b/files.c 2016-02-07 20:15:27.595089867 +0100
@@ -4856,7 +4856,7 @@
/* Terminate */
@@ -20,8 +20,8 @@
/* Require a "base" name */
if (!player_base[0]) strcpy(player_base, "PLAYER");
---- lua_bind.c.old 2016-02-07 20:09:29.071592178 +0100
-+++ lua_bind.c 2016-02-07 20:10:48.094164373 +0100
+--- a/lua_bind.c 2016-02-07 20:09:29.071592178 +0100
++++ b/lua_bind.c 2016-02-07 20:10:48.094164373 +0100
@@ -490,7 +490,7 @@
/* Files */
void lua_print_hook(cptr str)
@@ -31,8 +31,8 @@
}
---- plots.c.old 2016-02-07 20:11:35.389308152 +0100
-+++ plots.c 2016-02-07 20:12:19.247513152 +0100
+--- a/plots.c 2016-02-07 20:11:35.389308152 +0100
++++ b/plots.c 2016-02-07 20:12:19.247513152 +0100
@@ -93,7 +93,7 @@
{
MAKE(new, hooks_chain);
@@ -42,8 +42,8 @@
#ifdef DEBUG_HOOK
if (wizard) cmsg_format(TERM_VIOLET, "HOOK ADD: %s", name);
if (take_notes) add_note(format("HOOK ADD: %s", name), 'D');
---- spells1.c.old 2016-02-07 20:15:47.277731397 +0100
-+++ spells1.c 2016-02-07 20:16:03.373438169 +0100
+--- a/spells1.c 2016-02-07 20:15:47.277731397 +0100
++++ b/spells1.c 2016-02-07 20:16:03.373438169 +0100
@@ -7312,7 +7312,7 @@
if (who == -2)
@@ -53,8 +53,8 @@
}
/* Analyze the damage */
---- squeltch.c.old 2016-02-07 20:13:11.872558078 +0100
-+++ squeltch.c 2016-02-07 20:13:42.707997918 +0100
+--- a/squeltch.c 2016-02-07 20:13:11.872558078 +0100
++++ b/squeltch.c 2016-02-07 20:13:42.707997918 +0100
@@ -399,7 +399,7 @@
if (!max) continue;
@@ -64,8 +64,8 @@
if (input_box("New name?", hgt / 2, wid / 2,
name, 15))
{
exec_lua(format("auto_aux:rename_rule(%d, '%s')", sel, name));
---- util.c.old 2016-02-07 20:14:22.786269296 +0100
-+++ util.c 2016-02-07 20:16:44.227693551 +0100
+--- a/util.c 2016-02-07 20:14:22.786269296 +0100
++++ b/util.c 2016-02-07 20:16:44.227693551 +0100
@@ -4468,7 +4468,7 @@
{
char buf2[20];
diff --git a/games-roguelike/tome/files/tome-2.3.5-noX.patch
b/games-roguelike/tome/files/tome-2.3.5-noX.patch
index 5c5982fe730..b3830af50be 100644
--- a/games-roguelike/tome/files/tome-2.3.5-noX.patch
+++ b/games-roguelike/tome/files/tome-2.3.5-noX.patch
@@ -1,5 +1,5 @@
---- makefile.old 2012-05-28 14:02:44.787705444 +0200
-+++ makefile 2012-05-28 14:03:44.520524011 +0200
+--- a/makefile 2012-05-28 14:02:44.787705444 +0200
++++ b/makefile 2012-05-28 14:03:44.520524011 +0200
@@ -458,7 +458,7 @@
$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
