gentoo resync : 02.09.2020

4 files changed, 177 insertions, 61 deletions

diff --git a/games-board/xgammon/files/gcc33.patch b/games-board/xgammon/files/gcc33.patch
deleted file mode 100644
index 093eaa1f453b..000000000000
--- a/games-board/xgammon/files/gcc33.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/xgammon.c
-+++ b/xgammon.c
-@@ -944,31 +944,31 @@
- 	for (option=1; option<argc; option++) {
- 		if (strcmp (argv[option], "-?") == 0 ||
- 		    strcmp (argv[option], "-help") == 0) {
--puts ("xgammon [-otherdisplay (display)]
--        [-boardgeometry (string)]
--        [-boardcolor (color)] [-bc (color)]
--        [-darkcolor  (color)] [-dc (color)]
--        [-lightcolor (color)] [-lc (color)]
--        [-barcolor   (color)] [-b  (color)]
--        [-whitecolor (color)]        the stone color for \"white\"
--        [-blackcolor (color)]        the stone color for \"black\"
--        [-doublerfont (font)]        sets the (big) font for the doubler dice
--        [-doubling   +doubling]      sets if you wish the computer to double
--        [-h (black|white)]           set the color for the human player
--                                     (implies a human versus computer game)
--        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either
--                                     human vs. human computer vs. computer
--                                     or human vs. computer (default)
--        [-winat      (points)]       play a tournament up to \"points\" points
--        [-watchmove  +wachmove]      if you wish to see the flying stones
--        [-buttonmove +buttonmove]    set stones by simply pressing button
--        [-autoplay   +autoplay]      automatic play when only one move
--                                     is possible
--        [-stonesteps (number)]       sets the stepsize the stones fly
--                                     in pixel (implies +watchmove)
--        [-delaytime (tsec.)]         sets the time the cumputer waits
--                                     after each turn (implies -watchmove)
--        [-?] [-help]                 print this string");
-+puts ("xgammon [-otherdisplay (display)]\n"
-+"        [-boardgeometry (string)]\n"
-+"        [-boardcolor (color)] [-bc (color)]\n"
-+"        [-darkcolor  (color)] [-dc (color)]\n"
-+"        [-lightcolor (color)] [-lc (color)]\n"
-+"        [-barcolor   (color)] [-b  (color)]\n"
-+"        [-whitecolor (color)]        the stone color for \"white\"\n"
-+"        [-blackcolor (color)]        the stone color for \"black\"\n"
-+"        [-doublerfont (font)]        sets the (big) font for the doubler dice\n"
-+"        [-doubling   +doubling]      sets if you wish the computer to double\n"
-+"        [-h (black|white)]           set the color for the human player\n"
-+"                                     (implies a human versus computer game)\n"
-+"        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n"
-+"                                     human vs. human computer vs. computer\n"
-+"                                     or human vs. computer (default)\n"
-+"        [-winat      (points)]       play a tournament up to \"points\" points\n"
-+"        [-watchmove  +wachmove]      if you wish to see the flying stones\n"
-+"        [-buttonmove +buttonmove]    set stones by simply pressing button\n"
-+"        [-autoplay   +autoplay]      automatic play when only one move\n"
-+"                                     is possible\n"
-+"        [-stonesteps (number)]       sets the stepsize the stones fly\n"
-+"                                     in pixel (implies +watchmove)\n"
-+"        [-delaytime (tsec.)]         sets the time the cumputer waits\n"
-+"                                     after each turn (implies -watchmove)\n"
-+"        [-?] [-help]                 print this string");
- 		exit (0);
- 		} else {
- 			fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]);
diff --git a/games-board/xgammon/files/xgammon-0.98-broken.patch b/games-board/xgammon/files/xgammon-0.98-broken.patch
index 5e334e83aecb..eff5bf509e53 100644
--- a/games-board/xgammon/files/xgammon-0.98-broken.patch
+++ b/games-board/xgammon/files/xgammon-0.98-broken.patch
@@ -1,7 +1,7 @@
 --- a/lib/db.c
 +++ b/lib/db.c
-@@ -259,10 +259,11 @@
-     close(fid);
+@@ -267,10 +267,11 @@
+     fclose(fid);
  }
  
 -void main()
