Attachment 229093 Details for Bug 259501 – patch to unbreak the typespeed port

[patch] patch to unbreak the typespeed port

typespeed-patches (text/plain), 2.17 KB, created by Martin Birgmeier on 2021-10-28 11:37:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Birgmeier

Created: 2021-10-28 11:37:15 UTC

Size: 2.17 KB

patch

obsolete

>diff --git a/games/typespeed/Makefile b/games/typespeed/Makefile
>index c92c2ba8c828..d0f6641fb971 100644
>--- a/games/typespeed/Makefile
>+++ b/games/typespeed/Makefile
>@@ -12,9 +12,6 @@ COMMENT=	Test your typing speed and get your fingers' CPS
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: now
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: now
>-
> USES=		ncurses
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-highscoredir="${SCOREDIR}"
>diff --git a/games/typespeed/files/patch-src-typespeed.c b/games/typespeed/files/patch-src-typespeed.c
>new file mode 100644
>index 000000000000..46710d027147
>--- /dev/null
>+++ b/games/typespeed/files/patch-src-typespeed.c
>@@ -0,0 +1,15 @@
>+--- ./src/typespeed.c.ORIG	2021-10-28 13:07:49.089834000 +0200
>++++ ./src/typespeed.c	2021-10-28 13:15:14.907409000 +0200
>+@@ -136,6 +136,12 @@
>+ #endif /* TEST */
>+ 
>+ /* globals */
>++struct finfo finfo;
>++struct stats now;
>++struct opt opt;
>++struct rules rules;
>++struct rawdata words;
>++
>+ char *rankki[11] =
>+ {"None", "Beginner", "Learner", "NoGood", "Average",
>+  "Good", "VeryGood", "Pro", "3l33t", "*(GOD)*", "Computer"};
>diff --git a/games/typespeed/files/patch-src-typespeed.h b/games/typespeed/files/patch-src-typespeed.h
>new file mode 100644
>index 000000000000..6431b0adde2c
>--- /dev/null
>+++ b/games/typespeed/files/patch-src-typespeed.h
>@@ -0,0 +1,47 @@
>+--- ./src/typespeed.h.ORIG	2008-08-13 16:36:51.000000000 +0200
>++++ ./src/typespeed.h	2021-10-28 13:14:52.935257000 +0200
>+@@ -44,6 +44,7 @@
>+ 	char descr[61];
>+ 	char name[MAXPATHLEN];
>+ };
>++extern struct finfo finfo;
>+ 
>+ struct stats {
>+ 	uint8_t level;
>+@@ -56,7 +57,8 @@
>+ 	clock_t duration;
>+ 	unsigned int sinit;
>+ 	char name[21];
>+-} now;
>++};
>++extern struct stats now;
>+ 
>+ struct opt {
>+ 	int cheat;
>+@@ -66,7 +68,8 @@
>+ 	int usecolors;
>+ 	char name[21];
>+ 	char order[3];
>+-} opt;
>++};
>++extern struct opt opt;
>+ 
>+ struct rules {
>+ 	int misses;
>+@@ -85,12 +88,13 @@
>+ 	int maxtime;
>+ 	char name[31];
>+ 	char fname[FILENAME_MAX + 1];
>+-} rules;
>++};
>++extern struct rules rules;
>+ 
>+ struct rawdata {
>+ 	char *bulk;
>+ 	char **word;
>+ 	size_t n;
>+ 	size_t max;
>+-} words;
>+-
>++};
>++extern struct rawdata words;

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 259501: 229093