CVS commit: pkgsrc/graphics/gimp-devel

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 11 13:24:24 UTC 2025

Modified Files:
        pkgsrc/graphics/gimp-devel: Makefile PLIST distinfo
        pkgsrc/graphics/gimp-devel/patches: patch-tools_in-build-gimp.sh

Log Message:
gimp-devel: simplify; add libjxl support; add upstream bug report URL


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/gimp-devel/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/gimp-devel/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/gimp-devel/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.55 pkgsrc/graphics/gimp-devel/Makefile:1.56
--- pkgsrc/graphics/gimp-devel/Makefile:1.55    Tue Feb 11 13:15:13 2025
+++ pkgsrc/graphics/gimp-devel/Makefile Tue Feb 11 13:24:23 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2025/02/11 13:15:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.56 2025/02/11 13:24:23 wiz Exp $
 
 DISTNAME=      gimp-3.0.0-RC3
 PKGNAME=       ${DISTNAME:S/gimp/gimp-devel/:S/-RC/rc/}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz
@@ -47,31 +48,19 @@ REPLACE_PYTHON+=    plug-ins/python/*/*.py
 REPLACE_PYTHON+=       tools/*.py
 REPLACE_PYTHON+=       extensions/goat-exercises/goat-exercise-py3.py
 
-# GCC 4.x C++14 support is not new enough.
-GCC_REQD+=     5
-
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/gimp/3.0
 EGDIR=                 ${PREFIX}/share/examples/gimp
 .for f in controllerrc gimp.css gimprc sessionrc templaterc toolrc unitrc
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/gimp/3.0/${f}
 .endfor
 
-# checking for xgettext version (>= 0.19)... no
-_TOOLS_USE_PKGSRC.xgettext=    yes
-
-.include "../../mk/bsd.prefs.mk"
-
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 INSTALLATION_DIRS=     share/examples
 
 post-install:
        ${MV} ${DESTDIR}${PREFIX}/etc/gimp/3.0 ${DESTDIR}${PREFIX}/share/examples/gimp
 
 .include "options.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../devel/appstream-glib/buildlink3.mk"
@@ -84,7 +73,7 @@ BUILDLINK_API_DEPENDS.fontconfig+=    fontc
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.babl+=           babl>=0.1.110
 .include "../../graphics/babl/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gegl+=           gegl>=0.4.52
+BUILDLINK_API_DEPENDS.gegl+=           gegl>=0.4.54
 .include "../../graphics/gegl/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
@@ -95,7 +84,7 @@ BUILDLINK_API_DEPENDS.gexiv2+=                gexiv2>=
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libheif/buildlink3.mk"
-#.include "../../wip/libjxl/buildlink3.mk"
+.include "../../graphics/libjxl/buildlink3.mk"
 .include "../../graphics/libmypaint/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/mypaint-brushes1/buildlink3.mk"

Index: pkgsrc/graphics/gimp-devel/PLIST
diff -u pkgsrc/graphics/gimp-devel/PLIST:1.9 pkgsrc/graphics/gimp-devel/PLIST:1.10
--- pkgsrc/graphics/gimp-devel/PLIST:1.9        Tue Feb 11 13:15:13 2025
+++ pkgsrc/graphics/gimp-devel/PLIST    Tue Feb 11 13:24:24 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2025/02/11 13:15:13 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.10 2025/02/11 13:24:24 wiz Exp $
 bin/gimp
 bin/gimp-3
 bin/gimp-3.0
@@ -381,6 +381,7 @@ lib/gimp/3.0/plug-ins/file-icns/file-icn
 lib/gimp/3.0/plug-ins/file-ico/file-ico
 lib/gimp/3.0/plug-ins/file-jp2-load/file-jp2-load
 lib/gimp/3.0/plug-ins/file-jpeg/file-jpeg
+lib/gimp/3.0/plug-ins/file-jpegxl/file-jpegxl
 ${PLIST.mng}lib/gimp/3.0/plug-ins/file-mng/file-mng
 lib/gimp/3.0/plug-ins/file-openraster/file-openraster.py
 lib/gimp/3.0/plug-ins/file-pat/file-pat

Index: pkgsrc/graphics/gimp-devel/distinfo
diff -u pkgsrc/graphics/gimp-devel/distinfo:1.10 pkgsrc/graphics/gimp-devel/distinfo:1.11
--- pkgsrc/graphics/gimp-devel/distinfo:1.10    Tue Feb 11 13:15:13 2025
+++ pkgsrc/graphics/gimp-devel/distinfo Tue Feb 11 13:24:24 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2025/02/11 13:15:13 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2025/02/11 13:24:24 wiz 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) = 249f6dc15d46477299667ccd6d9c04f4d64ca897
+SHA1 (patch-tools_in-build-gimp.sh) = ce71d7d06de1f081336fdfbf40e12e9e1bf6a6ec

Index: pkgsrc/graphics/gimp-devel/patches/patch-tools_in-build-gimp.sh
diff -u pkgsrc/graphics/gimp-devel/patches/patch-tools_in-build-gimp.sh:1.1 pkgsrc/graphics/gimp-devel/patches/patch-tools_in-build-gimp.sh:1.2
--- pkgsrc/graphics/gimp-devel/patches/patch-tools_in-build-gimp.sh:1.1 Tue Feb 11 13:15:13 2025
+++ pkgsrc/graphics/gimp-devel/patches/patch-tools_in-build-gimp.sh     Tue Feb 11 13:24:24 2025
@@ -1,6 +1,7 @@
-$NetBSD: patch-tools_in-build-gimp.sh,v 1.1 2025/02/11 13:15:13 ryoon Exp $
+$NetBSD: patch-tools_in-build-gimp.sh,v 1.2 2025/02/11 13:24:24 wiz Exp $
 
 * Do not use gdb during build.
+https://gitlab.gnome.org/GNOME/gimp/-/issues/12904
 
 --- tools/in-build-gimp.sh.orig        2025-02-11 12:53:23.323362498 +0000
 +++ tools/in-build-gimp.sh