From 6444079d221e3e63faacb50bda400534e34eafaa Mon Sep 17 00:00:00 2001
From: Bruno Lopes <brunvonlope@outlook.com>
Date: Mon, 19 Jan 2026 14:38:20 -0300
Subject: [PATCH] build/macos: Set background for .dmg on CI

By using a pre-made .DS_Store file, this bypasses Apple Script
restrictions which made impossible to set custom background on CI.
We don't have rights to tweak com.apple.TCC like gimp-macos-build.

.DS_Store is a binary file, but it is tiny and rarely updated,
which follows the precedent of build/windows/store/*.pfx.
---
 .gitlab-ci.yml                             |   4 ++--
 build/macos/{ => dmg}/3_dist-gimp-apple.sh |  21 ++++++++++++---------
 build/macos/dmg/DS_Store.tar.xz            | Bin 0 -> 1824 bytes
 3 files changed, 14 insertions(+), 11 deletions(-)
 rename build/macos/{ => dmg}/3_dist-gimp-apple.sh (91%)
 create mode 100644 build/macos/dmg/DS_Store.tar.xz

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33d6232ab5..dc1519f42a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1002,9 +1002,9 @@ dist-mac-weekly:
     - macos
   script:
     # Do not call sh since it is old bash on macOS, not the default zsh
-    - zsh build/macos/3_dist-gimp-apple.sh
+    - zsh build/macos/dmg/3_dist-gimp-apple.sh
   artifacts:
     expose_as: 'macOS dmg'
     paths:
-      - build/macos/_Output/
+      - build/macos/dmg/_Output/
     expire_in: 8 days
diff --git a/build/macos/3_dist-gimp-apple.sh b/build/macos/dmg/3_dist-gimp-apple.sh
similarity index 91%
rename from build/macos/3_dist-gimp-apple.sh
rename to build/macos/dmg/3_dist-gimp-apple.sh
index 16d8cb1fd1..ed000712e3 100644
--- a/build/macos/3_dist-gimp-apple.sh
+++ b/build/macos/dmg/3_dist-gimp-apple.sh
@@ -16,10 +16,10 @@ case $(readlink /proc/$$/exe) in
     ;;
 esac
 set -e
-if [ "$0" != 'build/macos/3_dist-gimp-apple.sh' ] && [ $(basename "$PWD") != 'macos' ]; then
+if [ "$0" != 'build/macos/dmg/3_dist-gimp-apple.sh' ] && [ $(basename "$PWD") != 'dmg' ]; then
   printf '\033[31m(ERROR)\033[0m: Script called from wrong dir. Please, call this script from the root of gimp git dir\n'
   exit 1
-elif [ $(basename "$PWD") = 'macos' ]; then
+elif [ $(basename "$PWD") = 'dmg' ]; then
   cd ../../..
 fi
 
@@ -133,14 +133,14 @@ conf_plist "%MUTEX_SUFFIX%" "$MUTEX_SUFFIX"
 ### List supported filetypes
 sed -i '' "s|%FILE_TYPES%|$(tr -d '\n' < $BUILD_DIR/plug-ins/file_associations_mac.list)|g" "$DMG_MOUNT/$BUNDLE_NAME.app/Contents/Info.plist"
 
-## 4.2 FIXME: Create .DS_Store to set .dmg background and icon layout
-printf '(INFO): generating .DS_Store\n'
+## 4.2 Create or copy .DS_Store to set .dmg background and icon layout
+printf '(INFO): handling .DS_Store\n'
+mkdir -p "$DMG_MOUNT/.background"
+cp -r "$BG_PATH" "$DMG_MOUNT/.background/"
 ln -s /Applications "$DMG_MOUNT/Applications"
+sync
+sleep 2 #avoid Finder async issues
 if [ -z "$GITLAB_CI" ]; then
-  mkdir -p "$DMG_MOUNT/.background"
-  cp -r "$BG_PATH" "$DMG_MOUNT/.background/"
-  sync
-  sleep 2 #avoid Finder async issues
   osascript <<EOF
 tell application "Finder"
     tell disk "$APPVER"
@@ -164,7 +164,10 @@ tell application "Finder"
     end tell
 end tell
 EOF
+bsdtar -cf build/macos/dmg/DS_Store.tar.xz --xz --options compression-level=9 -C "$DMG_MOUNT" .DS_Store
+printf "(INFO): Generated .DS_Store file. If it have a new layout, please commit it on 'build/macos/dmg/'.\n"
 fi
+bsdtar -xf build/macos/dmg/DS_Store.tar.xz -C "$DMG_MOUNT" .DS_Store
 hdiutil detach "$DMG_MOUNT"
 printf "\e[0Ksection_end:`date +%s`:${ARCH}_source\r\e[0K\n"
 
@@ -188,7 +191,7 @@ printf "\e[0Ksection_end:`date +%s`:${ARCH}_trust\r\e[0K\n"
 
 
 if [ "$GITLAB_CI" ]; then
-  output_dir='build/macos/_Output'
+  output_dir='build/macos/dmg/_Output'
   mkdir -p $output_dir
   mv -f ${DMG_ARTIFACT} $output_dir
 fi
diff --git a/build/macos/dmg/DS_Store.tar.xz b/build/macos/dmg/DS_Store.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..ed7e16016e6af053a5b9d0c462d9326a93e4780b
GIT binary patch
literal 1824
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
O#Ao{g000001X)^3(s|zi

literal 0
HcmV?d00001