Attachment 240592 Details for Bug 269944 – 0001-irc-simpleirc-Update-to-1.3v2.patch

[patch] 0001-irc-simpleirc-Update-to-1.3v2.patch

0001-misc-dvorak7min-Update-to-1.6.1-repack-v2.patch (text/plain), 8.25 KB, created by Clockwork on 2023-03-05 09:09:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clockwork

Created: 2023-03-05 09:09:34 UTC

Size: 8.25 KB

patch

obsolete

>From 1fb2ec87adf0871402f1a5897b128ce005fba206 Mon Sep 17 00:00:00 2001
>From: Clockwork6400 <Clockwork6400@protonmail.com>
>Date: Sun, 5 Mar 2023 10:59:10 +0200
>Subject: [PATCH] misc/dvorak7min: Update to 1.6.1+repack v2
>
>---
> misc/dvorak7min/Makefile                 |  6 +-
> misc/dvorak7min/distinfo                 |  5 +-
> misc/dvorak7min/files/patch-dvorak7min.c | 81 ------------------------
> misc/dvorak7min/files/patch-lessons.c    | 66 -------------------
> 4 files changed, 6 insertions(+), 152 deletions(-)
> delete mode 100644 misc/dvorak7min/files/patch-dvorak7min.c
> delete mode 100644 misc/dvorak7min/files/patch-lessons.c
>
>diff --git a/misc/dvorak7min/Makefile b/misc/dvorak7min/Makefile
>index 0c12c5effd30..a0a3beb3f3d5 100644
>--- a/misc/dvorak7min/Makefile
>+++ b/misc/dvorak7min/Makefile
>@@ -1,12 +1,12 @@
> PORTNAME=	dvorak7min
> PORTVERSION=	1.6.1
>-DISTVERSIONSUFFIX=%2Brepack
>+DISTVERSIONSUFFIX=	+repack
> PORTREVISION=	1
> CATEGORIES=	misc
> MASTER_SITES=	DEBIAN
> DISTNAME=	${PORTNAME}_${DISTVERSION}${DISTVERSIONSUFFIX}.orig
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	Clockwork6400@protonmail.com
> COMMENT=	Ncurses-based Dvorak typing tutor
> WWW=		https://packages.qa.debian.org/d/dvorak7min.html
> 
>@@ -14,8 +14,8 @@ LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		ncurses
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>diff --git a/misc/dvorak7min/distinfo b/misc/dvorak7min/distinfo
>index b1fa2fa4b5da..d011954f773f 100644
>--- a/misc/dvorak7min/distinfo
>+++ b/misc/dvorak7min/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (dvorak7min_1.6.1%2Brepack.orig.tar.gz) = 4cdef8e4c8c74c28dacd185d1062bfa752a58447772627aded9ac0c87a3b8797
>-SIZE (dvorak7min_1.6.1%2Brepack.orig.tar.gz) = 25503
>+TIMESTAMP = 1677858807
>+SHA256 (dvorak7min_1.6.1+repack.orig.tar.gz) = 4cdef8e4c8c74c28dacd185d1062bfa752a58447772627aded9ac0c87a3b8797
>+SIZE (dvorak7min_1.6.1+repack.orig.tar.gz) = 25503
>diff --git a/misc/dvorak7min/files/patch-dvorak7min.c b/misc/dvorak7min/files/patch-dvorak7min.c
>deleted file mode 100644
>index 0f4766fea9dd..000000000000
>--- a/misc/dvorak7min/files/patch-dvorak7min.c
>+++ /dev/null
>@@ -1,81 +0,0 @@
>---- dvorak7min.c.orig	Mon Mar 15 20:41:06 2004
>-+++ dvorak7min.c	Mon Mar 15 20:41:25 2004
>-@@ -41,7 +41,6 @@
>-  *  
>-  */
>- 
>--#include <strings.h>
>- #include <string.h>
>- #include <stdlib.h>
>- #include <ctype.h>
>-@@ -173,7 +172,8 @@
>- /* calculate typing speed in a given interval */
>- inline float calcSpeed (time_t timeStart, time_t timeFinish, int hits)
>- {
>--    return (float) hits / (timeFinish - timeStart);
>-+    // Use WPS/WPM as better standard, so also divide by 5 
>-+    return (float) hits / 5 / (timeFinish - timeStart);
>- }
>- 
>- 
>-@@ -193,7 +193,7 @@
>-    
>-    file = fopen (fileName, "r");
>-    if (!file) {
>--      postmortem = sys_errlist[errno];
>-+      postmortem = strerror(errno);
>-       return -1;
>-    }
>-    
>-@@ -220,7 +220,7 @@
>-    while (1) {
>-       c = fgetc (file);
>-       if (errno) {
>--	 postmortem = sys_errlist[errno];
>-+	 postmortem = strerror(errno);
>- 	 fclose (file);
>- 	 return -1;
>-       }
>-@@ -418,6 +418,7 @@
>- 	  ++p;
>- 	  if (!timeStart) {
>- 	     timeStart = time(0);
>-+	     hits = 0;
>- 	  }
>-        }
>-        
>-@@ -431,8 +432,9 @@
>- 	     float ratio = hits - misses;
>- 	     ratio = (ratio < 0) ? 0 : (100.0 * ratio / hits);
>- 	     timeCurrent = time(0);
>--	     speed = calcSpeed (timeStart, timeCurrent, hits);
>--	     mvprintw (LINES - 1, 0, "CPS %.2f  CPM %.2f Hits: %d Misses: %d Seconds: %d Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio);
>-+	     speed = calcSpeed (timeStart, timeCurrent, hits + misses);
>-+	     // Use WPS/WPM as better standards
>-+	     mvprintw (LINES - 1, 0, "WPS %.2f  WPM %.2f Hits: %d Misses: %d Seconds: %d Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio);
>- 	     clrtoeol();
>- 	  }
>-        } while (ch == ERR);
>-@@ -510,7 +512,7 @@
>-     }
>- 
>-     timeFinish = time(0);
>--    speed = calcSpeed(timeStart, timeFinish, hits);
>-+    speed = calcSpeed(timeStart, timeFinish, hits + misses);
>-     clear();
>-     cbreak();
>-     if (!timeStart) {
>-@@ -519,8 +521,11 @@
>-        float ratio = hits - misses;
>-        ratio = (ratio < 0) ? 0 : (100.0 * ratio / hits);
>-        mvprintw (0, 0, "Elapsed time: %d seconds", timeFinish - timeStart);
>--       mvprintw (1, 0, "Total: %d  Misses: %d  Ratio: %.2f%%", hits, misses, ratio);
>--       mvprintw (2, 0, "CPS: %.2f  CPM: %.2f", speed, speed * 60);
>-+       mvprintw (1, 0, "Total: %d  Misses: %d  Ratio: %.2f%%",
>-+                 hits + misses, misses,
>-+		 (float)100*(hits) / (hits + misses));
>-+       // Use WPM/WPS as better standard
>-+       mvprintw (2, 0, "WPS: %.2f  WPM: %.2f", speed, speed * 60);
>-     }
>-    
>-    mvprintw (4, 0, "[ ] Press ESCAPE to continue.");
>diff --git a/misc/dvorak7min/files/patch-lessons.c b/misc/dvorak7min/files/patch-lessons.c
>deleted file mode 100644
>index 58fed4588658..000000000000
>--- a/misc/dvorak7min/files/patch-lessons.c
>+++ /dev/null
>@@ -1,66 +0,0 @@
>---- lessons.c.orig
>-+++ lessons.c
>-@@ -166,6 +166,7 @@
>- "gggg pppp gggg pppp gggg pppp gggg pppp gggg pppp gggg pppp gggg ppp\n"
>- "pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg pg\n"
>- "gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp gp\n"
>-+"\x1"
>- "gggg hhhh pppp uuuu gggg hhhh pppp uuuu gggg hhhh pppp uuuu\n"
>- "up up up up hug hug hug hug pug pug pug pug pup pup pup pup\n"
>- "ugh ugh ugh ugh Hugh Hugh Hugh Hugh Pugh Pugh Pugh Pugh",
>-@@ -263,7 +264,7 @@
>- "The catchup accident at the picnic depicted Dutch as an apathetic nuisance.\n"
>- "It is no coincidence that this idiotic sentence has eight concise Cs in it.\n"
>- "The enthusiastic duchess noticed the Pontiac coupe...and decided to chase it."
>--"\1"
>-+"\x1"
>- "I detect a headache...I hope it is not the\n"
>- "Schnapps and Cocoa I had as a nightcap.\n"
>- "\n"
>-@@ -362,11 +363,12 @@
>- "Allegra, an unparalleled intellectual, calculated the celestial latitudes and\n"
>- "longitudes in her sleep.",
>- 
>--    "YF: index fingers streching up",
>-+    "YF: index fingers stretching up",
>- "\x2"   
>- "ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy\n"
>- "ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy ffff yyyy\n"
>- "fy fy fy fy fy fy fy yf yf yf yf yf yf yf ffff gggg hhhh yyyy pppp uuuu\n"
>-+"\x1"
>- "guy guy guy guy guy guy guy guy guy gyp gyp gyp gyp gyp gyp gyp gyp gyp\n"
>- "UHF UHF UHF UHF UHF UHF UHF UHF UHF yuh yuh yuh yuh yuh yuh yuh yuh yuh\n"
>- "huff huff huff huff huff huff huff puff puff puff puff puff puff puff\n"
>-@@ -406,6 +408,7 @@
>- "kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm\n"
>- "kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm kkkk mmmm\n"
>- "km km km km km km km km km km mk mk mk mk mk mk mk mk mk mk\n"
>-+"\x1"
>- "hhhh kkkk mmmm uuuu hhhh kkkk mmmm uuuu hhhh kkkk mmmm uuuu\n"
>- "ku ku ku ku ku ku ku ku ku ku mu mu mu mu mu mu mu mu mu mu\n"
>- "UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK UK\n"
>-@@ -442,6 +445,7 @@
>- "jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww\n"
>- "jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww jjjj wwww\n"
>- "jw jw jw jw jw jw jw jw jw jw jw wj wj wj wj wj wj wj wj wj\n"
>-+"\x1"
>- "eeee jjjj tttt wwww eeee jjjj tttt wwww eeee jjjj tttt wwww\n"
>- "ewe ewe ewe ewe ewe jet jet jet jet jet Jew Jew Jew Jew Jew\n"
>- "wee wee wee wee wee wee wee wet wet wet wet wet wet wet wet\n"
>-@@ -500,6 +504,7 @@
>- "An acquisitive mind helped Pavlov evolve his theories.\n"
>- "QVC's involvement with Paramount may give it new verve.\n"
>- "Vivian's new Volvo unequivocally vanquished her fears of driving.\n"
>-+"\x1"
>- "According to Pravda, Vladivostok was a quiet village in its Soviet days.\n"
>- "This unique, opaque liquor does not quench your thirst, it makes you queasy.\n"
>- "David's vivid imagination and his inquisitive and inventive mind suggest a high IQ."
>-@@ -548,7 +553,7 @@
>- "activity; several lizards hazarded the freezing waters and capsized the fish\n"
>- "tanks; a dozen grizzlies were waltzing in the plaza.",
>- 
>--    "XB: index fingers streching down",
>-+    "XB: index fingers stretching down",
>- "\x2"   
>- "bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx\n"
>- "bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx bbbb xxxx\n"
>-- 
>2.39.2
>

Flags:

Clockwork6400: maintainer-approval+

Actions: View | Diff

Attachments on bug 269944: 240564 | 240592 | 240593