CVS commit: pkgsrc/graphics/tuxpaint-config

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov 29 22:59:41 UTC 2024

Modified Files:
        pkgsrc/graphics/tuxpaint-config: Makefile PLIST distinfo
        pkgsrc/graphics/tuxpaint-config/patches: patch-Makefile

Log Message:
tuxpaint-config: update to 0.0.25.

2024.October.25 (0.0.25)
 * Squelch [admittedly impossible] compiler warning
   "array subscript -1 is below array bounds"
   under g++ 13.2.0.

 * Addressed some "defined but not used" warnings.

2024.July.17 (0.0.24)
 * Option for new Tux Paint 0.9.33 feature:
   + "Ungroup Magic Tools" option added to "Simplification".
     Bill Kendrick <bill%newbreedsoftware.com@localhost>

2024.January.27 (0.0.23)
 * Option for new Tux Paint 0.9.32 feature:
   + "Complexity" level control added to "Simplification".
     Bill Kendrick <bill%newbreedsoftware.com@localhost>
     w/ help from TOYAMA Shin-ichi

 * Other Improvements:
   + Simplify macOS building by signing macOS app bundle anonymously by
     default.
     Mark Kim <markuskimius%gmail.com@localhost>

2023.July.20 (0.0.22)
 * Options for new Tux Paint 0.9.31 features:
   + "Disable 'Make Template'" added to "Simplification".
     Bill Kendrick <bill%newbreedsoftware.com@localhost>

   + "Disable 'Erase' (file deletion)" added to "Simplification".
     Bill Kendrick <bill%newbreedsoftware.com@localhost>

   + "UI Font" added to "Locale".  (Queries system, via Pango, for
     available fonts and presents them in a selection list.)
     Bill Kendrick <bill%newbreedsoftware.com@localhost>

 * Bug fixes:
   + Activate "Apply" & "Reset" buttons immediately upon editing type-in
     and spinner fields; don't require focus to change first.
     Bill Kendrick <bill%newbreedsoftware.com@localhost>

   + Make sure to remove up generated gettext '.mo' files during
     "make uninstall" process.
     TOYAMA Shin-ichi <dolphin6k%wmail.plala.or.jp@localhost>

   + Options that may contain spaces (directory paths, like "savedir",
     or shell comamnds like "printcommand") now have their values wrapped
     in double quotes (").
     - On Linux, use of `wordexp()` to handle shell expansion
       (e.g., "$HOME" or "~") requires things be wrapped in quotes
       if they contain spaces.
     - On other platforms, quotes will be trimmed by Tux Paint itself.
     - Affected options as of 0.9.31: "uifont", "colorfile",
       "savedir", "exportdir", "datadir",
       "printcommand", and "altprintcommand".
     Bill Kendrick <bill%newbreedsoftware.com@localhost>
     TOYAMA Shin-ichi <dolphin6k%wmail.plala.or.jp@localhost>

   + Ensure UI Font list includes fonts bundled with Tux Paint but may not be
     visible to Tux Paint Config.
     Mark Kim <markuskimius%gmail.com@localhost>

 * Other changes:
   + Improvements to debugging output options.
     Mark Kim <markuskimius%gmail.com@localhost>

 * Build updates
   + macOS
     - Update for Tux Paint Config to find the same set of fonts found
       by Tux Paint on macOS.
     - Auto update version when building on macOS.
     Mark Kim <markuskimius%gmail.com@localhost>

   + Dropping old GNOME and KDE specific icon/launcher installers,
     having Makefile replicate more closely what `tuxpaint` does.
     h/t Tim Dickson
     Bill Kendrick <bill%newbreedsoftware.com@localhost>

   + Default spec file for rpmbuild.
     TOYAMA Shin-ichi <dolphin6k%wmail.plala.or.jp@localhost>

 * Miscellaneous:
   + Option to enable debugging (see debug.h)
     Mark Kim <markuskimius%gmail.com@localhost>

2023.May.19 (0.0.21)
  * "Disable Magic Sizes" added to "Simplification",
    to match new setting in Tux Paint 0.9.30.
    Bill Kendrick <bill%newbreedsoftware.com@localhost>

  * Canvas size calculation appears, based on window size,
    orientation, button size, and color rows.
    Closes https://sourceforge.net/p/tuxpaint/feature-requests/106/
    Bill Kendrick <bill%newbreedsoftware.com@localhost>

  * Created "src/indent.sh", to run 'indent' against source files.
    Ran it during 0.0.21 development.
    Bill Kendrick <bill%newbreedsoftware.com@localhost>

  * New "haiku" Makefile target that builds with "-lintl"
    Luc 'Begasus' Schrijvers <begasus%gmail.com@localhost>
    and Bill Kendrick <bill%newbreedsoftware.com@localhost>

  * Fix path for tuxpaint.cfg on Haiku
    Luc 'Begasus' Schrijvers <begasus%gmail.com@localhost>

2023.April.2 (0.0.20)
  * "Disable Stamp Rotation" added to "Simplification",
    to match new setting in Tux Paint 0.9.29.
    Bill Kendrick <bill%newbreedsoftware.com@localhost>

  * "Button Size: Auto" added to "Video/Sound",
    to match new setting option in Tux Paint 0.9.29.
    Bill Kendrick <bill%newbreedsoftware.com@localhost>

  * Option to set joystick button to activate "Fill" tool
    (Closes https://sourceforge.net/p/tuxpaint/feature-requests/199/)
    Bill Kendrick <bill%newbreedsoftware.com@localhost>

  * [WIN32] Require "administrator" privileges
    to enable saving changes for "All Users" to the file in the system directory.
    TOYAMA Shin-ichi <dolphin6k%wmail.plala.or.jp@localhost>

  * Added additional headings, some recently-added options
    (and older, missing ones), and fleshed out the Joystick
    section of Tux Paint Config.'s README.
    Bill Kendrick <bill%newbreedsoftware.com@localhost>

2022.June.3 (0.0.19)
  * "Reverse Sort" option added to "Saving",
    to match new setting in Tux Paint 0.9.28.

  * "Disable Brush spacing" option added to "Simplification",
    to match new setting in Tux Paint 0.9.28.

  * Improved layout to Saving tab
    TOYAMA Shin-ichi <dolphin6k%wmail.plala.or.jp@localhost>
    Bill Kendrick <bill%newbreedsoftware.com@localhost>

  * Build updates:
    * macOS
      Mark Kim <markuskimius%gmail.com@localhost>
      * Applying to Tux Paint Config the same changes already made to the main
        Tux Paint application:
        * build-app.sh uses character class [[:space:]] instead of \t for
          compatibility with newer tools.
        * Add macos/build-universal.sh for building the universal binary.
        * Provide universal binary build instructions.
        * Small tweaks to the Makefile to better guide the user on the next
          steps and make the universal binary build instructions clearer.
      * Remove the `--openfolder` option when calling `bless` from Apple
        Silicon.  This option is no longer valid on Apple Silicon as of the
        March 2022 release of Xcode.

2021.November.25 (0.0.18)
  * Interface improvements:
    + Scaling up the Tux Paint Config. window size and
      font size of text shown in the UI, when the screen has
      a high DPI (>= 120) and sufficienlty high resolution
      (>= 1280 wide x >= 900 high).

      (Set an environment variable "TPC_SIZE=small" to
      override this, and use the smaller window & font sizes.
      "TCP_SIZE=large" can be supplied to force a larger UI.)

    + Made widget and label spacing and positioning more dynamic, to
      help with both high-DPI support (above) as well as better
      handling of UI when running in locales that have longer strings.

    + Allow window to be resized.

    Bill Kendrick <bill%newbreedsoftware.com@localhost>
    TOYAMA Shin-ichi <dolphin6k%wmail.plala.or.jp@localhost>
    Pere Pujal i Carabantes <perepujal%gmail.com@localhost>

  * New features:
    + "Use 'All Users' Settings" checkbox replaced with a
      3-way selection dialog that allows the local config
      to either (a) ignore system-wide configurations,
      and ONLY use the local config's, (b) merge the
      system-wide configuration with the local one
      (the previous default behavior) or (c) use only
      the system-wide one (deletes the local config file).
      (https://sourceforge.net/p/tuxpaint/bugs/201/)
      - MD Ekramul Ansari <https://sourceforge.net/u/ekramula2>
        (h/t Pere Pujal i Carabantes for 'rebasing' Erkamul's
        original patch from 2015(!); some bugfixing by Bill K.)

  * Localization updates:
    + Catalan translation
      Pere Pujal i Carabantes <perepujal%gmail.com@localhost>

    + French translation
      Chion Jacques <jacques.chion%orange.fr@localhost>

    + Galician translation
      Miguel Bouzada <mbouzada%gmail.com@localhost>

    + Icelandic translation
      Sveinn í Felli <sv1%fellsnet.is@localhost>

    + Japanese translation
      TOYAMA Shin-ichi <dolphin6k%wmail.plala.or.jp@localhost>

    + Portugues translatione
      Hugo Carvalho <hugokarvalho%hotmail.com@localhost>

    + Allowing translations which fail to word-wrap naturally
      in FLTK due to lack of explicit whitespace (e.g. Japanese)
      to wrap (without resorting to including "\n" linebreaks
      within the translated strings), as FLTK doesn't handle
      this itself (as of v.1.3.4).  Utilizes `unibreak` library.

    + Default language option is now localizable (had always
      appeared in English).
      (Shin-ichi with tweaks by Bill)

 * Bug fixes
   * Some settings could not be reset to their defaults; mended.
     ("Button size", "Color palette rows", "Colors last in 'New' dialog",
     "Disable Magic Controls", "Disable Shape Controls", and
     "Disable 'Label' Tool")

2021.June.28 (0.0.17)
  * Moved "Alternative Color Palette" option from
    "Video/Sound" to "Data".

  * Added an "Interface Size" section to "Video/Sound", with
    sliders to control:
    + interface button size ("buttonsize")
    + number of color palette rows ("colorsrows")

  * macOS support for All Users
    macOS can once again save settings for All Users on modern macOS that
    requires authentication before writing to a global settings directory.
    The user, assuming one is of an admin user type, is prompted for their
    password when saving to the All Users directory.
    Mark K. Kim <markuskimius%gmail.com@localhost>

  * Documentation updates:
    * Added macOS installation instructions.
      Mark K. Kim <markuskimius%gmail.com@localhost>

  * Build updates:
    * Fix -Wexpansion-to-defined warning
      Mark K. Kim <markuskimius%gmail.com@localhost>

2020.December.27 (0.0.16)
  * Added "User Alternative Export Direction" option,
    under "Saving" section, to match option provided for
    new Tux Paint features (export image and export animated GIF).

  * Added "Disable Shape Controls" option,
    under "Simplification" section, to match new Tux Paint option.

  * Build updates:
    * Support for Mingw64 for 64-bit builds
      TOYAMA Shin-ichi <dolphin6k%wmail.plala.or.jp@localhost>

  * Added option for the Sardinian language.

  * Added to README the descriptions of some options which
    were previously missing.

2020.May.29 (0.0.15)
  * Added "'New' colors last", to match new Tux Paint feature.
    (Also, renamed "Start Blank" group to "Starting Out".)

  * Added "Stereo" option, to match new Tux Paint feature.

  * Build updates:
    + Allow DESTDIR to be used to specify a packaging directory.
      Tim Dickson <dickson.tim%googlemail.com@localhost>
      (Reflected for macOS: Mark K. Kim <markuskimius%gmail.com@localhost>)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/tuxpaint-config/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/tuxpaint-config/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/tuxpaint-config/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/tuxpaint-config/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/graphics/tuxpaint-config/Makefile
diff -u pkgsrc/graphics/tuxpaint-config/Makefile:1.28 pkgsrc/graphics/tuxpaint-config/Makefile:1.29
--- pkgsrc/graphics/tuxpaint-config/Makefile:1.28       Sun Nov 12 13:22:19 2023
+++ pkgsrc/graphics/tuxpaint-config/Makefile    Fri Nov 29 22:59:41 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2023/11/12 13:22:19 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2024/11/29 22:59:41 wiz Exp $
 
-DISTNAME=              tuxpaint-config-0.0.14
-PKGREVISION=           4
+DISTNAME=              tuxpaint-config-0.0.25
 CATEGORIES=            graphics
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
 
@@ -11,15 +10,19 @@ COMMENT=            Configuration program for tuxp
 LICENSE=               gnu-gpl-v2
 
 USE_LANGUAGES=         c++
-USE_TOOLS+=            gmake msgfmt
+USE_TOOLS+=            gmake msgfmt pkg-config
 
-INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX}
-INSTALL_MAKE_FLAGS+=   MAN_PREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}
-MAKE_FLAGS+=           ARCH_LINKS=-lintl
+INSTALL_MAKE_FLAGS+=   PREFIX=${PREFIX}
+INSTALL_MAKE_FLAGS+=   MAN_PREFIX=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=           CFLAGS=${CFLAGS:Q}
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
+.include "../../textproc/libunibreak/buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tuxpaint-config/PLIST
diff -u pkgsrc/graphics/tuxpaint-config/PLIST:1.7 pkgsrc/graphics/tuxpaint-config/PLIST:1.8
--- pkgsrc/graphics/tuxpaint-config/PLIST:1.7   Sun Sep  2 12:55:25 2018
+++ pkgsrc/graphics/tuxpaint-config/PLIST       Fri Nov 29 22:59:41 2024
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2018/09/02 12:55:25 wiz Exp $
-X11R6/include/X11/pixmaps/tuxpaint-config.xpm
+@comment $NetBSD: PLIST,v 1.8 2024/11/29 22:59:41 wiz Exp $
 bin/tuxpaint-config
+include/X11/pixmaps/tuxpaint-config.xpm
 man/man1/tuxpaint-config.1
+share/applications/tuxpaint-config.desktop
 share/doc/tuxpaint-config/AUTHORS.txt
 share/doc/tuxpaint-config/CHANGES.txt
 share/doc/tuxpaint-config/COPYING.txt
 share/doc/tuxpaint-config/README.txt
 share/doc/tuxpaint-config/TODO.txt
 share/doc/tuxpaint-config/html/README.html
+share/icons/hicolor/16x16/apps/tuxpaint-config.png
+share/icons/hicolor/32x32/apps/tuxpaint-config.png
+share/icons/hicolor/48x48/apps/tuxpaint-config.png
 share/locale/ach/LC_MESSAGES/tuxpaint-config.mo
 share/locale/an/LC_MESSAGES/tuxpaint-config.mo
 share/locale/ar/LC_MESSAGES/tuxpaint-config.mo
@@ -51,6 +55,7 @@ share/locale/sat/LC_MESSAGES/tuxpaint-co
 share/locale/sk/LC_MESSAGES/tuxpaint-config.mo
 share/locale/sl/LC_MESSAGES/tuxpaint-config.mo
 share/locale/son/LC_MESSAGES/tuxpaint-config.mo
+share/locale/sq/LC_MESSAGES/tuxpaint-config.mo
 share/locale/sr/LC_MESSAGES/tuxpaint-config.mo
 share/locale/sr@latin/LC_MESSAGES/tuxpaint-config.mo
 share/locale/sv/LC_MESSAGES/tuxpaint-config.mo
@@ -58,6 +63,7 @@ share/locale/tr/LC_MESSAGES/tuxpaint-con
 share/locale/uk/LC_MESSAGES/tuxpaint-config.mo
 share/locale/vec/LC_MESSAGES/tuxpaint-config.mo
 share/locale/vi/LC_MESSAGES/tuxpaint-config.mo
+share/locale/zh_CN/LC_MESSAGES/tuxpaint-config.mo
 share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo
 share/locale/zu/LC_MESSAGES/tuxpaint-config.mo
 share/pixmaps/tuxpaint-config.png

Index: pkgsrc/graphics/tuxpaint-config/distinfo
diff -u pkgsrc/graphics/tuxpaint-config/distinfo:1.13 pkgsrc/graphics/tuxpaint-config/distinfo:1.14
--- pkgsrc/graphics/tuxpaint-config/distinfo:1.13       Tue Oct 26 10:47:21 2021
+++ pkgsrc/graphics/tuxpaint-config/distinfo    Fri Nov 29 22:59:41 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:47:21 nia Exp $
+$NetBSD: distinfo,v 1.14 2024/11/29 22:59:41 wiz Exp $
 
-BLAKE2s (tuxpaint-config-0.0.14.tar.gz) = 7b515ff83dcdba017c619a9175e98a5f064cf63e22bd6dc7b1b0d6cdc4af0c62
-SHA512 (tuxpaint-config-0.0.14.tar.gz) = 2e4482189fed81a7a82f41773a527c5b391ed19800279a1684634fdfd25f5c7f19c4ee42f483e0f3b8a683912c163f9846fc32f663e8fac0f7cf6d8a98c6740c
-Size (tuxpaint-config-0.0.14.tar.gz) = 472856 bytes
-SHA1 (patch-Makefile) = 2756de7b3b757420eb7e2b1eca9f39e9c39692b0
+BLAKE2s (tuxpaint-config-0.0.25.tar.gz) = 6734c115e99d3a35eebe90c4c590bfda6d6cf2c38e0cae1cbb14f19b95d18ac8
+SHA512 (tuxpaint-config-0.0.25.tar.gz) = e572f69605e98e862fb89035303c7700ecc03b6401bdbd7340199324d02355aa7f95683bc46cf24a2076ac7bdd27593311b9de9d68ce1e8173dc357898ac6c35
+Size (tuxpaint-config-0.0.25.tar.gz) = 893708 bytes
+SHA1 (patch-Makefile) = 29b063317eb6f2f58dcb4f5e54bf0c259fc1f74a

Index: pkgsrc/graphics/tuxpaint-config/patches/patch-Makefile
diff -u pkgsrc/graphics/tuxpaint-config/patches/patch-Makefile:1.2 pkgsrc/graphics/tuxpaint-config/patches/patch-Makefile:1.3
--- pkgsrc/graphics/tuxpaint-config/patches/patch-Makefile:1.2  Mon Apr 20 00:38:59 2020
+++ pkgsrc/graphics/tuxpaint-config/patches/patch-Makefile      Fri Nov 29 22:59:41 2024
@@ -1,27 +1,9 @@
-$NetBSD: patch-Makefile,v 1.2 2020/04/20 00:38:59 joerg Exp $
+$NetBSD: patch-Makefile,v 1.3 2024/11/29 22:59:41 wiz Exp $
 
 Ensure that trans directory is made before trying to put files in it.
 
 --- Makefile.orig      2018-08-28 17:18:29.000000000 +0000
 +++ Makefile
-@@ -165,7 +165,7 @@ win32:
-               ICON_PREFIX=./ \
-               X11_ICON_PREFIX=./ \
-               CONFDIR=$(PREFIX)/etc/tuxpaint \
--              ARCH_LINKS=$(shell if [ "x$$OSTYPE" == "xcygwin" ]; then echo -n "-lintl"; else echo -n "-lintl-8"; fi ) \
-+              ARCH_LINKS=$(shell if [ "x$$OSTYPE" = "xcygwin" ]; then echo -n "-lintl"; else echo -n "-lintl-8"; fi ) \
-               ARCH_LIBS="obj/resource.o obj/win32utils.o" \
-               PAPER_LIB= 
- 
-@@ -176,7 +176,7 @@ install-win32:
-               ICON_PREFIX=./ \
-               X11_ICON_PREFIX=./ \
-               CONFDIR=$(PREFIX)/etc/tuxpaint \
--              ARCH_LINKS=$(shell if [ "x$$OSTYPE" == "xcygwin" ]; then echo -n "-lintl"; else echo -n "-lintl-8"; fi ) \
-+              ARCH_LINKS=$(shell if [ "x$$OSTYPE" = "xcygwin" ]; then echo -n "-lintl"; else echo -n "-lintl-8"; fi ) \
-               ARCH_LIBS="obj/resource.o obj/win32utils.o"
- 
- # "make install" installs all of the various parts
 @@ -406,7 +406,7 @@ endif
  
  # Build the translation files for gettext