Hello community, here is the log from the commit of package hitori for openSUSE:Factory checked in at 2014-07-10 14:56:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hitori (Old) and /work/SRC/openSUSE:Factory/.hitori.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hitori" Changes: -------- --- /work/SRC/openSUSE:Factory/hitori/hitori.changes 2014-05-10 22:57:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hitori.new/hitori.changes 2014-07-10 14:56:48.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 9 18:20:18 UTC 2014 - [email protected] + +- Update to version 0.4.5: + + Minor fixes to the board rendering and timer. +- Changes from version 0.4.4: + + Fix various small memory leaks. + + Fix behaviour of the redo stack. + + Updated translations. + +------------------------------------------------------------------- Old: ---- hitori-0.4.3.tar.xz New: ---- hitori-0.4.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hitori.spec ++++++ --- /var/tmp/diff_new_pack.kM1h1I/_old 2014-07-10 14:56:50.000000000 +0200 +++ /var/tmp/diff_new_pack.kM1h1I/_new 2014-07-10 14:56:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: hitori -Version: 0.4.3 +Version: 0.4.5 Release: 0 Summary: Original puzzle of Nikoli License: GPL-3.0+ ++++++ hitori-0.4.3.tar.xz -> hitori-0.4.5.tar.xz ++++++ ++++ 8931 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/ChangeLog new/hitori-0.4.5/ChangeLog --- old/hitori-0.4.3/ChangeLog 2014-05-04 16:50:21.000000000 +0200 +++ new/hitori-0.4.5/ChangeLog 2014-07-09 09:25:18.000000000 +0200 @@ -1,3 +1,135 @@ +commit 1fb9fbd27868c638075a645935979a42e267c543 +Author: Philip Withnall <[email protected]> +Date: Wed Jul 9 08:23:36 2014 +0100 + + Update British English translation + + po/en_GB.po | 44 +++++++++++++++++++++----------------------- + 1 file changed, 21 insertions(+), 23 deletions(-) + +commit c7ad10f5af26176a8d92ceceb102d973fa5de9bb +Author: Philip Withnall <[email protected]> +Date: Tue Jul 8 23:17:07 2014 +0100 + + Disable the game play timer after winning + + In certain situations, the game play timer could become re-enabled + after + winning a game (but before starting the next one). Only un-pause it if + event processing is enabled (i.e. a game is underway). + + src/interface.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f3ac3301b39b2b698d67353271492cc3dff131a8 +Author: Philip Withnall <[email protected]> +Date: Sun Jul 6 13:41:09 2014 +0100 + + Make board rendering colours independent of the widget state + + The Hitori game board widget doesn’t make use of the GTK+ widget + state + (e.g. insensitive, focused) correctly, so the rendering colours should + not be based on it. + + Hard-code the colours so that Hitori rendering is independent of the + GTK+ state, until we make the game play area a proper GtkWidget + and set + its state flags properly. + + https://bugzilla.gnome.org/show_bug.cgi?id=731307 + + src/interface.c | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit a5cc6e37bceb6056898d827215576de39a471281 +Author: Philip Withnall <[email protected]> +Date: Thu Jun 19 08:39:38 2014 +0100 + + Release version 0.4.4 + + NEWS | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit e13c862141299db1bbebffa958c56518da5d64c9 +Author: Philip Withnall <[email protected]> +Date: Wed Jun 11 10:03:58 2014 +0100 + + interface: Fix a leak in the redo stack handling + + src/interface.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 70d019a9c79336f9dbfce08445f458ad3bb88f2c +Author: Philip Withnall <[email protected]> +Date: Wed Jun 11 10:02:49 2014 +0100 + + interface: Fix leak of top-level menu models + + src/interface.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit b2590082de11ab72607693d7281f544e270c3dbe +Author: Philip Withnall <[email protected]> +Date: Wed Jun 11 09:47:21 2014 +0100 + + interface: Disable redo when making a move + + Making a move will clear the redo stack, so the redo button is useless + at that point. + + src/interface.c | 1 + + 1 file changed, 1 insertion(+) + +commit c4cbc9eecac1694189b13e657819d16f95244e3c +Author: Philip Withnall <[email protected]> +Date: Tue May 6 11:53:04 2014 +0100 + + core: Fix a potential NULL pointer dereference + + src/main.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit b93cfd3a0132a7596426b7af31e7b14ecc049644 +Author: Philip Withnall <[email protected]> +Date: Tue May 6 11:52:33 2014 +0100 + + core: Remove a redundant assignment + + src/interface.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 67d68b6613b6fd9c8461a2fdfa19dbec339dd0e3 +Author: Jordi Mas <[email protected]> +Date: Wed May 28 13:33:10 2014 +0200 + + Fix to Catalan translation + + po/ca.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ea0cb02b08c7f514e4a7b1108a3d52bdf5a181b9 +Author: Jordi Mas <[email protected]> +Date: Wed May 28 13:04:13 2014 +0200 + + Catalan translation + + po/LINGUAS | 1 + + po/ca.po | 196 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 197 insertions(+) + +commit 199f45a8582e38e54620fec74fe055a58f264524 +Author: Philip Withnall <[email protected]> +Date: Sun May 4 15:51:02 2014 +0100 + + Release version 0.4.3 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + commit a8b7486116aa14ab2f97c1f7e9384044646c8425 Author: Philip Withnall <[email protected]> Date: Sun May 4 11:55:33 2014 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/INSTALL new/hitori-0.4.5/INSTALL --- old/hitori-0.4.3/INSTALL 2014-05-04 16:31:12.000000000 +0200 +++ new/hitori-0.4.5/INSTALL 2014-07-09 09:24:50.000000000 +0200 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/NEWS new/hitori-0.4.5/NEWS --- old/hitori-0.4.3/NEWS 2014-05-04 15:03:29.000000000 +0200 +++ new/hitori-0.4.5/NEWS 2014-07-09 09:24:30.000000000 +0200 @@ -1,5 +1,16 @@ Major new features in version... +0.4.5: +* Minor fixes to the board rendering and timer +* Translations: +** en_GB (Philip Withnall) + +0.4.4: +* Fix various small memory leaks +* Fix behaviour of the redo stack +* Translations: +** ca (Jordi Mas) + 0.4.3: * Translations: ** cs (Marek Černocký) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/compile new/hitori-0.4.5/compile --- old/hitori-0.4.3/compile 2014-05-04 16:31:12.000000000 +0200 +++ new/hitori-0.4.5/compile 2014-07-09 09:24:50.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/configure.ac new/hitori-0.4.5/configure.ac --- old/hitori-0.4.3/configure.ac 2014-05-04 15:01:25.000000000 +0200 +++ new/hitori-0.4.5/configure.ac 2014-07-09 09:24:35.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([Hitori],[0.4.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=hitori],[hitori],[https://wiki.gnome.org/Apps/Hitori]) +AC_INIT([Hitori],[0.4.5],[https://bugzilla.gnome.org/enter_bug.cgi?product=hitori],[hitori],[https://wiki.gnome.org/Apps/Hitori]) AM_INIT_AUTOMAKE([check-news dist-xz no-dist-gzip subdir-objects]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/missing new/hitori-0.4.5/missing --- old/hitori-0.4.3/missing 2014-05-04 16:31:12.000000000 +0200 +++ new/hitori-0.4.5/missing 2014-07-09 09:24:50.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh -# Common wrapper for a few potentially missing GNU programs. +# Common stub for a few missing GNU programs while installing. -scriptversion=2012-06-26.16; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,33 +29,61 @@ exit 1 fi -case $1 in +run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + +# In the cases where this matters, 'missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; +msg="missing on your system" - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; +case $1 in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' + autom4te touch the output file, or create a stub one + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create 'lex.yy.c', if possible, from existing .c + makeinfo touch the output file + yacc create 'y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -70,141 +98,228 @@ ;; -*) - echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "$0: Unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# Run the given program, remember its exit status. -"$@"; st=$? +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; -# If it succeeded, we are done. -test $st -eq 0 && exit 0 + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running '$TOOL --version' or '$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) + echo 1>&2 "\ +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf*) + echo 1>&2 "\ +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader*) + echo 1>&2 "\ +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te*) + echo 1>&2 "\ +WARNING: '$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get '$1' as part of Autoconf from any GNU + archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison*|yacc*) + echo 1>&2 "\ +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package + in order for those modifications to take effect. You can get + Bison from any GNU archive site." + rm -f y.tab.c y.tab.h + if test $# -ne 1; then + eval LASTARG=\${$#} + case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if test ! -f y.tab.h; then + echo >y.tab.h + fi + if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex*|flex*) + echo 1>&2 "\ +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package + in order for those modifications to take effect. You can get + Flex from any GNU archive site." + rm -f lex.yy.c + if test $# -ne 1; then + eval LASTARG=\${$#} + case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man*) + echo 1>&2 "\ +WARNING: '$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit $? + fi + ;; + + makeinfo*) + echo 1>&2 "\ +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + *) + echo 1>&2 "\ +WARNING: '$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the 'README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing '$1' program." + exit 1 + ;; +esac -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/po/LINGUAS new/hitori-0.4.5/po/LINGUAS --- old/hitori-0.4.3/po/LINGUAS 2013-11-21 01:28:07.000000000 +0100 +++ new/hitori-0.4.5/po/LINGUAS 2014-06-11 10:13:05.000000000 +0200 @@ -1,5 +1,6 @@ # please keep this list sorted alphabetically # +ca cs da de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/po/ca.po new/hitori-0.4.5/po/ca.po --- old/hitori-0.4.3/po/ca.po 1970-01-01 01:00:00.000000000 +0100 +++ new/hitori-0.4.5/po/ca.po 2014-06-11 10:13:05.000000000 +0200 @@ -0,0 +1,196 @@ +# This file is distributed under the same license as the PACKAGE package. +# +# Jordi Mas i Hernàndez <[email protected]>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: Hitori\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-28 11:02+0200\n" +"PO-Revision-Date: 2014-05-28 13:12+0200\n" +"Last-Translator: Jordi Mas <[email protected]>\n" +"Language-Team: Softcatalà\n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:16 ../src/main.c:101 +msgid "Hitori" +msgstr "Hitori" + +#: ../data/hitori.desktop.in.h:2 +msgid "Play the Hitori puzzle game" +msgstr "Jugueu al trencaclosques Hitori" + +#. Translators: These are the application description paragraphs in the AppData file. +#: ../data/hitori.appdata.xml.in.h:2 +msgid "Hitori is a logic game similar to the popular game of Sudoku." +msgstr "Hitori és un joc de lògica similar al popular Sukodu." + +#: ../data/hitori.appdata.xml.in.h:3 +msgid "" +"You play the game against the clock, aiming to eliminate all the duplicate " +"numbers in each row and column in the fastest time. Multiple sizes of game " +"board are supported, and you can place markers on cells to help work out the " +"solution. If you get stuck, the game can give you a hint." +msgstr "" +"Jugueu contra rellotge, amb l'objectiu d'eliminar tots els nombres " +"duplicats a cada fila i columna en el menor temps possible. Es pot jugar a " +"taulers de diferent mida, i podeu posar els marcadors a les celes per ajudar-" +"vos a trobar la solució. Si us quedeu bloquejats, el joc us pot donar una " +"pista." + +#: ../data/hitori.ui.h:1 +msgid "_New Game" +msgstr "_Joc nou" + +#: ../data/hitori.ui.h:2 +msgid "_About Hitori" +msgstr "_Quant al Hitori" + +#: ../data/hitori.ui.h:3 +msgid "_Help" +msgstr "_Ajuda" + +#: ../data/hitori.ui.h:4 +msgid "_Quit" +msgstr "_Surt" + +#: ../data/hitori.ui.h:5 +msgid "_Game" +msgstr "_Joc" + +#: ../data/hitori.ui.h:6 +msgid "Board _Size" +msgstr "Mida del tauler" + +#: ../data/hitori.ui.h:7 +msgid "5×5" +msgstr "5×5" + +#: ../data/hitori.ui.h:8 +msgid "6×6" +msgstr "6×6" + +#: ../data/hitori.ui.h:9 +msgid "7×7" +msgstr "7×7" + +#: ../data/hitori.ui.h:10 +msgid "8×8" +msgstr "8×8" + +#: ../data/hitori.ui.h:11 +msgid "9×9" +msgstr "9×9" + +#: ../data/hitori.ui.h:12 +msgid "10×10" +msgstr "10×10" + +#: ../data/hitori.ui.h:13 +msgid "_Hint" +msgstr "_Pista" + +#: ../data/hitori.ui.h:14 +msgid "_Undo" +msgstr "_Desfés" + +#: ../data/hitori.ui.h:15 +msgid "_Redo" +msgstr "_Refés" + +#: ../src/interface.c:88 +#, c-format +msgid "UI file “%s” could not be loaded" +msgstr "No s'ha pogut carregar el fitxer d'interfície d'usuari «%s»" + +#: ../src/interface.c:605 +msgid "The help contents could not be displayed" +msgstr "No s'han pogut mostrar els continguts de l'ajuda" + +#: ../src/interface.c:628 +msgid "" +"Hitori is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"El Hitori és programari lliure: podeu redistribuir-lo i/o modificar-lo sota " +"els termes de la Llicència pública general de GNU versió 3, tal com publica " +"la Free Software Foundation." + +#: ../src/interface.c:632 +msgid "" +"Hitori is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"El Hitori es distribueix amb l'esperança de ser útil, però SENSE CAP TIPUS " +"DE GARANTIA; sense ni tan sols la garantia implícita per l'ÚS COMERCIAL o " +"IDONEÏTAT PER A USOS PARTICULARS. Vegeu la Llicència de documentació lliure " +"GNU per a més detalls." + +#: ../src/interface.c:636 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Hitori. If not, see <http://www.gnu.org/licenses/>." +msgstr "" +"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU " +"juntament amb aquest programa; en cas contrari, consulteu <http://www.gnu."; +"org/licenses/>." + +#: ../src/interface.c:648 +msgid "Copyright © 2007–2010 Philip Withnall" +msgstr "Copyright © 2007–2010 Philip Withnall" + +#: ../src/interface.c:649 +msgid "A logic puzzle designed by Nikoli." +msgstr "Un trencaclosques lògic dissenyat per Nikoli." + +#: ../src/interface.c:651 +msgid "translator-credits" +msgstr "Jordi Mas i Hernandez <[email protected]>" + +#: ../src/interface.c:655 +msgid "Hitori Website" +msgstr "Lloc web del Hitori" + +#: ../src/main.c:205 +msgid "Enable debug mode" +msgstr "Habilita mode de depuració" + +#. Translators: This means to choose a number as the "seed" for random number generation used when creating a board +#: ../src/main.c:207 +msgid "Seed the board generation" +msgstr "Llavor pel generador de taulers" + +#. Options +#: ../src/main.c:221 +msgid "- Play a game of Hitori" +msgstr "- Jugueu una partida del Hitori" + +#. Print an error +#: ../src/main.c:231 +#, c-format +msgid "Command line options could not be parsed: %s\n" +msgstr "No s'han pogut analitzar les opcions de la línia d'ordres: «%s»\n" + +#: ../src/main.c:297 +msgid "Do you want to stop the current game?" +msgstr "Voleu aturar la partida actual?" + +#. Translators: this is the format for the timer label. The first parameter is the number of minutes which have elapsed since the start of the +#. * game; the second parameter is the number of seconds. +#: ../src/main.c:371 +#, c-format +msgid "Time: %02u:%02u" +msgstr "Temps: %02u:%02u" + +#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; the second parameter is +#. * the number of seconds. +#: ../src/rules.c:266 +#, c-format +msgid "You've won in a time of %02u:%02u!" +msgstr "Heu guanyat en un temps de %02u:%02u!" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/po/en_GB.po new/hitori-0.4.5/po/en_GB.po --- old/hitori-0.4.3/po/en_GB.po 2013-11-21 01:28:07.000000000 +0100 +++ new/hitori-0.4.5/po/en_GB.po 2014-07-09 09:23:30.000000000 +0200 @@ -1,14 +1,14 @@ # British English translation of Hitori. # Copyright (C) 2007-2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Hitori package. -# Philip Withnall <[email protected]>, 2007, 2008, 2010, 2013. +# Philip Withnall <[email protected]>, 2007, 2008, 2010, 2013, 2014. # # msgid "" msgstr "" "Project-Id-Version: hitori VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-10 21:02-0600\n" +"POT-Creation-Date: 2014-07-09 08:23+0100\n" "PO-Revision-Date: 2007-09-03 16:09+0100\n" "Last-Translator: Philip Withnall <[email protected]>\n" "Language-Team: British English <[email protected]>\n" @@ -27,8 +27,8 @@ #. Translators: These are the application description paragraphs in the AppData file. #: ../data/hitori.appdata.xml.in.h:2 -msgid "Hitori is a logic game similar to Sudoku." -msgstr "Hitori is a logic game similar to Sudoku." +msgid "Hitori is a logic game similar to the popular game of Sudoku." +msgstr "Hitori is a logic game similar to the popular game of Sudoku." #: ../data/hitori.appdata.xml.in.h:3 msgid "" @@ -42,15 +42,6 @@ "board are supported, and you can place markers on cells to help work out the " "solution. If you get stuck, the game can give you a hint." -#. Translators: This should be the URI of a 402×493 pixel screenshot of Hitori in your language. You may attach new screenshots to the existing wiki page. If you can't take a screenshot, leave the string as the English screenshot. -#: ../data/hitori.appdata.xml.in.h:5 -msgid "" -"https://wiki.gnome.org/Apps/Hitori?action=AttachFile&do=get&"; -"target=screenshot-hitori.png" -msgstr "" -"https://wiki.gnome.org/Apps/Hitori?action=AttachFile&do=get&"; -"target=screenshot-hitori.png" - #: ../data/hitori.ui.h:1 msgid "_New Game" msgstr "_New Game" @@ -111,16 +102,16 @@ msgid "_Redo" msgstr "_Redo" -#: ../src/interface.c:88 +#: ../src/interface.c:89 #, c-format msgid "UI file “%s” could not be loaded" msgstr "UI file “%s” could not be loaded" -#: ../src/interface.c:605 +#: ../src/interface.c:627 msgid "The help contents could not be displayed" msgstr "The help contents could not be displayed" -#: ../src/interface.c:628 +#: ../src/interface.c:650 msgid "" "Hitori is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -132,7 +123,7 @@ "Foundation, either version 3 of the Licence, or (at your option) any later " "version." -#: ../src/interface.c:632 +#: ../src/interface.c:654 msgid "" "Hitori is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -144,7 +135,7 @@ "FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for more " "details." -#: ../src/interface.c:636 +#: ../src/interface.c:658 msgid "" "You should have received a copy of the GNU General Public License along with " "Hitori. If not, see <http://www.gnu.org/licenses/>." @@ -152,19 +143,19 @@ "You should have received a copy of the GNU General Public Licence along with " "Hitori. If not, see <http://www.gnu.org/licences/>." -#: ../src/interface.c:648 +#: ../src/interface.c:670 msgid "Copyright © 2007–2010 Philip Withnall" msgstr "Copyright © 2007–2010 Philip Withnall" -#: ../src/interface.c:649 +#: ../src/interface.c:671 msgid "A logic puzzle designed by Nikoli." msgstr "A logic puzzle designed by Nikoli." -#: ../src/interface.c:651 +#: ../src/interface.c:673 msgid "translator-credits" msgstr "Philip Withnall <[email protected]>" -#: ../src/interface.c:655 +#: ../src/interface.c:677 msgid "Hitori Website" msgstr "Hitori Website" @@ -204,7 +195,14 @@ #: ../src/rules.c:266 #, c-format msgid "You've won in a time of %02u:%02u!" -msgstr "You've won in a time of %02u:%02u!" +msgstr "You’ve won in a time of %02u:%02u!" + +#~ msgid "" +#~ "https://wiki.gnome.org/Apps/Hitori?action=AttachFile&do=get&"; +#~ "target=screenshot-hitori.png" +#~ msgstr "" +#~ "https://wiki.gnome.org/Apps/Hitori?action=AttachFile&do=get&"; +#~ "target=screenshot-hitori.png" #~ msgid "_Settings" #~ msgstr "_Settings" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/src/interface.c new/hitori-0.4.5/src/interface.c --- old/hitori-0.4.3/src/interface.c 2013-11-21 01:28:07.000000000 +0100 +++ new/hitori-0.4.5/src/interface.c 2014-07-09 09:22:59.000000000 +0200 @@ -75,6 +75,7 @@ GtkBuilder *builder; GtkStyleContext *style_context; const PangoFontDescription *font; + GMenuModel *app_menu, *win_menu; /* owned */ builder = gtk_builder_new (); @@ -106,11 +107,15 @@ hitori->timer_label = GTK_LABEL (gtk_builder_get_object (builder, "hitori_timer")); /* Set up the menus (application and window). */ + app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "app_menu")); g_action_map_add_action_entries (G_ACTION_MAP (hitori), app_entries, G_N_ELEMENTS (app_entries), hitori); - gtk_application_set_app_menu (GTK_APPLICATION (hitori), G_MENU_MODEL (gtk_builder_get_object (builder, "app_menu"))); + gtk_application_set_app_menu (GTK_APPLICATION (hitori), app_menu); + g_object_unref (app_menu); + win_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "win_menu")); g_action_map_add_action_entries (G_ACTION_MAP (hitori->window), win_entries, G_N_ELEMENTS (win_entries), hitori); - gtk_application_set_menubar (GTK_APPLICATION (hitori), G_MENU_MODEL (gtk_builder_get_object (builder, "win_menu"))); + gtk_application_set_menubar (GTK_APPLICATION (hitori), win_menu); + g_object_unref (win_menu); hitori->undo_action = G_SIMPLE_ACTION (g_action_map_lookup_action (G_ACTION_MAP (hitori->window), "undo")); hitori->redo_action = G_SIMPLE_ACTION (g_action_map_lookup_action (G_ACTION_MAP (hitori->window), "redo")); @@ -149,7 +154,6 @@ GtkStateFlags state = 0; gboolean painted = FALSE; PangoFontDescription *font_desc; - GdkRGBA colour; GtkBorder border; if (hitori->board[iter.x][iter.y].status & CELL_PAINTED) { @@ -166,8 +170,12 @@ g_debug ("State: %u", state); } - gtk_style_context_get_background_color (style_context, state, &colour); - gdk_cairo_set_source_rgba (cr, &colour); + /* Adwaita’s background colour. */ + if (painted) { + cairo_set_source_rgb (cr, 0.956862745, 0.956862745, 0.956862745); + } else { + cairo_set_source_rgb (cr, 0.929411765, 0.929411765 ,0.929411765); + } cairo_rectangle (cr, x_pos, y_pos, cell_size, cell_size); cairo_fill (cr); @@ -195,8 +203,11 @@ } /* Draw the border */ - gtk_style_context_get_border_color (style_context, state, &colour); - gdk_cairo_set_source_rgba (cr, &colour); + if (painted) { + cairo_set_source_rgb (cr, 0.729411765, 0.737254902, 0.721568627); + } else { + cairo_set_source_rgb (cr, 0.180392157, 0.203921569, 0.211764706); + } cairo_set_line_width (cr, border.left); cairo_rectangle (cr, x_pos, y_pos, cell_size, cell_size); cairo_stroke (cr); @@ -213,8 +224,11 @@ cairo_set_source_rgb (cr, 0.937254902, 0.160784314, 0.160784314); /* Tango's lightest "scarlet red" */ pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD); } else { - gtk_style_context_get_color (style_context, state, &colour); - gdk_cairo_set_source_rgba (cr, &colour); + if (painted) { + cairo_set_source_rgb (cr, 0.654901961, 0.670588235, 0.654901961); + } else { + cairo_set_source_rgb (cr, 0.180392157, 0.203921569, 0.211764706); + } pango_font_description_set_weight (font_desc, PANGO_WEIGHT_NORMAL); } @@ -316,8 +330,6 @@ /* Clamp the width/height to the minimum */ if (height < width) width = height; - else if (width < height) - height = width; cell_size = width / hitori->board_size; @@ -356,10 +368,20 @@ hitori->made_a_move = TRUE; - if (hitori->undo_stack != NULL) + if (hitori->undo_stack != NULL) { + HitoriUndo *i, *next = NULL; + + /* Free the redo stack after this point. */ + for (i = hitori->undo_stack->redo; i != NULL; i = next) { + next = i->redo; + g_free (i); + } + hitori->undo_stack->redo = undo; + } hitori->undo_stack = undo; g_simple_action_set_enabled (hitori->undo_action, TRUE); + g_simple_action_set_enabled (hitori->redo_action, FALSE); /* Stop any current hints */ hitori_cancel_hinting (hitori); @@ -397,7 +419,7 @@ } hitori_pause_timer (hitori); - } else if (timer_was_running == TRUE) { + } else if (timer_was_running && hitori->processing_events) { /* Re-start the timer */ hitori_start_timer (hitori); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hitori-0.4.3/src/main.c new/hitori-0.4.5/src/main.c --- old/hitori-0.4.3/src/main.c 2013-08-02 10:46:52.000000000 +0200 +++ new/hitori-0.4.5/src/main.c 2014-07-09 09:22:38.000000000 +0200 @@ -275,11 +275,11 @@ if (hitori->undo_stack->type == UNDO_NEW_GAME) break; } - } - /* Reset the "new game" item */ - hitori->undo_stack->undo = NULL; - hitori->undo_stack->redo = NULL; + /* Reset the "new game" item */ + hitori->undo_stack->undo = NULL; + hitori->undo_stack->redo = NULL; + } g_simple_action_set_enabled (hitori->undo_action, FALSE); g_simple_action_set_enabled (hitori->redo_action, FALSE); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
