Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nudoku for openSUSE:Factory checked in at 2023-12-21 23:39:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nudoku (Old) and /work/SRC/openSUSE:Factory/.nudoku.new.1840 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nudoku" Thu Dec 21 23:39:10 2023 rev:7 rq:1134426 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nudoku/nudoku.changes 2020-11-23 10:36:51.969780598 +0100 +++ /work/SRC/openSUSE:Factory/.nudoku.new.1840/nudoku.changes 2023-12-21 23:39:24.620283236 +0100 @@ -1,0 +2,10 @@ +Thu Dec 21 10:46:48 UTC 2023 - Michael Vetter <[email protected]> + +- Update to 3.0.0: + * Fix build failure with ncurses 6.3 + * Add call to PKG_PROG_PKG_CONFIG and pkg-check ncurses libs #46 + * Fix build with musl + * Add highlighting of user input #56 + * Fix toggling marks removing solution #51 + +------------------------------------------------------------------- Old: ---- nudoku-2.1.0.tar.gz New: ---- nudoku-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nudoku.spec ++++++ --- /var/tmp/diff_new_pack.Rms5QE/_old 2023-12-21 23:39:25.052299012 +0100 +++ /var/tmp/diff_new_pack.Rms5QE/_new 2023-12-21 23:39:25.056299158 +0100 @@ -1,7 +1,7 @@ # # spec file for package nudoku # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: nudoku -Version: 2.1.0 +Version: 3.0.0 Release: 0 Summary: Ncurses based sudoku game License: GPL-3.0-only @@ -42,7 +42,7 @@ %build autoreconf -fi %configure --enable-cairo -make %{?_smp_mflags} +%make_build %install %make_install ++++++ nudoku-2.1.0.tar.gz -> nudoku-3.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nudoku-2.1.0/.github/workflows/c-cpp.yml new/nudoku-3.0.0/.github/workflows/c-cpp.yml --- old/nudoku-2.1.0/.github/workflows/c-cpp.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/nudoku-3.0.0/.github/workflows/c-cpp.yml 2023-12-21 11:44:39.000000000 +0100 @@ -0,0 +1,23 @@ +name: C/C++ CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v3 + - name: install dependencies + run: sudo apt-get -y install autoconf autopoint build-essential pkg-config gettext + - name: autoreconf + run: autoreconf -i + - name: configure + run: ./configure + - name: make + run: make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nudoku-2.1.0/ChangeLog new/nudoku-3.0.0/ChangeLog --- old/nudoku-2.1.0/ChangeLog 2020-11-20 10:47:40.000000000 +0100 +++ new/nudoku-3.0.0/ChangeLog 2023-12-21 11:44:39.000000000 +0100 @@ -1,3 +1,10 @@ +2.1.0 to 3.0.0 (2023-12-21) + * Fix build failure with ncurses 6.3 + * Add call to PKG_PROG_PKG_CONFIG and pkg-check ncurses libs #46 + * Fix build with musl + * Add highlighting of user input #56 + * Fix toggling marks removing solution #51 + 2.0.0 to 2.1.0 (2020-11-20) * Use actual terminal background color (instead of black) as background color (pr #31) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nudoku-2.1.0/README.md new/nudoku-3.0.0/README.md --- old/nudoku-2.1.0/README.md 2020-11-20 10:47:40.000000000 +0100 +++ new/nudoku-3.0.0/README.md 2023-12-21 11:44:39.000000000 +0100 @@ -4,63 +4,9 @@ ## Install ## -### Using package manager ### +nudoku is easily installable via many package managers. -#### Arch Linux #### -I heard rumors of nudoku being in the [AUR](https://aur.archlinux.org/packages/nudoku-git/). - -#### Debian and derivates #### -Contained in official stable repositories since Debian Stretch. - -``` -apt-get install nudoku -``` - -#### EL 7 (CentOS/Oracle Linux/Scientific Linux/RedHat #### -You need to enable the EPEL repository and run: - -``` -yum install nudoku -``` - -#### Fedora #### -nudoku is in the official Fedora repository since June 2016: - -``` -dnf install nudoku -``` - -#### Funtoo/Gentoo #### -Contained in official repo since 2018-02-16. Before that you had to use [strangeland-overlay](https://github.com/jubalh/strangeland-overlay). - -``` -emerge nudoku -a -``` - -### NixOS ### -nudoku is [available](https://github.com/NixOS/nixpkgs/tree/master/pkgs/games/nudoku) in the Nix package manager. - -### NetBSD ### -nudoku is [available](https://pkgsrc.se/games/nudoku) in the Nix package manager. - -### openSUSE ### - -Since openSUSE Leap 42.1 (and Tumbleweed) you can find nudoku in the official repository. - -``` -zypper in nudoku -``` - -### VoidLinux ### -nudoku is [available](https://github.com/void-linux/void-packages/tree/master/srcpkgs/nudoku) on Void. - -### macOS ### - -There is a [formula](https://formulae.brew.sh/formula/nudoku) for [Homebrew](https://brew.sh/) - -``` -brew install nudoku -``` +[](https://repology.org/project/nudoku/versions) ### From Source ### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nudoku-2.1.0/configure.ac new/nudoku-3.0.0/configure.ac --- old/nudoku-2.1.0/configure.ac 2020-11-20 10:47:40.000000000 +0100 +++ new/nudoku-3.0.0/configure.ac 2023-12-21 11:44:39.000000000 +0100 @@ -2,14 +2,15 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([nudoku], [2.1.0], [[email protected]]) +AC_INIT([nudoku], [3.0.0], [[email protected]]) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign]) +# Check for pkg-config +PKG_PROG_PKG_CONFIG() + # Checks for programs. AC_PROG_CC -# Use C99. -AC_PROG_CC_C99 # Options AC_ARG_ENABLE( @@ -35,9 +36,9 @@ fi have_wide_ncurses=no -AC_CHECK_LIB(ncursesw, initscr, [have_wide_ncurses=yes]) +PKG_CHECK_MODULES([ncursesw], [ncursesw], [have_wide_ncurses=yes], []) if test $have_wide_ncurses = no; then - AC_CHECK_LIB(ncurses, initscr, [], [ + PKG_CHECK_MODULES([ncurses], [ncurses], [], [ echo "nudoku requires ncurses" exit 1 ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nudoku-2.1.0/man/nudoku.6 new/nudoku-3.0.0/man/nudoku.6 --- old/nudoku-2.1.0/man/nudoku.6 2020-11-20 10:47:40.000000000 +0100 +++ new/nudoku-3.0.0/man/nudoku.6 2023-12-21 11:44:39.000000000 +0100 @@ -1,5 +1,5 @@ .\" Manpage for nudoku. -.TH man 6 "20 November 2020" "2.1.0" "nudoku man page" +.TH man 6 "21 December 2023" "3.0.0" "nudoku man page" .SH NAME nudoku \- ncurses based sudoku game .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nudoku-2.1.0/src/Makefile.am new/nudoku-3.0.0/src/Makefile.am --- old/nudoku-2.1.0/src/Makefile.am 2020-11-20 10:47:40.000000000 +0100 +++ new/nudoku-3.0.0/src/Makefile.am 2023-12-21 11:44:39.000000000 +0100 @@ -2,9 +2,9 @@ #-DDEBUG if HAVE_WIDE_NCURSES -nudoku_LDADD = -lncursesw +nudoku_LDADD = ${ncursesw_LIBS} else -nudoku_LDADD = -lncurses +nudoku_LDADD = ${ncurses_LIBS} endif bin_PROGRAMS = nudoku nudoku_SOURCES = main.c sudoku.c sudoku.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nudoku-2.1.0/src/main.c new/nudoku-3.0.0/src/main.c --- old/nudoku-2.1.0/src/main.c 2020-11-20 10:47:40.000000000 +0100 +++ new/nudoku-3.0.0/src/main.c 2023-12-21 11:44:39.000000000 +0100 @@ -25,6 +25,7 @@ #include <ncurses.h> /* ncurses */ #include <time.h> /* time */ #include <string.h> /* strcmp, strlen */ +#include <locale.h> /* setlocale */ #include "sudoku.h" /* sudoku functions */ #ifdef ENABLE_CAIRO #include "outp.h" /* output functions */ @@ -54,6 +55,7 @@ #define SUDOKU_LENGTH STREAM_LENGTH - 1 #define COLOR_HIGHLIGHT 4 #define COLOR_HIGHLIGHT_CURSOR 5 +#define COLOR_USER_HIGHLIGHT 6 #ifdef DEBUG #define EXAMPLE_STREAM "4.....8.5.3..........7......2.....6.....8.4......1.......6.3.7.5..2.....1.4......" @@ -213,6 +215,8 @@ init_pair(COLOR_HIGHLIGHT, COLOR_BLACK, COLOR_WHITE); // Cursor highlight color init_pair(COLOR_HIGHLIGHT_CURSOR, COLOR_BLACK, COLOR_MAGENTA); + // User input highlight color + init_pair(COLOR_USER_HIGHLIGHT, COLOR_BLACK, COLOR_CYAN); } else { @@ -379,18 +383,22 @@ { if (x == x_cursor && y == y_cursor) wattron(grid, COLOR_PAIR(COLOR_HIGHLIGHT_CURSOR)); + else if (isUserInput) + wattron(grid, COLOR_PAIR(COLOR_USER_HIGHLIGHT)); else wattron(grid, COLOR_PAIR(COLOR_HIGHLIGHT)); } - if(isUserInput) + if(isUserInput && selected != c) wattron(grid, COLOR_PAIR(3)); mvwprintw(grid, y, x, "%c", c); - if(isUserInput) + if(isUserInput && selected != c) wattroff(grid, COLOR_PAIR(3)); if (g_useColor && g_useHighlights && selected == c) { if (x == x_cursor && y == y_cursor) wattroff(grid, COLOR_PAIR(COLOR_HIGHLIGHT_CURSOR)); + else if (isUserInput) + wattroff(grid, COLOR_PAIR(COLOR_USER_HIGHLIGHT)); else wattroff(grid, COLOR_PAIR(COLOR_HIGHLIGHT)); } @@ -619,7 +627,7 @@ { char t[256]; sprintf(t, _(" with the help of %d hints"), g_hint_counter); - mvwprintw(status, 0, 6, t); + mvwprintw(status, 0, 6, "%s", t); } g_playing = false; @@ -659,7 +667,7 @@ break; case 'm': // Ignore 'm' if we have no colors - if (g_useColor) + if (g_playing && g_useColor) { g_useHighlights = !g_useHighlights; fill_grid(user_board, plain_board, x, y);
