git: 5968644072c0 - main - graphics/gimp3-app: update to 3.0.4 release (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Wed, 09 Jul 2025 21:25:37 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5968644072c0e3b0aff26dfb4526cd3fbf548bef

commit 5968644072c0e3b0aff26dfb4526cd3fbf548bef
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-07-09 21:16:49 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-07-09 21:25:23 +0000

    graphics/gimp3-app: update to 3.0.4 release (+)
    
    While here, improve lua51 support
    
    Changelog:      https://www.gimp.org/news/2025/05/18/gimp-3-0-4-released/
---
 graphics/gimp3-app/Makefile                | 25 ++++++++++++++++++-------
 graphics/gimp3-app/distinfo                |  6 +++---
 graphics/gimp3-app/files/patch-meson.build | 20 ++++++++++++++++++++
 graphics/gimp3-app/pkg-plist               |  4 +++-
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/graphics/gimp3-app/Makefile b/graphics/gimp3-app/Makefile
index 4f8b58cd719c..e8f8239db386 100644
--- a/graphics/gimp3-app/Makefile
+++ b/graphics/gimp3-app/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gimp
-DISTVERSION=	3.0.2
-PORTREVISION=	2
+DISTVERSION=	3.0.4
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
 PKGNAMESUFFIX=	3-app
@@ -80,8 +79,8 @@ MESON_ARGS=	-Dappdata-test=disabled \
 
 OPTIONS_DEFINE?=	AALIB GHOSTSCRIPT HEIF HELP OPENJPEG JXL LIBMNG WMF DOCS VALA CFITSIO
 OPTIONS_DEFAULT?=	AALIB GHOSTSCRIPT HEIF OPENJPEG JXL WMF DOCS VALA LUA CFITSIO
-OPTIONS_RADIO=		SCRIPTS
-OPTIONS_RADIO_SCRIPTS=	LUA LUAJIT
+OPTIONS_SINGLE=		SCRIPTS
+OPTIONS_SINGLE_SCRIPTS=	LUA LUAJIT LUA_NONE
 OPTIONS_SUB=	yes
 
 AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
@@ -121,11 +120,14 @@ VALA_USES=		vala:build
 VALA_MESON_ENABLED=	vala
 
 LUA_USES=		lua:51
-LUA_MESON_TRUE=		lua
+LUA_BUILD_DEPENDS=	${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR}
+LUA_RUN_DEPENDS=	${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR}
 
 LUAJIT_DESC?=		Lua scripting language support via Luajit
 LUAJIT_USES=		luajit
-LUAJIT_MESON_TRUE=	lua
+
+LUA_NONE_DESC?=		Disable Lua scripting language support
+LUA_NONE_MESON_FALSE=	lua
 
 LIBS+=		-lexecinfo -lm
 CPE_PRODUCT=	gimp
@@ -134,12 +136,21 @@ CPE_VENDOR=	gnu
 SHEBANG_FILES=	plug-ins/python/*.py \
 		plug-ins/python/python-console/*.py \
 		extensions/goat-exercises/*.py \
-		extensions/goat-exercises/*.js
+		extensions/goat-exercises/*.js \
+		extensions/goat-exercises/*.lua
 
 SHEBANG_LANG+=	gjs
 
 PLIST_SUB+=	BINVER=${PORTVERSION:R:R} ABIVER=${PORTVERSION:R} SHLIBVER=${PORTVERSION:E}
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT}
+PLIST_SUB+=	LUASCRIPTS=""
+.else
+PLIST_SUB+=	LUASCRIPTS="@comment "
+.endif
+
 #post-patch:
 #.for s in 16 22 24 32 48 64 256
 #	@${CP} ${WRKSRC}/desktop/${s}x${s}/gimp.png ${WRKSRC}/desktop/${s}x${s}/gimp3.png
diff --git a/graphics/gimp3-app/distinfo b/graphics/gimp3-app/distinfo
index 7b8033429275..d3ecf51f1c19 100644
--- a/graphics/gimp3-app/distinfo
+++ b/graphics/gimp3-app/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742896924
-SHA256 (gimp-3.0.2.tar.xz) = 546ddc30cb2d0e79123c7fcb4d78211e1ee7a6aace91a6a0ad8cbcbf6ea571a2
-SIZE (gimp-3.0.2.tar.xz) = 27019468
+TIMESTAMP = 1752051281
+SHA256 (gimp-3.0.4.tar.xz) = 8caa2ec275bf09326575654ac276afc083f8491e7cca45d19cf29e696aecab25
+SIZE (gimp-3.0.4.tar.xz) = 27060240
diff --git a/graphics/gimp3-app/files/patch-meson.build b/graphics/gimp3-app/files/patch-meson.build
new file mode 100644
index 000000000000..7c786ab3116a
--- /dev/null
+++ b/graphics/gimp3-app/files/patch-meson.build
@@ -0,0 +1,20 @@
+--- meson.build.orig	2025-05-17 22:51:03 UTC
++++ meson.build
+@@ -1208,7 +1208,7 @@ if have_lua
+ if have_lua
+   have_lua_lgi = false
+ 
+-  foreach lua_bin : [ 'luajit', 'lua5.1', 'lua-5.1', 'lua' ]
++  foreach lua_bin : [ 'luajit', 'lua51', 'lua-5.1', 'lua' ]
+     lua = find_program(lua_bin, required: false)
+ 
+     if lua.found() and meson.can_run_host_binaries()
+@@ -1247,7 +1247,7 @@ if have_lua
+       if is_supported_lua
+         have_lua_lgi = run_command(lua, '-e',
+                                    '''
+-                                   local lgi = require 'lgi'
++                                   local lgi = require("lgi")
+                                    ''',
+                                    check: false).returncode() == 0
+       endif
diff --git a/graphics/gimp3-app/pkg-plist b/graphics/gimp3-app/pkg-plist
index ca98162cec2f..1725677a54b9 100644
--- a/graphics/gimp3-app/pkg-plist
+++ b/graphics/gimp3-app/pkg-plist
@@ -264,6 +264,7 @@ lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/goat-exercise-c
 lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/goat-exercise-c.c
 lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/goat-exercise-gjs.js
 lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/goat-exercise-py3.py
+%%LUASCRIPTS%%lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/goat-exercise-lua.lua
 %%VALA%%lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/goat-exercise-vala
 %%VALA%%lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/goat-exercise-vala.vala
 lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/locale/ar/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
@@ -335,6 +336,7 @@ lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/locale/zh_HK/LC
 lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/locale/zh_TW/LC_MESSAGES/org.gimp.extension.goat-exercises.mo
 lib/gimp/%%ABIVER%%/extensions/org.gimp.extension.goat-exercises/org.gimp.extension.goat-exercises.metainfo.xml
 lib/gimp/%%ABIVER%%/interpreters/default.interp
+%%LUASCRIPTS%%lib/gimp/%%ABIVER%%/interpreters/lua.interp
 lib/gimp/%%ABIVER%%/modules/libcolor-selector-cmyk.so
 lib/gimp/%%ABIVER%%/modules/libcolor-selector-water.so
 lib/gimp/%%ABIVER%%/modules/libcolor-selector-wheel.so
@@ -5106,7 +5108,7 @@ libexec/gimp-debug-tool-%%ABIVER%%
 %%DATADIR%%/%%ABIVER%%/icons/hicolor/scalable/actions/switch-off-symbolic.svg
 %%DATADIR%%/%%ABIVER%%/icons/hicolor/scalable/actions/switch-on-symbolic.svg
 %%DATADIR%%/%%ABIVER%%/icons/hicolor/scalable/status/software-update-available-symbolic.svg
-%%DATADIR%%/%%ABIVER%%/images/gimp-devel-logo.png
+%%PORTDOCS%%%%DATADIR%%/%%ABIVER%%/images/gimp-devel-logo.png
 %%DATADIR%%/%%ABIVER%%/images/gimp-logo.png
 %%DATADIR%%/%%ABIVER%%/images/gimp-splash.png
 %%DATADIR%%/%%ABIVER%%/menus/app-menu.ui