git: 78d4e80df378 - 2025Q4 - graphics/gimp3-app: fix build on armv7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 19 Oct 2025 08:06:35 UTC
The branch 2025Q4 has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=78d4e80df37870b9187f489ae69a857ac115ee01
commit 78d4e80df37870b9187f489ae69a857ac115ee01
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2025-10-17 15:42:12 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-10-19 08:06:16 +0000
graphics/gimp3-app: fix build on armv7
No OpenMP on armv7 unfortunately.
While we are at it, rework the "no FP exceptions" patch to use the
newer <fenv.h> interface, as the old one is not supported everywhere.
Approved by: portmgr (build fix blanket)
MFH: 2025Q4
(cherry picked from commit 927fbf0126e89f055975430574ac1d2d968fe25b)
---
graphics/gimp3-app/Makefile | 4 ++++
graphics/gimp3-app/files/patch-libgimp_gimp.c | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/graphics/gimp3-app/Makefile b/graphics/gimp3-app/Makefile
index 2fa3c2ffd9d0..1e8e45c046cf 100644
--- a/graphics/gimp3-app/Makefile
+++ b/graphics/gimp3-app/Makefile
@@ -156,6 +156,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/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);