CVS commit: pkgsrc/graphics/gimp-devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr  8 12:22:12 UTC 2025

Modified Files:
        pkgsrc/graphics/gimp-devel: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/gimp-devel/patches: patch-app-tools_meson.build
Removed Files:
        pkgsrc/graphics/gimp-devel/patches: patch-tools_in-build-gimp.sh

Log Message:
gimp-devel: updated to 3.0.2

Overview of Changes from GIMP 3.0.0 to GIMP 3.0.2

This is a bug-fix only release.

Core:

  - Mark some strings translatable.
  - Fix crash when choosing a brush in grid view.
  - Windows: temporary revert of some Input Device handling code which
    was breaking pressure sensitivity for some graphics tablets (though
    this revert may make issues with the eraser tip).
  - Fix crash when choosing a non-existing font in text tool options.

Tools:

  - Reorder Line Art Detection options per design decision.

Graphical User Interface:

  - Keep headerbar color consistent when out of focus.
  - Histogram uses the luminance value of the foreground color as a
    threshold to lighten or darken the border color for contrast with
    the histogram itself.
  - Improve separation between panels in dark theme.
  - Add default response for GimpQueryBox dialogues.
  - Spacing between toolbox widgets improved.
  - GimpSpinScale slider colors inverted.
  - New icons: "gimp-toggle-on" and "gimp-toggle-off" and using them in
    the Search Action's list as icons for toggle actions.

Plug-ins:

  - Python Console uses the luminance of the background color for error
    text.
  - Metadata Editor: fix buffer overflow.
  - Gradient Flare: fix crash when setting the size to 0.
  - Screenshot: X11 implementation is bypassed (in favor of portals)
    when running on XWayland.

Build:

  - Various packaging fixes and cleanup.
  - The Windows installer now prompts (only in user installation) about
    deleting GIMP config files when uninstalling.
  - GEGL 0.4.58 is now our minimum requirement.
  - Windows installer: create Restore Point on system-wide install.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/graphics/gimp-devel/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/gimp-devel/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/gimp-devel/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/gimp-devel/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gimp-devel/patches/patch-app-tools_meson.build
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/gimp-devel/patches/patch-tools_in-build-gimp.sh

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

Modified files:

Index: pkgsrc/graphics/gimp-devel/Makefile
diff -u pkgsrc/graphics/gimp-devel/Makefile:1.58 pkgsrc/graphics/gimp-devel/Makefile:1.59
--- pkgsrc/graphics/gimp-devel/Makefile:1.58    Wed Feb 26 16:25:57 2025
+++ pkgsrc/graphics/gimp-devel/Makefile Tue Apr  8 12:22:11 2025
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2025/02/26 16:25:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.59 2025/04/08 12:22:11 adam Exp $
 
-DISTNAME=      gimp-3.0.0-RC3
-PKGNAME=       ${DISTNAME:S/gimp/gimp-devel/:S/-RC/rc/}
-PKGREVISION=   2
+DISTNAME=      gimp-3.0.2
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz
@@ -22,8 +20,8 @@ DEPENDS+=     ${PYPKGPREFIX}-gobject3-[0-9]*
 
 CONFLICTS+=    gimp-[0-9]*
 
-USE_LANGUAGES+=                c c++
-USE_CXX_FEATURES+=     c++14
+USE_CXX_FEATURES=      c++14
+USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 
 USE_TOOLS+=            pkg-config perl realpath
