diff options
Diffstat (limited to 'graphics/gimp3-app')
| -rw-r--r-- | graphics/gimp3-app/Makefile | 22 | ||||
| -rw-r--r-- | graphics/gimp3-app/distinfo | 6 | ||||
| -rw-r--r-- | graphics/gimp3-app/files/patch-libgimp_gimp.c | 8 | ||||
| -rw-r--r-- | graphics/gimp3-app/files/patch-meson.build | 16 | ||||
| -rw-r--r-- | graphics/gimp3-app/files/patch-meson__options.txt | 8 | ||||
| -rw-r--r-- | graphics/gimp3-app/pkg-plist | 27 |
6 files changed, 53 insertions, 34 deletions
diff --git a/graphics/gimp3-app/Makefile b/graphics/gimp3-app/Makefile index 1c4de063bbe6..d47df19d9cc8 100644 --- a/graphics/gimp3-app/Makefile +++ b/graphics/gimp3-app/Makefile @@ -1,6 +1,5 @@ PORTNAME= gimp -DISTVERSION= 3.0.4 -PORTREVISION= 1 +DISTVERSION= 3.0.6 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} PKGNAMESUFFIX= 3-app @@ -35,7 +34,6 @@ LIB_DEPENDS= libpng.so:graphics/png \ libappstream-glib.so:devel/appstream-glib \ libImath.so:math/Imath \ libwebp.so:graphics/webp \ - libgjs.so:lang/gjs \ libOpenEXR.so:graphics/openexr \ libIex.so:graphics/openexr \ libjson-glib-1.0.so:devel/json-glib \ @@ -50,8 +48,7 @@ LIB_DEPENDS_powerpc64le= libunwind.so:devel/libunwind RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ glib-networking>=0:net/glib-networking \ - mypaint-brushes>0:graphics/mypaint-brushes \ - gjs-console:lang/gjs + mypaint-brushes>0:graphics/mypaint-brushes USES= cpe desktop-file-utils gettext gnome jpeg libarchive \ localbase:ldflags meson ninja perl5 pkgconfig python:3.7+ \ @@ -78,8 +75,8 @@ MESON_ARGS= -Dappdata-test=disabled \ -Diff=disabled \ -Dfits=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_DEFINE?= AALIB GHOSTSCRIPT HEIF HELP OPENJPEG JS JXL LIBMNG WMF DOCS VALA CFITSIO +OPTIONS_DEFAULT?= AALIB GHOSTSCRIPT HEIF OPENJPEG JS JXL WMF DOCS VALA LUA CFITSIO OPTIONS_SINGLE= SCRIPTS OPTIONS_SINGLE_SCRIPTS= LUA LUAJIT LUA_NONE OPTIONS_SUB= yes @@ -113,6 +110,11 @@ WMF_LIB_DEPENDS= libexpat.so:textproc/expat2 \ libwmf.so:graphics/libwmf WMF_MESON_ENABLED= wmf +JS_DESC= Install Javascript plug-ins +JS_LIB_DEPENDS= libgjs.so:lang/gjs +JS_RUN_DEPENDS= gjs-console:lang/gjs +JS_MESON_ENABLED= javascript + DOCS_BUILD_DEPENDS= gi-docgen:textproc/py-gi-docgen DOCS_MESON_ENABLED= gi-docgen @@ -143,7 +145,7 @@ SHEBANG_FILES= plug-ins/python/*.py \ SHEBANG_LANG+= gjs -PLIST_SUB+= BINVER=${PORTVERSION:R:R} ABIVER=${PORTVERSION:R} SHLIBVER=${PORTVERSION:E} +PLIST_SUB+= BINVER=${PORTVERSION:R:R} ABIVER=${PORTVERSION:R} SHLIBVER=${PORTVERSION:R:E}.${PORTVERSION:E}.${PORTVERSION:R:E} .include <bsd.port.options.mk> @@ -153,6 +155,10 @@ PLIST_SUB+= LUASCRIPTS="" PLIST_SUB+= LUASCRIPTS="@comment " .endif +.if !exists(/usr/include/omp.h) +MESON_ARGS+= -Dopenmp=disabled +.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 d3ecf51f1c19..bd4664eeb54a 100644 --- a/graphics/gimp3-app/distinfo +++ b/graphics/gimp3-app/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752051281 -SHA256 (gimp-3.0.4.tar.xz) = 8caa2ec275bf09326575654ac276afc083f8491e7cca45d19cf29e696aecab25 -SIZE (gimp-3.0.4.tar.xz) = 27060240 +TIMESTAMP = 1759926024 +SHA256 (gimp-3.0.6.tar.xz) = 246c225383c72ef9f0dc7703b7d707084bbf177bd2900e94ce466a62862e296b +SIZE (gimp-3.0.6.tar.xz) = 27197880 diff --git a/graphics/gimp3-app/files/patch-libgimp_gimp.c b/graphics/gimp3-app/files/patch-libgimp_gimp.c index 48799a6d0aec..43b3ba2e6f2b 100644 --- a/graphics/gimp3-app/files/patch-libgimp_gimp.c +++ b/graphics/gimp3-app/files/patch-libgimp_gimp.c @@ -1,20 +1,20 @@ ---- libgimp/gimp.c.orig 2024-12-27 13:34:56 UTC +--- libgimp/gimp.c.orig 2025-05-17 22:51:03 UTC +++ libgimp/gimp.c @@ -28,6 +28,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -+#include <floatingpoint.h> ++#include <fenv.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> -@@ -341,6 +342,9 @@ gimp_main (GType plug_in_type, +@@ -348,6 +349,9 @@ gimp_main (GType plug_in_type, gimp_env_init (TRUE); progname = argv[ARG_PROGNAME]; + + /* Ignore floating point exceptions */ -+ fpsetmask(0); ++ fedisableexcept(FE_ALL_EXCEPT); basename = g_path_get_basename (progname); diff --git a/graphics/gimp3-app/files/patch-meson.build b/graphics/gimp3-app/files/patch-meson.build index 7c786ab3116a..aaace2316a23 100644 --- a/graphics/gimp3-app/files/patch-meson.build +++ b/graphics/gimp3-app/files/patch-meson.build @@ -1,6 +1,16 @@ ---- meson.build.orig 2025-05-17 22:51:03 UTC +--- meson.build.orig 2025-10-05 17:14:02 UTC +++ meson.build -@@ -1208,7 +1208,7 @@ if have_lua +@@ -168,7 +168,8 @@ platform_linux = ( + message('Host os: ' + host_os) + + platform_linux = ( +- host_os.contains('linux') ++ host_os.contains('linux') or ++ host_os.contains('bsd') + ) + + platform_windows = ( +@@ -1127,7 +1128,7 @@ if have_lua if have_lua have_lua_lgi = false @@ -9,7 +19,7 @@ lua = find_program(lua_bin, required: false) if lua.found() and meson.can_run_host_binaries() -@@ -1247,7 +1247,7 @@ if have_lua +@@ -1166,7 +1167,7 @@ if have_lua if is_supported_lua have_lua_lgi = run_command(lua, '-e', ''' diff --git a/graphics/gimp3-app/files/patch-meson__options.txt b/graphics/gimp3-app/files/patch-meson__options.txt index f8dcb9fffcdf..0a8931031e5b 100644 --- a/graphics/gimp3-app/files/patch-meson__options.txt +++ b/graphics/gimp3-app/files/patch-meson__options.txt @@ -1,6 +1,6 @@ ---- meson_options.txt.orig 2025-03-19 00:53:29 UTC +--- meson_options.txt.orig 2025-10-05 17:14:02 UTC +++ meson_options.txt -@@ -41,10 +41,10 @@ option('heif', type: 'feature', value: 'a +@@ -42,10 +42,10 @@ option('heif', type: 'feature', value: 'a option('ghostscript', type: 'feature', value: 'auto', description: 'Ghostscript support') option('gudev', type: 'feature', value: 'auto', description: 'Gudev support') option('heif', type: 'feature', value: 'auto', description: 'HEIF support') @@ -13,12 +13,12 @@ option('openexr', type: 'feature', value: 'auto', description: 'Openexr support') option('openmp', type: 'feature', value: 'auto', description: 'OpenMP support') option('print', type: 'boolean', value: true, description: 'Print support') -@@ -53,7 +53,7 @@ option('xpm', type: 'feature', value: 'a +@@ -54,7 +54,7 @@ option('xpm', type: 'feature', value: 'a option('wmf', type: 'feature', value: 'auto', description: 'Wmf support') option('xcursor', type: 'feature', value: 'auto', description: 'Xcursor support') option('xpm', type: 'feature', value: 'auto', description: 'XPM support') -option('headless-tests', type: 'feature', value: 'auto', description: 'Use xvfb-run/dbus-run-session for UI-dependent automatic tests') +option('headless-tests', type: 'feature', value: 'disabled', description: 'Use xvfb-run/dbus-run-session for UI-dependent automatic tests') - option('file-plug-ins-test', type: 'boolean', value: 'false', description: 'Always install test-file-plug-ins (mostly for CI testing)') + option('file-plug-ins-test', type: 'boolean', value: false, description: 'Always install test-file-plug-ins (mostly for CI testing)') option('can-crosscompile-gir', type: 'boolean', value: false, description: 'GIR is buildable even if crosscompiling') diff --git a/graphics/gimp3-app/pkg-plist b/graphics/gimp3-app/pkg-plist index 106dbf39c02d..e0a8ec9259db 100644 --- a/graphics/gimp3-app/pkg-plist +++ b/graphics/gimp3-app/pkg-plist @@ -259,10 +259,9 @@ include/gimp-%%ABIVER%%/libgimpwidgets/gimpwidgetstypes.h include/gimp-%%ABIVER%%/libgimpwidgets/gimpwidgetsutils.h include/gimp-%%ABIVER%%/libgimpwidgets/gimpzoommodel.h lib/gimp/%%ABIVER%%/environ/default.env -lib/gimp/%%ABIVER%%/environ/python.env 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 +%%JS%%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 @@ -474,34 +473,34 @@ lib/girepository-1.0/Gimp-%%ABIVER%%.typelib lib/girepository-1.0/GimpUi-%%ABIVER%%.typelib lib/libgimp-%%ABIVER%%.so lib/libgimp-%%ABIVER%%.so.0 -lib/libgimp-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimp-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimp-scriptfu-%%ABIVER%%.so lib/libgimp-scriptfu-%%ABIVER%%.so.0 -lib/libgimp-scriptfu-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimp-scriptfu-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimpbase-%%ABIVER%%.so lib/libgimpbase-%%ABIVER%%.so.0 -lib/libgimpbase-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimpbase-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimpcolor-%%ABIVER%%.so lib/libgimpcolor-%%ABIVER%%.so.0 -lib/libgimpcolor-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimpcolor-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimpconfig-%%ABIVER%%.so lib/libgimpconfig-%%ABIVER%%.so.0 -lib/libgimpconfig-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimpconfig-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimpmath-%%ABIVER%%.so lib/libgimpmath-%%ABIVER%%.so.0 -lib/libgimpmath-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimpmath-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimpmodule-%%ABIVER%%.so lib/libgimpmodule-%%ABIVER%%.so.0 -lib/libgimpmodule-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimpmodule-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimpthumb-%%ABIVER%%.so lib/libgimpthumb-%%ABIVER%%.so.0 -lib/libgimpthumb-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimpthumb-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimpui-%%ABIVER%%.so lib/libgimpui-%%ABIVER%%.so.0 -lib/libgimpui-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimpui-%%ABIVER%%.so.%%SHLIBVER%% lib/libgimpwidgets-%%ABIVER%%.so lib/libgimpwidgets-%%ABIVER%%.so.0 -lib/libgimpwidgets-%%ABIVER%%.so.0.0.%%SHLIBVER%% +lib/libgimpwidgets-%%ABIVER%%.so.%%SHLIBVER%% libdata/pkgconfig/gimp-%%ABIVER%%.pc libdata/pkgconfig/gimpthumb-%%ABIVER%%.pc libdata/pkgconfig/gimpui-%%ABIVER%%.pc @@ -804,6 +803,7 @@ libexec/gimp-debug-tool-%%ABIVER%% %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimp-%%ABIVER%%/enum.TextDirection.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimp-%%ABIVER%%/enum.TextHintStyle.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimp-%%ABIVER%%/enum.TextJustification.html +%%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimp-%%ABIVER%%/enum.TRCType.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimp-%%ABIVER%%/enum.TransferMode.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimp-%%ABIVER%%/enum.TransformDirection.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimp-%%ABIVER%%/enum.TransformResize.html @@ -3043,6 +3043,7 @@ libexec/gimp-debug-tool-%%ABIVER%% %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimpui-%%ABIVER%%/func.prop_string_combo_box_new.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimpui-%%ABIVER%%/func.prop_switch_new.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimpui-%%ABIVER%%/func.prop_text_buffer_new.html +%%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimpui-%%ABIVER%%/func.prop_toggle_new.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimpui-%%ABIVER%%/func.prop_unit_combo_box_new.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimpui-%%ABIVER%%/func.prop_widget_set_factor.html %%PORTDOCS%%%%DOCSDIR%%-%%ABIVER%%/libgimpui-%%ABIVER%%/func.query_boolean_box.html @@ -4996,6 +4997,7 @@ libexec/gimp-debug-tool-%%ABIVER%% %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-even-vertical-gap.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-file-manager.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-gegl.svg +%%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-group-layer.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-lock-alpha-symbolic.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-lock-alpha.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-lock-content-symbolic.svg @@ -5092,6 +5094,7 @@ libexec/gimp-debug-tool-%%ABIVER%% %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-transform-3d-camera.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-transform-3d-move.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gimp-transform-3d-rotate.svg +%%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gtk-cancel.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gtk-no.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gtk-ok.svg %%DATADIR%%/%%ABIVER%%/icons/Legacy/scalable/apps/gtk-select-color.svg |