dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gimp-data, tools: macOS assets are now built from Meson

Browse source 
Adresses #14236

We used to call ninja at Portfile, which is way suboptimal.
Now, we properly generate them from Meson if -Ddmg is true.
This commit is contained in:
Bruno Lopes 2026-01-03 22:17:18 -03:00
parent cd4af46675
commit c9ce259e9c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gimp-data

@ -1 +1 @@
Subproject commit d6689c7a26a725fb0a66d5aaf92e209a57a0bb4d
Subproject commit 94e882284193ad6f8d6e4e156f7f238204d7e836

4
tools/in-build-gimp.py
View file

@ -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",