Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/galaxis/files/
Date: Sat, 03 Dec 2016 11:38:14
Message-Id: 1480765063.381747db98cec767815af49b6ee3745cbb0530fe.chewi@gentoo
1 commit: 381747db98cec767815af49b6ee3745cbb0530fe
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Nov 26 18:17:13 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 3 11:37:43 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381747db
7
8 games-puzzle/galaxis: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/2920
11
12 .../galaxis/files/galaxis-1.7-gentoo.patch | 83 ----------------------
13 1 file changed, 83 deletions(-)
14
15 diff --git a/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch b/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch
16 deleted file mode 100644
17 index 3153291..00000000
18 --- a/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch
19 +++ /dev/null
20 @@ -1,83 +0,0 @@
21 -diff -ru galaxis-1.7.orig/Makefile galaxis-1.7/Makefile
22 ---- galaxis-1.7.orig/Makefile 2003-12-29 04:09:53.000000000 -0500
23 -+++ galaxis-1.7/Makefile 2010-10-18 13:08:43.929375025 -0400
24 -@@ -3,9 +3,8 @@
25 - VERS=$(shell sed <galaxis.spec -n -e '/Version: \(.*\)/s//\1/p')
26 -
27 - # Flags for use with the Linux ncurses package (recommended)
28 --CFLAGS = -g -DNDEBUG # -I/usr/local/include -L/usr/local/lib
29 -+CFLAGS += -DNDEBUG # -I/usr/local/include -L/usr/local/lib
30 - TERMLIB = -lncurses
31 --CC = gcc
32 -
33 - # Flags for use with stock curses
34 - #CFLAGS = -DNDEBUG
35 -@@ -13,7 +12,7 @@
36 - #CC = gcc
37 -
38 - galaxis: galaxis.c
39 -- $(CC) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
40 -+ $(CC) $(LDFLAGS) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
41 -
42 - galaxis.6: galaxis.xml
43 - xmlto man galaxis.xml
44 -diff -ru galaxis-1.7.orig/galaxis.c galaxis-1.7/galaxis.c
45 ---- galaxis-1.7.orig/galaxis.c 2003-12-26 23:19:20.000000000 -0500
46 -+++ galaxis-1.7/galaxis.c 2010-10-18 13:10:03.575307583 -0400
47 -@@ -8,6 +8,10 @@
48 - #define _POSIX_SOURCE
49 -
50 - #include <stdio.h>
51 -+#include <stdlib.h>
52 -+#include <unistd.h>
53 -+#include <time.h>
54 -+#include <string.h>
55 - #include <termios.h>
56 - #include <curses.h>
57 - #include <signal.h>
58 -@@ -29,7 +33,6 @@
59 - extern long lrand48();
60 - extern void srand48();
61 - #define bzero(s, n) (void)memset((char *)(s), '\0', n)
62 --extern char *memset();
63 - /*
64 - * Try this if ungetch() fails to resolve.
65 - *
66 -@@ -167,16 +170,17 @@
67 - }
68 -
69 - /* VARARGS1 */
70 --static void prompt(f, s)
71 -+static void prompt(s)
72 - /* print a message at the prompt line */
73 --char *f, *s;
74 -+char *s;
75 - {
76 - (void) move(PROMPTLINE, 0);
77 - (void) clrtoeol();
78 -- (void) printw(f, s);
79 -+ (void) printw("%s", s);
80 - (void) refresh();
81 - }
82 -
83 -+#if 0
84 - static void error(s)
85 - char *s;
86 - {
87 -@@ -188,6 +192,7 @@
88 - (void) beep();
89 - }
90 - }
91 -+#endif
92 -
93 - static int rnd(n)
94 - int n;
95 -@@ -647,7 +652,7 @@
96 - }
97 - }
98 -
99 --main(argc, argv)
100 -+int main(argc, argv)
101 - int argc;
102 - char *argv[];
103 - {