summaryrefslogtreecommitdiff
path: root/bsd-games/patches/001-tetris.patch
diff options
context:
space:
mode:
authorDavid Kühling <dvdkhlng@gmx.de>2010-09-18 20:47:21 +0200
committerDavid Kühling <dvdkhlng@gmx.de>2010-09-18 20:47:21 +0200
commit4bfce3b6e2ea095ea3d9f5d2d1018cc0a1e5ce09 (patch)
tree58590463ada82a27eca0889312c32450358249a8 /bsd-games/patches/001-tetris.patch
downloadqipackages-fork-4bfce3b6e2ea095ea3d9f5d2d1018cc0a1e5ce09.tar.gz
Major overhaul and cleanup. Support for .ubi image file installations.grafted
Only compile&install a minimum host Gforth for bootstrapping the target Gforth, removing strange emacs-dependencies that cropped up earlier. Image file can now be built on the nanonote using 'gforth-update-image' command. Also, Gforth is now run through a wrapper that calls 'gforth-update-image' automatically, if necessary. Also first attempts at supporting libcc C-interface libraries pre-compiled on the host. Tested to compile on amd64 and i386.
Diffstat (limited to 'bsd-games/patches/001-tetris.patch')
-rw-r--r--bsd-games/patches/001-tetris.patch87
1 files changed, 87 insertions, 0 deletions
diff --git a/bsd-games/patches/001-tetris.patch b/bsd-games/patches/001-tetris.patch
new file mode 100644
index 0000000..a23bc16
--- /dev/null
+++ b/bsd-games/patches/001-tetris.patch
@@ -0,0 +1,87 @@
+diff -u bsd-games-2.17/tetris/input.c bsd-games-2.17-p/tetris/input.c
+--- bsd-games-2.17/tetris/input.c 2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/tetris/input.c 2010-07-26 22:04:34.422302192 +0400
+@@ -85,7 +85,7 @@
+ endtv = *tvp;
+ timeout = tvp->tv_sec * 1000 + tvp->tv_usec / 1000;
+ } else
+- timeout = INFTIM;
++ timeout = -1;
+ again:
+ set[0].fd = STDIN_FILENO;
+ set[0].events = POLLIN;
+diff -u bsd-games-2.17/tetris/pathnames.h.in bsd-games-2.17-p/tetris/pathnames.h.in
+--- bsd-games-2.17/tetris/pathnames.h.in 2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/tetris/pathnames.h.in 2010-07-27 11:42:20.386554141 +0400
+@@ -34,4 +34,4 @@
+ * @(#)pathnames.h 8.1 (Berkeley) 5/31/93
+ */
+
+-#define _PATH_SCOREFILE "@tetris_scorefile@"
++#define _PATH_SCOREFILE "/usr/share/games/tetris-bsd.scores"
+diff -u bsd-games-2.17/tetris/screen.c bsd-games-2.17-p/tetris/screen.c
+--- bsd-games-2.17/tetris/screen.c 2004-01-27 23:52:07.000000000 +0300
++++ bsd-games-2.17-p/tetris/screen.c 2010-07-26 22:04:34.422151495 +0400
+@@ -73,7 +73,7 @@
+ extern char PC, *BC, *UP; /* tgoto requires globals: ugh! */
+ static char BCdefault[] = "\b";
+ #ifndef NCURSES_VERSION
+-short ospeed;
++speed_t ospeed;
+ #endif
+
+ static char
+@@ -287,6 +287,7 @@
+ stop("tcgetattr() fails");
+ newtt = oldtt;
+ newtt.c_lflag &= ~(ICANON|ECHO);
++#define OXTABS XTABS
+ newtt.c_oflag &= ~OXTABS;
+ newtt.c_cc[VMIN] = 1;
+ newtt.c_cc[VTIME] = 0;
+diff -u bsd-games-2.17/tetris/shapes.c bsd-games-2.17-p/tetris/shapes.c
+--- bsd-games-2.17/tetris/shapes.c 2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/tetris/shapes.c 2010-07-27 09:30:41.267111585 +0400
+@@ -83,7 +83,7 @@
+ const struct shape *shape;
+ int pos;
+ {
+- int *o = shape->off;
++ const int *o = shape->off;
+
+ if (board[pos] || board[pos + *o++] || board[pos + *o++] ||
+ board[pos + *o])
+@@ -100,7 +100,7 @@
+ const struct shape *shape;
+ int pos, onoff;
+ {
+- int *o = shape->off;
++ const int *o = shape->off;
+
+ board[pos] = onoff;
+ board[pos + *o++] = onoff;
+diff -u bsd-games-2.17/tetris/tetris.c bsd-games-2.17-p/tetris/tetris.c
+--- bsd-games-2.17/tetris/tetris.c 2004-01-27 23:52:07.000000000 +0300
++++ bsd-games-2.17-p/tetris/tetris.c 2010-08-12 12:21:29.685301361 +0400
+@@ -35,10 +35,10 @@
+ */
+
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
+ The Regents of the University of California. All rights reserved.\n");
+-#endif /* not lint */
++#endif*/ /* not lint */
+
+ /*
+ * Tetris (or however it is spelled).
+@@ -145,7 +145,7 @@
+ exit(1);
+ close(fd);
+
+- keys = "jkl pq";
++ keys = "aks pq";
+
+ while ((ch = getopt(argc, argv, "k:l:ps")) != -1)
+ switch(ch) {