pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/games/nudoku



Module Name:    pkgsrc
Committed By:   ktnb
Date:           Sun May  5 14:31:32 UTC 2024

Modified Files:
        pkgsrc/games/nudoku: Makefile PLIST distinfo
        pkgsrc/games/nudoku/patches: patch-src_main.c

Log Message:
nudoku: update to 4.0.0

Packaging changes:
Remove FAKE_NCURSES and add ncursesw because ncursesw is now required
and leaving FAKE_NCURSES enabled causes an issue with the alternate
character set (acs_map specifically).

Upstream changes:
3.0.0 -> 4.0.0
- Add Turkish translation
- Add undo feature

2.1.0 -> 3.0.0
- Fix build failure with ncurses 6.3
- Add call to PKG_PROG_PKG_CONFIG and pkg-check ncurses libs
- Fix build with musl
- Add highlighting of user input
- Fix toggling marks removing solution


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/nudoku/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/nudoku/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/nudoku/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/nudoku/patches/patch-src_main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/nudoku/Makefile
diff -u pkgsrc/games/nudoku/Makefile:1.7 pkgsrc/games/nudoku/Makefile:1.8
--- pkgsrc/games/nudoku/Makefile:1.7    Mon Jun 27 15:29:15 2022
+++ pkgsrc/games/nudoku/Makefile        Sun May  5 14:31:31 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/06/27 15:29:15 fcambus Exp $
+# $NetBSD: Makefile,v 1.8 2024/05/05 14:31:31 ktnb Exp $
 
-DISTNAME=      nudoku-2.1.0
+DISTNAME=      nudoku-4.0.0
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jubalh/}
 
@@ -23,11 +23,10 @@ USE_TOOLS+=         pkg-config
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
 
-FAKE_NCURSES=          yes
-
 pre-configure:
        cd ${WRKSRC} && autoreconf -i
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/nudoku/PLIST
diff -u pkgsrc/games/nudoku/PLIST:1.2 pkgsrc/games/nudoku/PLIST:1.3
--- pkgsrc/games/nudoku/PLIST:1.2       Tue Nov 24 21:00:02 2020
+++ pkgsrc/games/nudoku/PLIST   Sun May  5 14:31:31 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/11/24 21:00:02 fcambus Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/05/05 14:31:31 ktnb Exp $
 bin/nudoku
 man/man6/nudoku.6
 share/locale/de/LC_MESSAGES/nudoku.mo
@@ -6,3 +6,4 @@ share/locale/es/LC_MESSAGES/nudoku.mo
 share/locale/fr/LC_MESSAGES/nudoku.mo
 share/locale/ja/LC_MESSAGES/nudoku.mo
 share/locale/ru/LC_MESSAGES/nudoku.mo
+share/locale/tr/LC_MESSAGES/nudoku.mo

Index: pkgsrc/games/nudoku/distinfo
diff -u pkgsrc/games/nudoku/distinfo:1.4 pkgsrc/games/nudoku/distinfo:1.5
--- pkgsrc/games/nudoku/distinfo:1.4    Tue Oct 26 10:44:17 2021
+++ pkgsrc/games/nudoku/distinfo        Sun May  5 14:31:31 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:44:17 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/05/05 14:31:31 ktnb Exp $
 
-BLAKE2s (nudoku-2.1.0.tar.gz) = a327d3baf97a82693a86eb1b3ca6b99b09ab594ea3fc9e9c13e9c510824d31ca
-SHA512 (nudoku-2.1.0.tar.gz) = dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
-Size (nudoku-2.1.0.tar.gz) = 31592 bytes
-SHA1 (patch-src_main.c) = 3e8d32d3830c839727fda4bb74a4c6346553efa9
+BLAKE2s (nudoku-4.0.0.tar.gz) = d4f6fb487457cb71e4aad6a548a5378ee10b4890ee54ec469ab511da23a49db7
+SHA512 (nudoku-4.0.0.tar.gz) = 809af4b235e2fc84dbab846188b00517e594d24798a573a72b33a3d7845d20762b8e56e8ea3cf6c300432188e0d15060c2d02908a31e38c41e7b58ea7b057e2c
+Size (nudoku-4.0.0.tar.gz) = 32748 bytes
+SHA1 (patch-src_main.c) = b31c65451946649e794d0cf580ad4a8f95bdcbf7

Index: pkgsrc/games/nudoku/patches/patch-src_main.c
diff -u pkgsrc/games/nudoku/patches/patch-src_main.c:1.1 pkgsrc/games/nudoku/patches/patch-src_main.c:1.2
--- pkgsrc/games/nudoku/patches/patch-src_main.c:1.1    Mon Mar 16 12:59:02 2020
+++ pkgsrc/games/nudoku/patches/patch-src_main.c        Sun May  5 14:31:32 2024
@@ -1,35 +1,24 @@
-$NetBSD: patch-src_main.c,v 1.1 2020/03/16 12:59:02 fcambus Exp $
+$NetBSD: patch-src_main.c,v 1.2 2024/05/05 14:31:32 ktnb Exp $
 
-- Add missing <locale.h> header, for setlocale.
-- Use wgetch(grid) instead of getch(), otherwise wmove() doesn't
-  move the cursor in the grid window.
+Fixed upstream bug where variable was defined without braces in
+switch. Reported upstream: https://github.com/jubalh/nudoku/issues/61
 
---- src/main.c.orig    2019-07-30 09:50:49.000000000 +0000
+--- src/main.c.orig    2024-05-05 01:37:03.380017435 +0000
 +++ src/main.c
-@@ -19,7 +19,8 @@ along with this program. If not, see <ht
- */
- 
- /* INCLUDES */
--#include "gettext.h"                  /* gettext */
-+#include <libintl.h>                  /* gettext */
-+#include <locale.h>                           /* setlocale */
- #include <stdlib.h>                           /* rand, srand */
- #include <unistd.h>                           /* getopt */
- #include <ncurses.h>                  /* ncurses */
-@@ -294,6 +295,7 @@ static void init_windows(void)
-       status = newwin(STATUS_LINES, STATUS_COLS, STATUS_Y, STATUS_X);
- 
-       grid = newwin(GRID_LINES, GRID_COLS, GRID_Y, GRID_X);
-+      keypad(grid, true);
-       _draw_grid();
- 
-       infobox = newwin(INFO_LINES, INFO_COLS, INFO_Y, INFO_X);
-@@ -497,7 +499,7 @@ int main(int argc, char *argv[])
- #endif // DEBUG
-               refresh();
-               wrefresh(grid);
--              key = getch();
-+              key = wgetch(grid);
-               // clear status window
-               werase(status);
-               switch(key)
+@@ -708,6 +708,7 @@ int main(int argc, char *argv[])
+                               }
+                               break;
+                       case 'u': // Undo
++                      {
+                               move_t old_move;
+                               if (undo_stack_pop(&old_move))
+                               {       // Stack empty
+@@ -720,7 +721,7 @@ int main(int argc, char *argv[])
+                               user_board[posy*9+posx] = old_move.prev_val;
+                               fill_grid(user_board, plain_board, x, y);
+                               break;
+-
++                      }
+                       default:
+                               break;
+               }



Home | Main Index | Thread Index | Old Index