@@ -13,3 +13,62 @@
      set_V_Werte();
 +    return(0);
  }
+--- a/xgammon.c
++++ b/xgammon.c
+@@ -944,31 +944,31 @@
+ 	for (option=1; option<argc; option++) {
+ 		if (strcmp (argv[option], "-?") == 0 ||
+ 		    strcmp (argv[option], "-help") == 0) {
+-puts ("xgammon [-otherdisplay (display)]
+-        [-boardgeometry (string)]
+-        [-boardcolor (color)] [-bc (color)]
+-        [-darkcolor  (color)] [-dc (color)]
+-        [-lightcolor (color)] [-lc (color)]
+-        [-barcolor   (color)] [-b  (color)]
+-        [-whitecolor (color)]        the stone color for \"white\"
+-        [-blackcolor (color)]        the stone color for \"black\"
+-        [-doublerfont (font)]        sets the (big) font for the doubler dice
+-        [-doubling   +doubling]      sets if you wish the computer to double
+-        [-h (black|white)]           set the color for the human player
+-                                     (implies a human versus computer game)
+-        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either
+-                                     human vs. human computer vs. computer
+-                                     or human vs. computer (default)
+-        [-winat      (points)]       play a tournament up to \"points\" points
+-        [-watchmove  +wachmove]      if you wish to see the flying stones
+-        [-buttonmove +buttonmove]    set stones by simply pressing button
+-        [-autoplay   +autoplay]      automatic play when only one move
+-                                     is possible
+-        [-stonesteps (number)]       sets the stepsize the stones fly
+-                                     in pixel (implies +watchmove)
+-        [-delaytime (tsec.)]         sets the time the cumputer waits
+-                                     after each turn (implies -watchmove)
+-        [-?] [-help]                 print this string");
++puts ("xgammon [-otherdisplay (display)]\n"
++"        [-boardgeometry (string)]\n"
++"        [-boardcolor (color)] [-bc (color)]\n"
++"        [-darkcolor  (color)] [-dc (color)]\n"
++"        [-lightcolor (color)] [-lc (color)]\n"
++"        [-barcolor   (color)] [-b  (color)]\n"
++"        [-whitecolor (color)]        the stone color for \"white\"\n"
++"        [-blackcolor (color)]        the stone color for \"black\"\n"
++"        [-doublerfont (font)]        sets the (big) font for the doubler dice\n"
++"        [-doubling   +doubling]      sets if you wish the computer to double\n"
++"        [-h (black|white)]           set the color for the human player\n"
++"                                     (implies a human versus computer game)\n"
++"        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n"
++"                                     human vs. human computer vs. computer\n"
++"                                     or human vs. computer (default)\n"
++"        [-winat      (points)]       play a tournament up to \"points\" points\n"
++"        [-watchmove  +wachmove]      if you wish to see the flying stones\n"
++"        [-buttonmove +buttonmove]    set stones by simply pressing button\n"
++"        [-autoplay   +autoplay]      automatic play when only one move\n"
++"                                     is possible\n"
++"        [-stonesteps (number)]       sets the stepsize the stones fly\n"
++"                                     in pixel (implies +watchmove)\n"
++"        [-delaytime (tsec.)]         sets the time the cumputer waits\n"
++"                                     after each turn (implies -watchmove)\n"
++"        [-?] [-help]                 print this string");
+ 		exit (0);
+ 		} else {
+ 			fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]);
diff --git a/games-board/xgammon/files/xgammon-0.98-fno-common.patch b/games-board/xgammon/files/xgammon-0.98-fno-common.patch
new file mode 100644
index 000000000000..924f0e549c07
--- /dev/null
+++ b/games-board/xgammon/files/xgammon-0.98-fno-common.patch
@@ -0,0 +1,97 @@
+--- a/allow.c
++++ b/allow.c
+@@ -34,6 +34,8 @@
+ MOVE	     current_move[4] = {{0, 0}, {0, 0},
+ 			        {0, 0}, {0, 0}}; /* global only for un_do() */
+ 
++MOVE possible_moves[8000], *list;
++
+ int  test_move             (void);
+ int  create_possible_moves (int dice_to_set, int *w, int actual_pin);
+ int  move_is_allowed       (int from_pin, int to_pin);
+--- a/gammon.h
++++ b/gammon.h
+@@ -117,12 +117,14 @@
+ 	MoveFunc MoveFunction;
+ 	BOARD board;
+ 	X11SET X11Set;
+-} Player[2];
++};
++extern struct _Player Player[2];
+ 
+ struct  _PinTable {
+         int count;
+         int color;
+-} Pin[29], rollout_position[29];	/* 0, 25 = bar, 1 - 24 = board and 26, 27 finished[color] */
++};
++extern struct _PinTable Pin[29], rollout_position[29];	/* 0, 25 = bar, 1 - 24 = board and 26, 27 finished[color] */
+ 
+ 
+ /* if you have the dice values 1 and 1 and all stones are on different
+@@ -137,7 +139,7 @@
+         int to;
+ } MOVE;
+ 
+-MOVE possible_moves[8000], *list;
++extern MOVE possible_moves[8000], *list;
+ 
+ struct _move_hist {
+ 	int	    from [4];
+@@ -151,16 +153,17 @@
+ struct _Tournament {
+ 	unsigned int   game_number;
+ 	unsigned int   winning_point;
+-} tournament;
++};
++extern struct _Tournament tournament;
+ 
+ struct _RolloutSave {
+ 	int turn;
+ 	int doubler_value;
+ 	int doubler_owner;
+ 	int roll[2];
+-} rollout_save;
++};
+ 
+-FILE *endgame_database;
++extern FILE *endgame_database;
+ 
+ extern void switch_turn();
+ 
+--- a/rollout.c
++++ b/rollout.c
+@@ -48,6 +48,9 @@
+ void   rollout_roll_dice  ();
+ void   exec_rollout       ();
+ 
++struct _PinTable Pin[29], rollout_position[29];
++struct _RolloutSave rollout_save;
++
+ void RollOut (void)
+ {
+ 	Widget toplevel = Player[0].X11Set.toplevel;
+--- a/xgammon.c
++++ b/xgammon.c
+@@ -178,6 +178,10 @@
+ MOVE		*compi_choice;
+ 
+ FILE*		protokol_file = NULL;
++FILE*       endgame_database;
++struct _gammon_resource gammon_resource;
++struct _Tournament tournament;
++struct _Player Player[2];
+ 
+ char * greetings = "Wellcome to xgammon  version 0.98\n   (C) 1994   Lambert Klasen   Detlef Steuer\n    We hope you enjoy it\n\n";
+ 
+--- a/xgammon.h
++++ b/xgammon.h
+@@ -70,7 +70,8 @@
+ 	char	*server;
+ 	int     port;
+ 	int     button_move;
+-} gammon_resource;
++};
++extern struct _gammon_resource gammon_resource;
+ 
+ /* diawin.c */
+ extern void AppendDialogText ();
diff --git a/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch
new file mode 100644
index 000000000000..538f873b4132
--- /dev/null
+++ b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch
@@ -0,0 +1,19 @@
+--- a/save.c
++++ b/save.c
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+ #include <X11/Intrinsic.h>
+ 
+@@ -142,7 +143,7 @@
+ 	fclose(save_file);
+ 
+ #ifndef AIX
+-	fprintf (stderr, "xgammon: %s.  Sorry and bye!\n", sys_siglist[n]);
++	fprintf (stderr, "xgammon: %s.  Sorry and bye!\n", strsignal(n));
+ #else
+ 	fprintf (stderr, "xgammon: Caught signal %d.   Sorry and bye!\n", n);
+ #endif