From c9ce259e9c9547d7eaa578b3db951350e95f01c4 Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Sat, 3 Jan 2026 22:17:18 -0300 Subject: [PATCH] gimp-data, tools: macOS assets are now built from Meson Adresses #14236 We used to call ninja at Portfile, which is way suboptimal. Now, we properly generate them from Meson if -Ddmg is true. --- gimp-data | 2 +- tools/in-build-gimp.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gimp-data b/gimp-data index d6689c7a26..94e8822841 160000 --- a/gimp-data +++ b/gimp-data @@ -1 +1 @@ -Subproject commit d6689c7a26a725fb0a66d5aaf92e209a57a0bb4d +Subproject commit 94e882284193ad6f8d6e4e156f7f238204d7e836 diff --git a/tools/in-build-gimp.py b/tools/in-build-gimp.py index 568ecc8e85..cba0d0755e 100644 --- a/tools/in-build-gimp.py +++ b/tools/in-build-gimp.py @@ -21,8 +21,8 @@ try: # Earlier code used to set DYLD_LIBRARY_PATH environment variable instead, but # it didn't work on contributor's builds because of System Integrity # Protection (SIP), though it did work in the CI which had older macOS. - # So, we just set LC_RPATH on binaries, but this restrict us to only one 'gimp_exe_depends' target for - # macOS (the splash screen). Otherwise, multiple install_name_tool procs would clash over the same bin. See: #14236 + # So, we just set LC_RPATH on binaries, but this restrict us to only one + # target at a time. See: #14236 and gimp-data/images/logo/meson.build rpath_array = [f"{GIMP_GLOBAL_BUILD_ROOT}/libgimp", f"{GIMP_GLOBAL_BUILD_ROOT}/libgimpbase", f"{GIMP_GLOBAL_BUILD_ROOT}/libgimpcolor",