commit: 34995edad0c954187760e28c488f1d99c1cc1954 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Nov 26 16:14:12 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Nov 26 17:59:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34995eda
games-misc/bsd-games: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/2919 .../bsd-games/files/bsd-games-2.17-64bit.patch | 43 ----- .../bsd-games/files/bsd-games-2.17-gcc43.patch | 16 -- .../bsd-games/files/bsd-games-2.17-glibc2.10.patch | 185 --------------------- 3 files changed, 244 deletions(-) diff --git a/games-misc/bsd-games/files/bsd-games-2.17-64bit.patch b/games-misc/bsd-games/files/bsd-games-2.17-64bit.patch deleted file mode 100644 index a56ea84..00000000 --- a/games-misc/bsd-games/files/bsd-games-2.17-64bit.patch +++ /dev/null @@ -1,43 +0,0 @@ -David Leverton writes about adventure/crc.c: - -The 'adventure' game from the games-misc/bsd-games-2.13 package crashes -when saving the game on AMD64 (and probably other 64-bit systems, but I -haven't checked). Find attached to fix this. - -http://bugs.gentoo.org/show_bug.cgi?id=77032 - - -About utmpentry.c: - -the utmpx structure defines the ut_tv member a little differently on -64bit hosts so that a 32bit and 64bit structure can be shared. So the -ut_tv is a custom 32bit structure rather than the native 64bit timeval -structure. Work around is to assign the submembers instead. - -http://bugs.gentoo.org/show_bug.cgi?id=102667 - ---- bsd-games/adventure/crc.c -+++ bsd-games/adventure/crc.c -@@ -134,7 +134,8 @@ - if (step >= sizeof(crctab) / sizeof(crctab[0])) - step = 0; - } -- crcval = (crcval << 8) ^ crctab[i]; -+ /* Mask to 32 bits. */ -+ crcval = ((crcval << 8) ^ crctab[i]) & 0xffffffff; - } -- return crcval & 0xffffffff; /* Mask to 32 bits. */ -+ return crcval; - } ---- bsd-games/dm/utmpentry.c -+++ bsd-games/dm/utmpentry.c -@@ -291,7 +291,8 @@ - e->line[sizeof(e->line) - 1] = '\0'; - (void)strncpy(e->host, up->ut_host, sizeof(up->ut_host)); - e->name[sizeof(e->host) - 1] = '\0'; -- e->tv = up->ut_tv; -+ e->tv.tv_sec = up->ut_tv.tv_sec; -+ e->tv.tv_usec = up->ut_tv.tv_usec; - adjust_size(e); - } - #endif diff --git a/games-misc/bsd-games/files/bsd-games-2.17-gcc43.patch b/games-misc/bsd-games/files/bsd-games-2.17-gcc43.patch deleted file mode 100644 index 8009454..00000000 --- a/games-misc/bsd-games/files/bsd-games-2.17-gcc43.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- dab/gamescreen.h.orig -+++ dab/gamescreen.h -@@ -70,9 +70,9 @@ - virtual void redraw(void) = 0; // Refresh - virtual int getinput(void) = 0; // Get user input - virtual void bell(void) = 0; // Beep -- virtual void score(size_t p, const PLAYER& p) = 0; // Post current score -- virtual void games(size_t p, const PLAYER& p) = 0; // Post games won -- virtual void total(size_t p, const PLAYER& p) = 0; // Post total score -+ virtual void score(size_t s, const PLAYER& p) = 0; // Post current score -+ virtual void games(size_t s, const PLAYER& p) = 0; // Post games won -+ virtual void total(size_t s, const PLAYER& p) = 0; // Post total score - virtual void ties(const PLAYER& p) = 0; // Post tie games - }; - - diff --git a/games-misc/bsd-games/files/bsd-games-2.17-glibc2.10.patch b/games-misc/bsd-games/files/bsd-games-2.17-glibc2.10.patch deleted file mode 100644 index 2efdc57..00000000 --- a/games-misc/bsd-games/files/bsd-games-2.17-glibc2.10.patch +++ /dev/null @@ -1,185 +0,0 @@ ---- boggle/boggle/bog.c -+++ boggle/boggle/bog.c -@@ -336,7 +336,7 @@ - } - - while (1) { -- if (getline(buf) == NULL) { -+ if (get_line(buf) == NULL) { - if (feof(stdin)) - clearerr(stdin); - break; ---- boggle/boggle/extern.h -+++ boggle/boggle/extern.h -@@ -43,7 +43,7 @@ - long dictseek(FILE *, long, int); - void findword(void); - void flushin(FILE *); --char *getline(char *); -+char *get_line(char *); - void getword(char *); - int help(void); - int inputch(void); ---- boggle/boggle/mach.c -+++ boggle/boggle/mach.c -@@ -168,7 +168,7 @@ - * - doesn't accept words longer than MAXWORDLEN or containing caps - */ - char * --getline(q) -+get_line(q) - char *q; - { - int ch, done; ---- cribbage/cribbage.h -+++ cribbage/cribbage.h -@@ -77,7 +77,7 @@ - int fifteens(const CARD [], int); - void game(void); - void gamescore(void); --char *getline(void); -+char *get_line(void); - int getuchar(void); - int incard(CARD *); - int infrom(const CARD [], int, const char *); ---- cribbage/crib.c -+++ cribbage/crib.c -@@ -221,7 +221,7 @@ - if (!rflag) { /* player cuts deck */ - msg(quiet ? "Cut for crib? " : - "Cut to see whose crib it is -- low card wins? "); -- getline(); -+ get_line(); - } - i = (rand() >> 4) % CARDS; /* random cut */ - do { /* comp cuts deck */ -@@ -397,7 +397,7 @@ - if (!rflag) { /* random cut */ - msg(quiet ? "Cut the deck? " : - "How many cards down do you wish to cut the deck? "); -- getline(); -+ get_line(); - } - i = (rand() >> 4) % (CARDS - pos); - turnover = deck[i + pos]; ---- cribbage/io.c -+++ cribbage/io.c -@@ -245,7 +245,7 @@ - - retval = FALSE; - rnk = sut = EMPTY; -- if (!(line = getline())) -+ if (!(line = get_line())) - goto gotit; - p = p1 = line; - while (*p1 != ' ' && *p1 != '\0') -@@ -346,7 +346,7 @@ - - for (sum = 0;;) { - msg(prompt); -- if (!(p = getline()) || *p == '\0') { -+ if (!(p = get_line()) || *p == '\0') { - msg(quiet ? "Not a number" : - "That doesn't look like a number"); - continue; -@@ -528,12 +528,12 @@ - } - - /* -- * getline: -+ * get_line: - * Reads the next line up to '\n' or EOF. Multiple spaces are - * compressed to one space; a space is inserted before a ',' - */ - char * --getline() -+get_line() - { - char *sp; - int c, oy, ox; ---- gomoku/bdisp.c -+++ gomoku/bdisp.c -@@ -241,7 +241,7 @@ - } - - int --getline(buf, size) -+get_line(buf, size) - char *buf; - int size; - { ---- gomoku/gomoku.h -+++ gomoku/gomoku.h -@@ -263,7 +263,7 @@ - - void bdinit(struct spotstr *); - void init_overlap(void); --int getline(char *, int); -+int get_line(char *, int); - void ask(const char *); - void dislog(const char *); - void bdump(FILE *); ---- gomoku/main.c -+++ gomoku/main.c -@@ -155,7 +155,7 @@ - if (inputfp == NULL && test == 0) { - for (;;) { - ask("black or white? "); -- getline(buf, sizeof(buf)); -+ get_line(buf, sizeof(buf)); - if (buf[0] == 'b' || buf[0] == 'B') { - color = BLACK; - break; -@@ -172,7 +172,7 @@ - } - } else { - setbuf(stdout, 0); -- getline(buf, sizeof(buf)); -+ get_line(buf, sizeof(buf)); - if (strcmp(buf, "black") == 0) - color = BLACK; - else if (strcmp(buf, "white") == 0) -@@ -244,7 +244,7 @@ - getinput: - if (interactive) - ask("move? "); -- if (!getline(buf, sizeof(buf))) { -+ if (!get_line(buf, sizeof(buf))) { - curmove = RESIGN; - break; - } -@@ -256,7 +256,7 @@ - FILE *fp; - - ask("save file name? "); -- (void)getline(buf, sizeof(buf)); -+ (void)get_line(buf, sizeof(buf)); - if ((fp = fopen(buf, "w")) == NULL) { - glog("cannot create save file"); - goto getinput; -@@ -309,14 +309,14 @@ - if (i != RESIGN) { - replay: - ask("replay? "); -- if (getline(buf, sizeof(buf)) && -+ if (get_line(buf, sizeof(buf)) && - (buf[0] == 'y' || buf[0] == 'Y')) - goto again; - if (strcmp(buf, "save") == 0) { - FILE *fp; - - ask("save file name? "); -- (void)getline(buf, sizeof(buf)); -+ (void)get_line(buf, sizeof(buf)); - if ((fp = fopen(buf, "w")) == NULL) { - glog("cannot create save file"); - goto replay; -@@ -367,7 +367,7 @@ - quit(); - top: - ask("cmd? "); -- if (!getline(fmtbuf, sizeof(fmtbuf))) -+ if (!get_line(fmtbuf, sizeof(fmtbuf))) - quit(); - switch (*fmtbuf) { - case '\0':
