summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Strogin <steils@gentoo.org>2020-01-25 13:36:59 +0200
committerStefan Strogin <steils@gentoo.org>2020-01-25 13:41:45 +0200
commit7f96879d0ec152ef151d0555d68be3d7c8641a19 (patch)
tree28482dfeaade1231ee77db6388eb458f20f6e2a0 /games-roguelike/nethack/files
parentgames-roguelike/nethack: fix patch description (diff)
downloadgentoo-7f96879d0ec152ef151d0555d68be3d7c8641a19.tar.gz
gentoo-7f96879d0ec152ef151d0555d68be3d7c8641a19.tar.bz2
gentoo-7f96879d0ec152ef151d0555d68be3d7c8641a19.zip
games-roguelike/nethack: drop old 3.6.0-r3
Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Stefan Strogin <steils@gentoo.org>
Diffstat (limited to 'games-roguelike/nethack/files')
-rw-r--r--games-roguelike/nethack/files/nethack-3.6.0-recover.patch110
-rw-r--r--games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch186
2 files changed, 0 insertions, 296 deletions
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-recover.patch b/games-roguelike/nethack/files/nethack-3.6.0-recover.patch
deleted file mode 100644
index c7e8ab3dca08..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-recover.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From c15cf56e61c908ce756d698a8afa3064030761b3 Mon Sep 17 00:00:00 2001
-From: Luis Ressel <aranea@aixah.de>
-Date: Fri, 18 Dec 2015 23:16:56 +0100
-Subject: [PATCH] doc: Rename recover to recover-nethack
-
----
- doc/recover.6 | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/doc/recover.6 b/doc/recover.6
-index 4c9f509..edd05e3 100644
---- a/doc/recover.6
-+++ b/doc/recover.6
-@@ -1,10 +1,10 @@
--.TH RECOVER 6 "9 January 1993"
-+.TH RECOVER-NETHACK 6 "9 January 1993"
- .\" NetHack 3.6 recover.6 $NHDT-Date: 1432512786 2015/05/25 00:13:06 $ $NHDT-Branch: master $:$NHDT-Revision: 1.6 $
- .UC 4
- .SH NAME
--recover \- recover a NetHack game interrupted by disaster
-+recover-nethack \- recover a NetHack game interrupted by disaster
- .SH SYNOPSIS
--.B recover
-+.B recover-nethack
- [
- .B \-d
- .I directory
-@@ -22,7 +22,7 @@ so such games can be recovered at the point of the last level change.
- The
- .I base
- options tell
--.I recover
-+.I recover-nethack
- which files to process.
- Each base option specifies recovery of a separate game.
- .PP
-@@ -72,47 +72,47 @@ by a user number to avoid conflicts,
- or "xlock" if the number of concurrent players is being limited.
- It may be necessary to look in the playground to find the correct
- base name of the interrupted game.
--.I recover
-+.I recover-nethack
- will transform these level files into a save file of the same name as
- .I nethack
- would have used.
- .PP
- Since
--.I recover
-+.I recover-nethack
- must be able to read and delete files from the playground
- and create files in the save directory,
- it has interesting interactions with game security.
- Giving ordinary players access to
--.I recover
-+.I recover-nethack
- through setuid or setgid is tantamount to leaving the playground
- world-writable,
- with respect to both cheating and messing up other players.
- For a single-user system, this of course does not change anything,
- so some of the microcomputer ports install
--.I recover
-+.I recover-nethack
- by default.
- .PP
- For a multi-user system,
- the game administrator may want to arrange for all .0 files in the
--playground to be fed to recover when the host machine boots,
-+playground to be fed to recover-nethack when the host machine boots,
- and handle game crashes individually.
- If the user population is sufficiently trustworthy,
--.I recover
-+.I recover-nethack
- can be installed with the same permissions the
- .I nethack
- executable has.
- In either case,
--.I recover
-+.I recover-nethack
- is easily compiled from the distribution utility directory.
- .SH NOTES
- .PP
- Like
- .I nethack
- itself,
--.I recover
-+.I recover-nethack
- will overwrite existing savefiles of the same name.
- Savefiles created by
--.I recover
-+.I recover-nethack
- are uncompressed;
- they may be compressed afterwards if desired,
- but even a compression-using
-@@ -122,11 +122,11 @@ will find them in the uncompressed form.
- nethack(6)
- .SH BUGS
- .PP
--.I recover
-+.I recover-nethack
- makes no attempt to find out if a base name specifies a game in progress.
- If multiple machines share a playground, this would be impossible to
- determine.
- .PP
--.I recover
-+.I recover-nethack
- should be taught to use the nethack playground locking mechanism to
- avoid conflicts.
---
-2.6.4
-
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch b/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch
deleted file mode 100644
index d34ca029d51a..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From f92bf2b495450d323e157eb41130c79a3d369239 Mon Sep 17 00:00:00 2001
-From: PatR <rankin@nethack.org>
-Date: Mon, 8 Feb 2016 19:01:26 -0800
-Subject: [PATCH] fix #H4237 - color ignored for X11 text map
-
-Color was only being tracked for locations that had the pile of
-objects flag set. And hilite_pile made a monster on a pile take
-on the color of the top object of the pile.
-
-This restores the tracking of color for the whole map, and makes
-highlighted piles be drawn in inverse like highligted pets. The
-drawing routine doesn't know the difference (but could tell, if
-necessary, by testing whether the glyph is an object or a monster).
-
-Also, variables 'inbuf', 'inptr', and 'incount' were global; limit
-their scope to winmap.c.
----
- win/X11/winmap.c | 68 +++++++++++++++++++++++++++-----------------------------
- 1 file changed, 33 insertions(+), 35 deletions(-)
-
-diff --git a/win/X11/winmap.c b/win/X11/winmap.c
-index 93f5dd6..523e13d 100644
---- a/win/X11/winmap.c
-+++ b/win/X11/winmap.c
-@@ -102,6 +102,7 @@ int bkglyph UNUSED;
- int color, och;
- unsigned special;
- #ifdef TEXTCOLOR
-+ int colordif;
- register unsigned char *co_ptr;
- #endif
-
-@@ -116,24 +117,22 @@ int bkglyph UNUSED;
-
- /* Only update if we need to. */
- ch_ptr = &map_info->text_map.text[y][x];
--
--#ifdef TEXTCOLOR
-- co_ptr = &map_info->text_map.colors[y][x];
-- if (*ch_ptr != ch || *co_ptr != color)
--#else
-- if (*ch_ptr != ch)
--#endif
-- {
-+ if (*ch_ptr != ch) {
- *ch_ptr = ch;
-+ if (!map_info->is_tile)
-+ update_bbox = TRUE;
-+ }
- #ifdef TEXTCOLOR
-- if ((special & MG_PET) && iflags.hilite_pet)
-- color += CLR_MAX;
-- if ((special & MG_OBJPILE) && iflags.hilite_pile)
-- *co_ptr = color;
--#endif
-+ co_ptr = &map_info->text_map.colors[y][x];
-+ colordif = (((special & MG_PET) && iflags.hilite_pet)
-+ || ((special & MG_OBJPILE) && iflags.hilite_pile))
-+ ? CLR_MAX : 0;
-+ if (*co_ptr != (uchar) (color + colordif)) {
-+ *co_ptr = (uchar) (color + colordif);
- if (!map_info->is_tile)
- update_bbox = TRUE;
- }
-+#endif
- }
-
- if (update_bbox) { /* update row bbox */
-@@ -844,7 +843,8 @@ Font font;
- set_color_gc(CLR_BRIGHT_CYAN, XtNbright_cyan);
- set_color_gc(CLR_WHITE, XtNwhite);
- #else
-- set_gc(wp->w, font, XtNforeground, bgpixel, &map_info->text_map.copy_gc,
-+ set_gc(wp->w, font, XtNforeground, bgpixel,
-+ &map_info->text_map.copy_gc,
- &map_info->text_map.inv_copy_gc);
- #endif
- }
-@@ -943,17 +943,17 @@ struct xwindow *wp;
-
- map_all_stone(map_info);
- (void) memset((genericptr_t) map_info->text_map.text, ' ',
-- sizeof(map_info->text_map.text));
-+ sizeof map_info->text_map.text);
- #ifdef TEXTCOLOR
- (void) memset((genericptr_t) map_info->text_map.colors, NO_COLOR,
-- sizeof(map_info->text_map.colors));
-+ sizeof map_info->text_map.colors);
- #endif
-
- /* force a full update */
- (void) memset((genericptr_t) map_info->t_start, (char) 0,
-- sizeof(map_info->t_start));
-+ sizeof map_info->t_start);
- (void) memset((genericptr_t) map_info->t_stop, (char) COLNO - 1,
-- sizeof(map_info->t_stop));
-+ sizeof map_info->t_stop);
- display_map_window(wp);
- }
-
-@@ -978,8 +978,8 @@ struct xwindow *wp;
- #ifdef VERBOSE
- printf("Font information:\n");
- printf("fid = %ld, direction = %d\n", fs->fid, fs->direction);
-- printf("first = %d, last = %d\n", fs->min_char_or_byte2,
-- fs->max_char_or_byte2);
-+ printf("first = %d, last = %d\n",
-+ fs->min_char_or_byte2, fs->max_char_or_byte2);
- printf("all chars exist? %s\n", fs->all_chars_exist ? "yes" : "no");
- printf("min_bounds:lb=%d rb=%d width=%d asc=%d des=%d attr=%d\n",
- fs->min_bounds.lbearing, fs->min_bounds.rbearing,
-@@ -990,8 +990,8 @@ struct xwindow *wp;
- fs->max_bounds.width, fs->max_bounds.ascent,
- fs->max_bounds.descent, fs->max_bounds.attributes);
- printf("per_char = 0x%lx\n", (unsigned long) fs->per_char);
-- printf("Text: (max) width = %d, height = %d\n", text_map->square_width,
-- text_map->square_height);
-+ printf("Text: (max) width = %d, height = %d\n",
-+ text_map->square_width, text_map->square_height);
- #endif
-
- if (fs->min_bounds.width != fs->max_bounds.width)
-@@ -1002,9 +1002,9 @@ struct xwindow *wp;
- * keyhit buffer
- */
- #define INBUF_SIZE 64
--int inbuf[INBUF_SIZE];
--int incount = 0;
--int inptr = 0; /* points to valid data */
-+static int inbuf[INBUF_SIZE];
-+static int incount = 0;
-+static int inptr = 0; /* points to valid data */
-
- /*
- * Keyboard and button event handler for map window.
-@@ -1249,8 +1249,8 @@ boolean inverted;
- }
-
- #ifdef VERBOSE_UPDATE
-- printf("update: [0x%x] %d %d %d %d\n", (int) wp->w, start_row, stop_row,
-- start_col, stop_col);
-+ printf("update: [0x%x] %d %d %d %d\n",
-+ (int) wp->w, start_row, stop_row, start_col, stop_col);
- #endif
- win_start_row = start_row;
- win_start_col = start_col;
-@@ -1273,8 +1273,8 @@ boolean inverted;
- src_y = (tile / TILES_PER_ROW) * tile_height;
- XCopyArea(dpy, tile_pixmap, XtWindow(wp->w),
- tile_map->black_gc, /* no grapics_expose */
-- src_x, src_y, tile_width, tile_height, dest_x,
-- dest_y);
-+ src_x, src_y, tile_width, tile_height,
-+ dest_x, dest_y);
-
- if (glyph_is_pet(glyph) && iflags.hilite_pet) {
- /* draw pet annotation (a heart) */
-@@ -1412,10 +1412,8 @@ Dimension cols, rows;
- }
-
- num_args = 0;
-- XtSetArg(args[num_args], XtNwidth, wp->pixel_width);
-- num_args++;
-- XtSetArg(args[num_args], XtNheight, wp->pixel_height);
-- num_args++;
-+ XtSetArg(args[num_args], XtNwidth, wp->pixel_width); num_args++;
-+ XtSetArg(args[num_args], XtNheight, wp->pixel_height); num_args++;
- XtSetValues(wp->w, args, num_args);
- }
-
-@@ -1426,10 +1424,10 @@ struct xwindow *wp;
- struct map_info_t *map_info = wp->map_information;
- struct text_map_info_t *text_map = &map_info->text_map;
-
-- (void) memset((genericptr_t) text_map->text, ' ', sizeof(text_map->text));
-+ (void) memset((genericptr_t) text_map->text, ' ', sizeof text_map->text);
- #ifdef TEXTCOLOR
- (void) memset((genericptr_t) text_map->colors, NO_COLOR,
-- sizeof(text_map->colors));
-+ sizeof text_map->colors);
- #endif
-
- get_char_info(wp);
---
-2.7.1
-