From d06d604315840f451f19afd8c55313341f6fc59b Mon Sep 17 00:00:00 2001 From: Lukas Oberhuber Date: Sun, 12 Jan 2025 23:08:15 +0000 Subject: [PATCH 1/3] gimp-data: change color profile to sRGB IEC61966-2.1 on macos Means icons will have the correct color profile Hopefully fixes https://gitlab.gnome.org/Infrastructure/gimp-macos-build/-/issues/64 --- gimp-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gimp-data b/gimp-data index 383a5cda3f6..4aa71465555 160000 --- a/gimp-data +++ b/gimp-data @@ -1 +1 @@ -Subproject commit 383a5cda3f6b68c0e49004baa0b28fb4d9fefa82 +Subproject commit 4aa7146555541d714abc97e0129948a4682c25b4 -- GitLab From 7d0d276a4c62709b27c2967237bf2e21fbdc222e Mon Sep 17 00:00:00 2001 From: Lukas Oberhuber Date: Sun, 12 Jan 2025 23:33:22 +0000 Subject: [PATCH 2/3] take 2 --- gimp-data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gimp-data b/gimp-data index 4aa71465555..e7a018b259e 160000 --- a/gimp-data +++ b/gimp-data @@ -1 +1 @@ -Subproject commit 4aa7146555541d714abc97e0129948a4682c25b4 +Subproject commit e7a018b259edbaef86f7479a39cafdc1a7e3747e -- GitLab From ffa1b0764e8f131030f38c5694b6021e5a02afd4 Mon Sep 17 00:00:00 2001 From: Lukas Oberhuber Date: Mon, 13 Jan 2025 00:55:49 +0000 Subject: [PATCH 3/3] Still not working --- gimp-data | 2 +- plug-ins/file-icns/file-icns-export.c | 25 ++++++++++++++----------- tools/in-build-gimp.sh | 26 ++++++++++++-------------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/gimp-data b/gimp-data index e7a018b259e..7e0f9291721 160000 --- a/gimp-data +++ b/gimp-data @@ -1 +1 @@ -Subproject commit e7a018b259edbaef86f7479a39cafdc1a7e3747e +Subproject commit 7e0f9291721a97bf10ed94564e8c6bf5be6531ba diff --git a/plug-ins/file-icns/file-icns-export.c b/plug-ins/file-icns/file-icns-export.c index 1f654cdd0d8..e61587c7550 100644 --- a/plug-ins/file-icns/file-icns-export.c +++ b/plug-ins/file-icns/file-icns-export.c @@ -480,17 +480,20 @@ icns_export_image (GFile *file, procedure = gimp_pdb_lookup_procedure (gimp_get_pdb (), "file-png-export"); return_vals = gimp_procedure_run (procedure, - "run-mode", GIMP_RUN_NONINTERACTIVE, - "image", temp_image, - "file", temp_file, - "interlaced", FALSE, - "compression", 9, - "bkgd", FALSE, - "offs", FALSE, - "phys", FALSE, - "time", FALSE, - "save-transparent", FALSE, - "optimize-palette", FALSE, + "run-mode", GIMP_RUN_NONINTERACTIVE, + "image", temp_image, + "file", temp_file, + "interlaced", FALSE, + "compression", 9, + "bkgd", FALSE, + "offs", FALSE, + "phys", FALSE, + "time", FALSE, + "save-transparent", FALSE, + "optimize-palette", FALSE, +#if defined(PNG_iCCP_SUPPORTED) + "save-color-profile", TRUE, +#endif NULL); gimp_image_delete (temp_image); diff --git a/tools/in-build-gimp.sh b/tools/in-build-gimp.sh index 913fd19c80f..c61694f3dba 100755 --- a/tools/in-build-gimp.sh +++ b/tools/in-build-gimp.sh @@ -10,17 +10,16 @@ if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then # it didn't work on contributor's builds because of System Integrity # Protection (SIP), though it did work in the CI. export IFS=":" - for bin in $GIMP_TEMP_UPDATE_RPATH; - do - install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimp $bin - install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpbase $bin - install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpcolor $bin - install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpconfig $bin - install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmath $bin - install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmodule $bin - install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpthumb $bin - install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpwidgets $bin - done; + for bin in $GIMP_TEMP_UPDATE_RPATH; do + install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimp $bin || true + install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpbase $bin || true + install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpcolor $bin || true + install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpconfig $bin || true + install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmath $bin || true + install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmodule $bin || true + install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpthumb $bin || true + install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpwidgets $bin || true + done unset IFS fi @@ -34,8 +33,7 @@ fi if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then export IFS=":" - for bin in $GIMP_TEMP_UPDATE_RPATH; - do + for bin in $GIMP_TEMP_UPDATE_RPATH; do install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimp $bin install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpbase $bin install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpcolor $bin @@ -44,7 +42,7 @@ if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmodule $bin install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpthumb $bin install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpwidgets $bin - done; + done unset IFS fi -- GitLab