From ca0420df40bd6d4deae1a9de852826c44fa73824 Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Thu, 26 Sep 2019 00:22:53 +0200 Subject: [PATCH 1/4] Better solution for frame_heart.png being wrongly discarded as the .png version of frame_hearts.png. --- src/tuxpaint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 849afc8ab..f594cf877 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -18853,7 +18853,7 @@ static int do_new_dialog(void) f2 = &(fs[k].f); strcpy(fname2, f2->d_name); - if (strstr(fname, fname2) == fname2 && strcasestr(fname2, ".svg") != NULL) + if (strstr(fname2, fname) == fname2 && strlen(fname) == strlen(fname2)- strlen(".svg") && strcasestr(fname2, ".svg") != NULL) { /* SVG of this bitmap exists; we'll skip it */ skip = 1; From 8667c29650e84859e4de47cb10149b2d1cf77399 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Wed, 25 Sep 2019 22:50:22 -0700 Subject: [PATCH 2/4] Doc'ing Pere's bugfix w/ SVG & PNG Starters Mentioning Pere's bugfix for starters/templates PNG vs SVG confusion, in changelog. --- docs/CHANGES.txt | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 91cfb47bc..e73cc8833 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2019.Sep.21 (0.9.24) +2019.Sep.25 (0.9.24) * New tools --------- * Fill @@ -23,26 +23,6 @@ $Id$ * Updates to build on Haiku. Luc 'Begasus' Schrijvers - * Bug Fixes - --------- - * Correct issue that prevented Tux Paint from lauching on Mac OS X 10.7. - (See https://sourceforge.net/p/tuxpaint/tuxpaint/ci/d2ef2e17d1962111d0f6f91394dce81e8706d48b/ - and https://stackoverflow.com/questions/20206985/xcode-linking-against-applicationservices-framework-with-sdk-10-9-causes-10-7) - Mark K. Kim - - * Reduce launch time by calling progress bar less frequently - while loading stamps. - Mark K. Kim - - * Ability to bring up the print dialog from the macOS build was - removed in Tux Paint 0.9.23 to support the new build mechanism. - It has been re-added. To access it, option-click the print icon, - or configure Tux Paint to always bring up the dialog upon print. - Mark K. Kim - - * Made sure "New" dialog created correct thumbnail subdirectories - for personal Starters & Templates (e.g., ~/.tuxpaint/starters/thumbs/) - * Other Improvements ------------------ * Added ability to move color palette options to the end of @@ -84,6 +64,32 @@ $Id$ the new "SIGUSR1" & "SIGUSR2") added to a new doc file, "SIGNALS.txt". + * Bug Fixes + --------- + * Correct issue that prevented Tux Paint from lauching on Mac OS X 10.7. + (See https://sourceforge.net/p/tuxpaint/tuxpaint/ci/d2ef2e17d1962111d0f6f91394dce81e8706d48b/ + and https://stackoverflow.com/questions/20206985/xcode-linking-against-applicationservices-framework-with-sdk-10-9-causes-10-7) + Mark K. Kim + + * Reduce launch time by calling progress bar less frequently + while loading stamps. + Mark K. Kim + + * Ability to bring up the print dialog from the macOS build was + removed in Tux Paint 0.9.23 to support the new build mechanism. + It has been re-added. To access it, option-click the print icon, + or configure Tux Paint to always bring up the dialog upon print. + Mark K. Kim + + * Made sure "New" dialog created correct thumbnail subdirectories + for personal Starters & Templates (e.g., ~/.tuxpaint/starters/thumbs/) + + * Ensure that similarly-named (but not identically-named) PNG & SVG + Starters & Templates don't get confused with each other + (e.g., "frame_heart.png" being ignored, because we find + "frame_hearts.svg") + Pere Pujal i Carabantes + * Misc ---- * Verbose debugging, and "DEBUG_PRINTF()" macro now available; From acabe10e30ddef3080ed5c40dd09fe2536a23593 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Wed, 25 Sep 2019 23:16:59 -0700 Subject: [PATCH 3/4] Unique filename when thumbnailing starters Helps for parallel builds (e.g., `make -j12`). h/t Pere. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c246b61eb..9d833f16b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Various contributors (see AUTHORS.txt) # http://www.tuxpaint.org/ -# June 14, 2002 - September 14, 2019 +# June 14, 2002 - September 25, 2019 # The version number, for release: @@ -709,9 +709,9 @@ $(THUMB_STARTERS): @mkdir -p starters/.thumbs @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ then \ - composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp.png ; \ - convert $(CONVERT_OPTS) obj/tmp.png $@ ; \ - rm obj/tmp.png ; \ + composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ + convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \ + rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ else \ convert $(CONVERT_OPTS) $(STARTER_NAME) $@ ; \ fi From 19def18abb14080bee6704b208e6ccfa172a0d83 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Wed, 25 Sep 2019 23:25:19 -0700 Subject: [PATCH 4/4] Properly doc fullscreen option in manpage Manpage still showed that "--fullscreen" (with no value) could be specified. Lately, it requires =yes, =no, or =native. For https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769368 Also, remove a duplicated credit from the contributor list. --- src/manpage/tuxpaint.1 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index 0040cf1a0..f25a1da04 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2019.09.21 -.TH TUXPAINT 1 "21 September 2019" "0.9.24" "Tux Paint" +.\" tuxpaint.1 - 2019.09.25 +.TH TUXPAINT 1 "25 September 2019" "0.9.24" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -9,7 +9,7 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .TP 9 .B tuxpaint -[\-\-fullscreen] +[\-\-fullscreen {yes|native|no}] .br [\-\-allowscreensaver] .br @@ -260,8 +260,11 @@ Show the license (GNU GPL) under which Tux Paint is released. They can be used along with, instead of, or to override options set in configuration files. (See below.) .TP 8 -.B \-\-fullscreen \-\-windowed -Run \fITux Paint\fP in full-screen mode, or in a window (default). +.B \-\-fullscreen=yes \-\-fullscreen=native \-\-fullscreen=no \-\-windowed +Run \fITux Paint\fP in full-screen mode at its default -- or a specified +-- screen resolution ("--fullscreen=yes"); or in full-screen mode at the +system's native resolution ("--fullscreen=native"); or run in a window +("--fullscreen=no" or "--windowed") (default). .TP 8 .B \-\-allowscreensaver \-\-disablescreensaver @@ -1171,9 +1174,8 @@ Pablo Pita, Milan Plzik, Sergei Popov, John Popplewell, -Rodrigo Perez Ramirez and Indigenas Sin Fronteras, Adam 'foo-script' Rakowski, -Rodrigo Perez Ramirez, +Rodrigo Perez Ramirez and Indigenas Sin Fronteras, Robert Readman, Leandro Regueiro, Simona Riva,