Still not working

take 2
gimp-data: change color profile to sRGB IEC61966-2.1 on macos
2025-10-06 01:12:40 +02:00 · 2025-01-13 00:55:49 +00:00 · 2025-01-12 23:33:22 +00:00 · 2025-01-12 23:08:15 +00:00
3 changed files with 27 additions and 26 deletions
--- a/2
+++ b/2
--- 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);

--- 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
Author	SHA1	Message	Date
Lukas Oberhuber	ffa1b0764e	Still not working	2025-01-13 00:55:49 +00:00
Lukas Oberhuber	7d0d276a4c	take 2	2025-01-12 23:33:22 +00:00
Lukas Oberhuber	d06d604315	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	2025-01-12 23:08:15 +00:00