@@ -50,6 +48,8 @@ REPLACE_PYTHON+=      plug-ins/python/*/*.py
 REPLACE_PYTHON+=       tools/*.py
 REPLACE_PYTHON+=       extensions/goat-exercises/goat-exercise-py3.py
 
+REPLACE_SH=            tools/in-build-gimp.sh
+
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/gimp/3.0
 EGDIR=                 ${PREFIX}/share/examples/gimp
 .for f in controllerrc gimp.css gimprc sessionrc templaterc toolrc unitrc
@@ -58,18 +58,39 @@ CONF_FILES+=                ${EGDIR}/${f} ${PKG_SYSCON
 
 INSTALLATION_DIRS=     share/examples
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+# libgimpwidgets/gimppickbutton-quartz.c: error: 'CGWindowListCreateImage' is unavailable: obsoleted in macOS 15.0
+.  if ${OPSYS_VERSION} >= 150000
+MAKE_ENV+=     MACOSX_DEPLOYMENT_TARGET=14.0
+.  endif
+MAKE_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/output/libgimp
+
+.PHONY: fix-modules-id
+post-install: fix-modules-id
+fix-modules-id:
+       cd ${DESTDIR}; \
+       for i in $$(${FIND} .${PREFIX}/lib -name '*.so' | ${SED} -e 's|^\./||'); do \
+          install_name_tool -id /$$i $$i; \
+        done
+.endif
+
 post-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/share/examples/gimp
        ${MV} ${DESTDIR}${PREFIX}/etc/gimp/3.0 ${DESTDIR}${PREFIX}/share/examples/gimp
 
 .include "options.mk"
+
+PLIST_VARS+=   xmc
+
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
-.include "../../archivers/xz/buildlink3.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/appstream-glib/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.12.4
 .include "../../fonts/fontconfig/buildlink3.mk"
@@ -97,16 +118,22 @@ BUILDLINK_API_DEPENDS.gexiv2+=             gexiv2>=
 BUILDLINK_API_DEPENDS.tiff+=   tiff>=4.0
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
-.include "../../lang/vala/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/vala/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../print/poppler-data/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=        poppler>=23.12.0
 .include "../../print/poppler/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.gtk3:Mx11}
 .include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+PRINT_PLIST_AWK+=       { if (/file-xmc/) $$0 = "$${PLIST.xmc}" $$0 }
+PLIST.xmc=             yes
 .include "../../x11/libXmu/buildlink3.mk"
+.endif
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../lang/python/tool.mk"

Index: pkgsrc/graphics/gimp-devel/PLIST
diff -u pkgsrc/graphics/gimp-devel/PLIST:1.10 pkgsrc/graphics/gimp-devel/PLIST:1.11
--- pkgsrc/graphics/gimp-devel/PLIST:1.10       Tue Feb 11 13:24:24 2025
+++ pkgsrc/graphics/gimp-devel/PLIST    Tue Apr  8 12:22:11 2025
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2025/02/11 13:24:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2025/04/08 12:22:11 adam Exp $
 bin/gimp
 bin/gimp-3
 bin/gimp-3.0
 bin/gimp-console
 bin/gimp-console-3
 bin/gimp-console-3.0
+bin/gimp-debug-tool
+bin/gimp-debug-tool-3
+bin/gimp-debug-tool-3.0
 bin/gimp-script-fu-interpreter-3.0
 bin/gimp-test-clipboard
 bin/gimp-test-clipboard-3
@@ -12,6 +15,7 @@ bin/gimp-test-clipboard-3.0
 bin/gimptool
 bin/gimptool-3
 bin/gimptool-3.0
+@pkgdir etc/gimp
 include/gimp-3.0/libgimp/gimp.h
 include/gimp-3.0/libgimp/gimp_pdb.h
 include/gimp-3.0/libgimp/gimp_pdb_headers.h
@@ -406,7 +410,7 @@ lib/gimp/3.0/plug-ins/file-wbmp/file-wbm
 lib/gimp/3.0/plug-ins/file-webp/file-webp
 lib/gimp/3.0/plug-ins/file-wmf/file-wmf
 lib/gimp/3.0/plug-ins/file-xbm/file-xbm
-lib/gimp/3.0/plug-ins/file-xmc/file-xmc
+${PLIST.xmc}lib/gimp/3.0/plug-ins/file-xmc/file-xmc
 ${PLIST.xpm}lib/gimp/3.0/plug-ins/file-xpm/file-xpm
 lib/gimp/3.0/plug-ins/file-xwd/file-xwd
 lib/gimp/3.0/plug-ins/film/film
@@ -464,40 +468,37 @@ lib/girepository-1.0/Gimp-3.0.typelib
 lib/girepository-1.0/GimpUi-3.0.typelib
 lib/libgimp-3.0.so
 lib/libgimp-3.0.so.0
-lib/libgimp-3.0.so.0.0.0
+lib/libgimp-3.0.so.0.0.2
 lib/libgimp-scriptfu-3.0.so
 lib/libgimp-scriptfu-3.0.so.0
-lib/libgimp-scriptfu-3.0.so.0.0.0
+lib/libgimp-scriptfu-3.0.so.0.0.2
 lib/libgimpbase-3.0.so
 lib/libgimpbase-3.0.so.0
-lib/libgimpbase-3.0.so.0.0.0
+lib/libgimpbase-3.0.so.0.0.2
 lib/libgimpcolor-3.0.so
 lib/libgimpcolor-3.0.so.0
-lib/libgimpcolor-3.0.so.0.0.0
+lib/libgimpcolor-3.0.so.0.0.2
 lib/libgimpconfig-3.0.so
 lib/libgimpconfig-3.0.so.0
-lib/libgimpconfig-3.0.so.0.0.0
+lib/libgimpconfig-3.0.so.0.0.2
 lib/libgimpmath-3.0.so
 lib/libgimpmath-3.0.so.0
-lib/libgimpmath-3.0.so.0.0.0
+lib/libgimpmath-3.0.so.0.0.2
 lib/libgimpmodule-3.0.so
 lib/libgimpmodule-3.0.so.0
-lib/libgimpmodule-3.0.so.0.0.0
+lib/libgimpmodule-3.0.so.0.0.2
 lib/libgimpthumb-3.0.so
 lib/libgimpthumb-3.0.so.0
-lib/libgimpthumb-3.0.so.0.0.0
+lib/libgimpthumb-3.0.so.0.0.2
 lib/libgimpui-3.0.so
 lib/libgimpui-3.0.so.0
-lib/libgimpui-3.0.so.0.0.0
+lib/libgimpui-3.0.so.0.0.2
 lib/libgimpwidgets-3.0.so
 lib/libgimpwidgets-3.0.so.0
-lib/libgimpwidgets-3.0.so.0.0.0
+lib/libgimpwidgets-3.0.so.0.0.2
 lib/pkgconfig/gimp-3.0.pc
 lib/pkgconfig/gimpthumb-3.0.pc
 lib/pkgconfig/gimpui-3.0.pc
-libexec/gimp-debug-tool
-libexec/gimp-debug-tool-3
-libexec/gimp-debug-tool-3.0
 man/man1/gimp-3.0.1
 man/man1/gimp-3.1
 man/man1/gimp-console-3.0.1
@@ -594,6 +595,7 @@ share/gimp/3.0/dynamics/Track-Direction.
 share/gimp/3.0/dynamics/Velocity-Tapering.gdyn
 share/gimp/3.0/file-raw/file-darktable-export-on-exit.lua
 share/gimp/3.0/file-raw/file-darktable-get-size.lua
+@pkgdir share/gimp/3.0/fonts
 share/gimp/3.0/fractalexplorer/Asteroid_Field
 share/gimp/3.0/fractalexplorer/Bar_Code_Label
 share/gimp/3.0/fractalexplorer/Beauty_of_Nature
@@ -1291,6 +1293,10 @@ share/gimp/3.0/icons/Default/scalable/ap
 share/gimp/3.0/icons/Default/scalable/apps/gimp-text-dir-ttb-rtl.svg
 share/gimp/3.0/icons/Default/scalable/apps/gimp-text-layer-symbolic.svg
 share/gimp/3.0/icons/Default/scalable/apps/gimp-text-layer.svg
+share/gimp/3.0/icons/Default/scalable/apps/gimp-toggle-off-symbolic.svg
+share/gimp/3.0/icons/Default/scalable/apps/gimp-toggle-off.svg
+share/gimp/3.0/icons/Default/scalable/apps/gimp-toggle-on-symbolic.svg
+share/gimp/3.0/icons/Default/scalable/apps/gimp-toggle-on.svg
 share/gimp/3.0/icons/Default/scalable/apps/gimp-toilet-paper-symbolic.svg
 share/gimp/3.0/icons/Default/scalable/apps/gimp-toilet-paper.svg
 share/gimp/3.0/icons/Default/scalable/apps/gimp-tool-airbrush-symbolic.svg
@@ -1921,6 +1927,10 @@ share/gimp/3.0/icons/Legacy/scalable/app
 share/gimp/3.0/icons/Legacy/scalable/apps/gimp-shred.svg
 share/gimp/3.0/icons/Legacy/scalable/apps/gimp-smartphone.svg
 share/gimp/3.0/icons/Legacy/scalable/apps/gimp-symmetry.svg
+share/gimp/3.0/icons/Legacy/scalable/apps/gimp-toggle-off-symbolic.svg
+share/gimp/3.0/icons/Legacy/scalable/apps/gimp-toggle-off.svg
+share/gimp/3.0/icons/Legacy/scalable/apps/gimp-toggle-on-symbolic.svg
+share/gimp/3.0/icons/Legacy/scalable/apps/gimp-toggle-on.svg
 share/gimp/3.0/icons/Legacy/scalable/apps/gimp-tool-airbrush.svg
 share/gimp/3.0/icons/Legacy/scalable/apps/gimp-tool-align.svg
 share/gimp/3.0/icons/Legacy/scalable/apps/gimp-tool-blur.svg
@@ -2612,5 +2622,3 @@ share/vala/vapi/gimp-3.0.deps
 share/vala/vapi/gimp-3.0.vapi
 share/vala/vapi/gimp-ui-3.0.deps
 share/vala/vapi/gimp-ui-3.0.vapi
-@pkgdir share/gimp/3.0/fonts
-@pkgdir etc/gimp

Index: pkgsrc/graphics/gimp-devel/buildlink3.mk
diff -u pkgsrc/graphics/gimp-devel/buildlink3.mk:1.14 pkgsrc/graphics/gimp-devel/buildlink3.mk:1.15
--- pkgsrc/graphics/gimp-devel/buildlink3.mk:1.14       Fri Dec 27 08:19:55 2024
+++ pkgsrc/graphics/gimp-devel/buildlink3.mk    Tue Apr  8 12:22:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2024/12/27 08:19:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2025/04/08 12:22:11 adam Exp $
 
 BUILDLINK_TREE+=       gimp-devel
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        gimp-devel
 GIMP_DEVEL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gimp-devel+=     gimp-devel>=2.99.10
-BUILDLINK_ABI_DEPENDS.gimp-devel?=     gimp-devel>=3.0.0rc1nb4
+BUILDLINK_ABI_DEPENDS.gimp-devel+=     gimp-devel>=3.0.0rc1nb4
 BUILDLINK_PKGSRCDIR.gimp-devel?=       ../../graphics/gimp-devel
 
 .include "../../graphics/gegl/buildlink3.mk"

Index: pkgsrc/graphics/gimp-devel/distinfo
diff -u pkgsrc/graphics/gimp-devel/distinfo:1.11 pkgsrc/graphics/gimp-devel/distinfo:1.12
--- pkgsrc/graphics/gimp-devel/distinfo:1.11    Tue Feb 11 13:24:24 2025
+++ pkgsrc/graphics/gimp-devel/distinfo Tue Apr  8 12:22:11 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2025/02/11 13:24:24 wiz Exp $
+$NetBSD: distinfo,v 1.12 2025/04/08 12:22:11 adam Exp $
 
-BLAKE2s (gimp-3.0.0-RC3.tar.xz) = 1c6b4ae8fbd27ccdc0decd33bb870678f80ac02ea673145b1ac4fb971a31ae48
-SHA512 (gimp-3.0.0-RC3.tar.xz) = f6da664aadc312cdfac248fb1d3d8eb681aff50b8b0dee6f5c23cfa768eb4899386f470d19e797d0b1ee24746c88c7c12b609c3dc091acd2a625baf0b028285f
-Size (gimp-3.0.0-RC3.tar.xz) = 27043600 bytes
-SHA1 (patch-tools_in-build-gimp.sh) = ce71d7d06de1f081336fdfbf40e12e9e1bf6a6ec
+BLAKE2s (gimp-3.0.2.tar.xz) = 667512bdaac7eaa9d990f980b989e6b0230ffc45cec55a0afdfe16e6d60299c8
+SHA512 (gimp-3.0.2.tar.xz) = e5f72f9f1447ff3ec5ab78bc589831767c00be91a0f337b1ab2d5beee3f79b01464c3de0dc1a518fd72180b4232be5b8d7121d186425a766090842b550f534df
+Size (gimp-3.0.2.tar.xz) = 27019468 bytes
+SHA1 (patch-app-tools_meson.build) = 490d76d6c9f51c1fffbb0710683e35ac9cf5a267

Added files:

Index: pkgsrc/graphics/gimp-devel/patches/patch-app-tools_meson.build
diff -u /dev/null pkgsrc/graphics/gimp-devel/patches/patch-app-tools_meson.build:1.1
--- /dev/null   Tue Apr  8 12:22:12 2025
+++ pkgsrc/graphics/gimp-devel/patches/patch-app-tools_meson.build      Tue Apr  8 12:22:12 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-app-tools_meson.build,v 1.1 2025/04/08 12:22:12 adam Exp $
+
+Be consistant across platforms.
+
+--- app-tools/meson.build.orig 2025-04-08 11:51:45.533892799 +0000
++++ app-tools/meson.build
+@@ -1,8 +1,4 @@
+-if platform_windows or platform_osx
+-  gimp_debug_tool_dir = get_option('bindir')
+-else
+-  gimp_debug_tool_dir = get_option('libexecdir')
+-endif
++gimp_debug_tool_dir = get_option('bindir')
+ 
+ 
+ gimp_debug_tool = executable('gimp-debug-tool' + exec_ver,