| 1 |
commit: 171f402a800c754265908b078cd95cb72ab424e4 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 26 22:07:25 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 26 22:07:25 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=171f402a |
| 7 |
|
| 8 |
games-board/xgammon: Clean up patches |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
games-board/xgammon/files/gcc33.patch | 59 -------------------- |
| 14 |
.../xgammon/files/xgammon-0.98-broken.patch | 63 +++++++++++++++++++++- |
| 15 |
games-board/xgammon/xgammon-0.98-r1.ebuild | 1 - |
| 16 |
3 files changed, 61 insertions(+), 62 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-board/xgammon/files/gcc33.patch b/games-board/xgammon/files/gcc33.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 093eaa1f453..00000000000 |
| 21 |
--- a/games-board/xgammon/files/gcc33.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,59 +0,0 @@ |
| 24 |
---- a/xgammon.c |
| 25 |
-+++ b/xgammon.c |
| 26 |
-@@ -944,31 +944,31 @@ |
| 27 |
- for (option=1; option<argc; option++) { |
| 28 |
- if (strcmp (argv[option], "-?") == 0 || |
| 29 |
- strcmp (argv[option], "-help") == 0) { |
| 30 |
--puts ("xgammon [-otherdisplay (display)] |
| 31 |
-- [-boardgeometry (string)] |
| 32 |
-- [-boardcolor (color)] [-bc (color)] |
| 33 |
-- [-darkcolor (color)] [-dc (color)] |
| 34 |
-- [-lightcolor (color)] [-lc (color)] |
| 35 |
-- [-barcolor (color)] [-b (color)] |
| 36 |
-- [-whitecolor (color)] the stone color for \"white\" |
| 37 |
-- [-blackcolor (color)] the stone color for \"black\" |
| 38 |
-- [-doublerfont (font)] sets the (big) font for the doubler dice |
| 39 |
-- [-doubling +doubling] sets if you wish the computer to double |
| 40 |
-- [-h (black|white)] set the color for the human player |
| 41 |
-- (implies a human versus computer game) |
| 42 |
-- [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either |
| 43 |
-- human vs. human computer vs. computer |
| 44 |
-- or human vs. computer (default) |
| 45 |
-- [-winat (points)] play a tournament up to \"points\" points |
| 46 |
-- [-watchmove +wachmove] if you wish to see the flying stones |
| 47 |
-- [-buttonmove +buttonmove] set stones by simply pressing button |
| 48 |
-- [-autoplay +autoplay] automatic play when only one move |
| 49 |
-- is possible |
| 50 |
-- [-stonesteps (number)] sets the stepsize the stones fly |
| 51 |
-- in pixel (implies +watchmove) |
| 52 |
-- [-delaytime (tsec.)] sets the time the cumputer waits |
| 53 |
-- after each turn (implies -watchmove) |
| 54 |
-- [-?] [-help] print this string"); |
| 55 |
-+puts ("xgammon [-otherdisplay (display)]\n" |
| 56 |
-+" [-boardgeometry (string)]\n" |
| 57 |
-+" [-boardcolor (color)] [-bc (color)]\n" |
| 58 |
-+" [-darkcolor (color)] [-dc (color)]\n" |
| 59 |
-+" [-lightcolor (color)] [-lc (color)]\n" |
| 60 |
-+" [-barcolor (color)] [-b (color)]\n" |
| 61 |
-+" [-whitecolor (color)] the stone color for \"white\"\n" |
| 62 |
-+" [-blackcolor (color)] the stone color for \"black\"\n" |
| 63 |
-+" [-doublerfont (font)] sets the (big) font for the doubler dice\n" |
| 64 |
-+" [-doubling +doubling] sets if you wish the computer to double\n" |
| 65 |
-+" [-h (black|white)] set the color for the human player\n" |
| 66 |
-+" (implies a human versus computer game)\n" |
| 67 |
-+" [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n" |
| 68 |
-+" human vs. human computer vs. computer\n" |
| 69 |
-+" or human vs. computer (default)\n" |
| 70 |
-+" [-winat (points)] play a tournament up to \"points\" points\n" |
| 71 |
-+" [-watchmove +wachmove] if you wish to see the flying stones\n" |
| 72 |
-+" [-buttonmove +buttonmove] set stones by simply pressing button\n" |
| 73 |
-+" [-autoplay +autoplay] automatic play when only one move\n" |
| 74 |
-+" is possible\n" |
| 75 |
-+" [-stonesteps (number)] sets the stepsize the stones fly\n" |
| 76 |
-+" in pixel (implies +watchmove)\n" |
| 77 |
-+" [-delaytime (tsec.)] sets the time the cumputer waits\n" |
| 78 |
-+" after each turn (implies -watchmove)\n" |
| 79 |
-+" [-?] [-help] print this string"); |
| 80 |
- exit (0); |
| 81 |
- } else { |
| 82 |
- fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]); |
| 83 |
|
| 84 |
diff --git a/games-board/xgammon/files/xgammon-0.98-broken.patch b/games-board/xgammon/files/xgammon-0.98-broken.patch |
| 85 |
index 5e334e83aec..eff5bf509e5 100644 |
| 86 |
--- a/games-board/xgammon/files/xgammon-0.98-broken.patch |
| 87 |
+++ b/games-board/xgammon/files/xgammon-0.98-broken.patch |
| 88 |
@@ -1,7 +1,7 @@ |
| 89 |
--- a/lib/db.c |
| 90 |
+++ b/lib/db.c |
| 91 |
-@@ -259,10 +259,11 @@ |
| 92 |
- close(fid); |
| 93 |
+@@ -267,10 +267,11 @@ |
| 94 |
+ fclose(fid); |
| 95 |
} |
| 96 |
|
| 97 |
-void main() |
| 98 |
@@ -13,3 +13,62 @@ |
| 99 |
set_V_Werte(); |
| 100 |
+ return(0); |
| 101 |
} |
| 102 |
+--- a/xgammon.c |
| 103 |
++++ b/xgammon.c |
| 104 |
+@@ -944,31 +944,31 @@ |
| 105 |
+ for (option=1; option<argc; option++) { |
| 106 |
+ if (strcmp (argv[option], "-?") == 0 || |
| 107 |
+ strcmp (argv[option], "-help") == 0) { |
| 108 |
+-puts ("xgammon [-otherdisplay (display)] |
| 109 |
+- [-boardgeometry (string)] |
| 110 |
+- [-boardcolor (color)] [-bc (color)] |
| 111 |
+- [-darkcolor (color)] [-dc (color)] |
| 112 |
+- [-lightcolor (color)] [-lc (color)] |
| 113 |
+- [-barcolor (color)] [-b (color)] |
| 114 |
+- [-whitecolor (color)] the stone color for \"white\" |
| 115 |
+- [-blackcolor (color)] the stone color for \"black\" |
| 116 |
+- [-doublerfont (font)] sets the (big) font for the doubler dice |
| 117 |
+- [-doubling +doubling] sets if you wish the computer to double |
| 118 |
+- [-h (black|white)] set the color for the human player |
| 119 |
+- (implies a human versus computer game) |
| 120 |
+- [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either |
| 121 |
+- human vs. human computer vs. computer |
| 122 |
+- or human vs. computer (default) |
| 123 |
+- [-winat (points)] play a tournament up to \"points\" points |
| 124 |
+- [-watchmove +wachmove] if you wish to see the flying stones |
| 125 |
+- [-buttonmove +buttonmove] set stones by simply pressing button |
| 126 |
+- [-autoplay +autoplay] automatic play when only one move |
| 127 |
+- is possible |
| 128 |
+- [-stonesteps (number)] sets the stepsize the stones fly |
| 129 |
+- in pixel (implies +watchmove) |
| 130 |
+- [-delaytime (tsec.)] sets the time the cumputer waits |
| 131 |
+- after each turn (implies -watchmove) |
| 132 |
+- [-?] [-help] print this string"); |
| 133 |
++puts ("xgammon [-otherdisplay (display)]\n" |
| 134 |
++" [-boardgeometry (string)]\n" |
| 135 |
++" [-boardcolor (color)] [-bc (color)]\n" |
| 136 |
++" [-darkcolor (color)] [-dc (color)]\n" |
| 137 |
++" [-lightcolor (color)] [-lc (color)]\n" |
| 138 |
++" [-barcolor (color)] [-b (color)]\n" |
| 139 |
++" [-whitecolor (color)] the stone color for \"white\"\n" |
| 140 |
++" [-blackcolor (color)] the stone color for \"black\"\n" |
| 141 |
++" [-doublerfont (font)] sets the (big) font for the doubler dice\n" |
| 142 |
++" [-doubling +doubling] sets if you wish the computer to double\n" |
| 143 |
++" [-h (black|white)] set the color for the human player\n" |
| 144 |
++" (implies a human versus computer game)\n" |
| 145 |
++" [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n" |
| 146 |
++" human vs. human computer vs. computer\n" |
| 147 |
++" or human vs. computer (default)\n" |
| 148 |
++" [-winat (points)] play a tournament up to \"points\" points\n" |
| 149 |
++" [-watchmove +wachmove] if you wish to see the flying stones\n" |
| 150 |
++" [-buttonmove +buttonmove] set stones by simply pressing button\n" |
| 151 |
++" [-autoplay +autoplay] automatic play when only one move\n" |
| 152 |
++" is possible\n" |
| 153 |
++" [-stonesteps (number)] sets the stepsize the stones fly\n" |
| 154 |
++" in pixel (implies +watchmove)\n" |
| 155 |
++" [-delaytime (tsec.)] sets the time the cumputer waits\n" |
| 156 |
++" after each turn (implies -watchmove)\n" |
| 157 |
++" [-?] [-help] print this string"); |
| 158 |
+ exit (0); |
| 159 |
+ } else { |
| 160 |
+ fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]); |
| 161 |
|
| 162 |
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild |
| 163 |
index 330e8ff486f..9e8b8fb2d55 100644 |
| 164 |
--- a/games-board/xgammon/xgammon-0.98-r1.ebuild |
| 165 |
+++ b/games-board/xgammon/xgammon-0.98-r1.ebuild |
| 166 |
@@ -27,7 +27,6 @@ S="${WORKDIR}/${P}a" |
| 167 |
PATCHES=( |
| 168 |
"${FILESDIR}"/${P}-broken.patch |
| 169 |
"${FILESDIR}"/${P}-config.patch |
| 170 |
- "${FILESDIR}"/gcc33.patch |
| 171 |
"${FILESDIR}"/${P}-glibc-2.32.patch |
| 172 |
"${FILESDIR}"/${P}-fno-common.patch |
| 173 |
) |
Archives