From: Daniel Dickman <didickman@gmail.com>
Subject: [update] graphics/gimp/snapshot 3.2.2 -> 3.2.4
To: ports@openbsd.org
Date: Wed, 17 Jun 2026 20:02:39 -0400

Works for me; ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gimp/snapshot/Makefile,v
diff -u -p -u -r1.38 Makefile
--- Makefile	29 Mar 2026 08:18:56 -0000	1.38
+++ Makefile	18 Jun 2026 00:01:32 -0000
@@ -5,7 +5,7 @@ COMMENT=	GNU Image Manipulation Program
 # needs newer librsvg
 ONLY_FOR_ARCHS=	${RUST_ARCHS}
 
-V=		3.2.2
+V=		3.2.4
 GIMP_API_V=	3.0
 GIMP_APP_V=	${V:R}
 DISTNAME=	gimp-${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/gimp/snapshot/distinfo,v
diff -u -p -u -r1.13 distinfo
--- distinfo	29 Mar 2026 08:18:56 -0000	1.13
+++ distinfo	18 Jun 2026 00:01:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (gimp-3.2.2.tar.xz) = bF+Mur4IH0BWM6LTK3mggWaut7Q8f1SDkWCNwNDecb4=
-SIZE (gimp-3.2.2.tar.xz) = 34921928
+SHA256 (gimp-3.2.4.tar.xz) = cxK8U+nG0tAFbKe5PxxrmHB5Rt2TT3FMIbh0bstgFYg=
+SIZE (gimp-3.2.4.tar.xz) = 34912956
Index: patches/patch-app_main_c
===================================================================
RCS file: /cvs/ports/graphics/gimp/snapshot/patches/patch-app_main_c,v
diff -u -p -u -r1.9 patch-app_main_c
--- patches/patch-app_main_c	29 Mar 2026 08:18:56 -0000	1.9
+++ patches/patch-app_main_c	18 Jun 2026 00:01:32 -0000
@@ -11,15 +11,18 @@ Index: app/main.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -570,8 +571,14 @@ main (int    argc,
+@@ -570,11 +571,17 @@ main (int    argc,
  #endif
    gint            retval;
    gint            i;
 +  struct          rlimit limit;
+ #if defined(ENABLE_RELOCATABLE_RESOURCES) && defined(__APPLE__)
+   gint            newargc;
+ #endif
  
    gimp_attach_console_window ();
 +
-+  if (getrlimit (RLIMIT_DATA, &limit) != -1) {
++  if (getrlimit (RLIMIT_DATA, &limit) != 1) {
 +    limit.rlim_cur = limit.rlim_max;
 +    (void)setrlimit (RLIMIT_DATA, &limit);
 +  }
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/graphics/gimp/snapshot/patches/patch-meson_build,v
diff -u -p -u -r1.15 patch-meson_build
--- patches/patch-meson_build	29 Mar 2026 08:18:56 -0000	1.15
+++ patches/patch-meson_build	18 Jun 2026 00:01:32 -0000
@@ -1,7 +1,7 @@
 Index: meson.build
 --- meson.build.orig
 +++ meson.build
-@@ -179,6 +179,10 @@ platform_linux = (
+@@ -180,6 +180,10 @@ platform_linux = (
    host_os.contains('linux')
  )
  
@@ -12,7 +12,7 @@ Index: meson.build
  platform_windows = (
    host_os.contains('mingw') or
    host_os.contains('cygwin') or
-@@ -1267,7 +1271,7 @@ have_lua_output = have_lua
+@@ -1264,7 +1268,7 @@ have_lua_output = have_lua
  if have_lua
    have_lua_lgi = false
  
@@ -21,7 +21,7 @@ Index: meson.build
      lua = find_program(lua_bin, required: false)
  
      if lua.found() and meson.can_run_host_binaries()
-@@ -1632,6 +1636,7 @@ conf.set('NO_FD_SET',
+@@ -1612,6 +1616,7 @@ conf.set('NO_FD_SET',
    not platform_windows
    and not cc.compiles('''
      #include <sys/types.h>
Index: patches/patch-plug-ins_common_meson_build
===================================================================
RCS file: /cvs/ports/graphics/gimp/snapshot/patches/patch-plug-ins_common_meson_build,v
diff -u -p -u -r1.2 patch-plug-ins_common_meson_build
--- patches/patch-plug-ins_common_meson_build	15 Mar 2026 12:43:33 -0000	1.2
+++ patches/patch-plug-ins_common_meson_build	18 Jun 2026 00:01:32 -0000
@@ -1,8 +1,8 @@
 Index: plug-ins/common/meson.build
 --- plug-ins/common/meson.build.orig
 +++ plug-ins/common/meson.build
-@@ -170,7 +170,7 @@ if platform_windows
-   common_plugins_list += { 'name': 'file-lnk', }
+@@ -175,7 +175,7 @@ if platform_windows
+   endif
  endif
  
 -if platform_linux
Index: patches/patch-tools_in-build-gimp_py
===================================================================
RCS file: /cvs/ports/graphics/gimp/snapshot/patches/patch-tools_in-build-gimp_py,v
diff -u -p -u -r1.4 patch-tools_in-build-gimp_py
--- patches/patch-tools_in-build-gimp_py	29 Mar 2026 08:18:56 -0000	1.4
+++ patches/patch-tools_in-build-gimp_py	18 Jun 2026 00:01:32 -0000
@@ -9,12 +9,12 @@ Index: tools/in-build-gimp.py
        os.environ["PATH"] = tmp_path + os.pathsep + os.environ.get("PATH", "")
  
 -  if "GIMP_DEBUG_SELF_WRAPPER" in os.environ and shutil.which("gdb"):
--    sys.stderr.write(f"RUNNING: {os.environ['GIMP_DEBUG_SELF_WRAPPER']} --batch -x {os.environ['GIMP_GLOBAL_SOURCE_ROOT']}/tools/debug-in-build-gimp.py --args {os.environ['GIMP_SELF_IN_BUILD']} {' '.join(sys.argv[1:])}")
+-    sys.stderr.write(f"RUNNING: {os.environ['GIMP_DEBUG_SELF_WRAPPER']} --batch -x {os.environ['GIMP_GLOBAL_SOURCE_ROOT']}/tools/debug-in-build-gimp.py --args {os.environ['GIMP_SELF_IN_BUILD']} {' '.join(sys.argv[1:])}\n")
 -    subprocess.run([os.environ["GIMP_DEBUG_SELF_WRAPPER"],"--return-child-result","--batch","-x",f"{os.environ['GIMP_GLOBAL_SOURCE_ROOT']}/tools/debug-in-build-gimp.py","--args", os.environ["GIMP_SELF_IN_BUILD"]] + sys.argv[1:], stdin=sys.stdin, check=True)
 -  else:
--    sys.stderr.write(f"RUNNING: {os.environ['GIMP_SELF_IN_BUILD']} {' '.join(sys.argv[1:])}")
+-    sys.stderr.write(f"RUNNING: {os.environ['GIMP_SELF_IN_BUILD']} {' '.join(sys.argv[1:])}\n")
 -    subprocess.run([os.environ["GIMP_SELF_IN_BUILD"]] + sys.argv[1:],stdin=sys.stdin, check=True)
-+  sys.stderr.write(f"RUNNING: {os.environ['GIMP_SELF_IN_BUILD']} {' '.join(sys.argv[1:])}")
++  sys.stderr.write(f"RUNNING: {os.environ['GIMP_SELF_IN_BUILD']} {' '.join(sys.argv[1:])}\n")
 +  subprocess.run([os.environ["GIMP_SELF_IN_BUILD"]] + sys.argv[1:],stdin=sys.stdin, check=True)
  
    if sys.platform not in ['win32', 'cygwin'] and different_python: