From 8da8d9a47812eeab0085ee5cb5bb6148ef2625a6 Mon Sep 17 00:00:00 2001
From: Bruno Lopes <brunvonlope@outlook.com>
Date: Thu, 26 Mar 2026 18:57:32 -0300
Subject: [PATCH] build/macos: Use ds_store Python package on DMG creation

The pre-made .DS_Store(.tar.xz) got broken after version bumps.
---
 build/macos/dmg/3_dist-gimp-apple.sh | 131 ++++++++++++++++++++-------
 build/macos/dmg/DS_Store.tar.xz      | Bin 1900 -> 0 bytes
 2 files changed, 98 insertions(+), 33 deletions(-)
 delete mode 100644 build/macos/dmg/DS_Store.tar.xz

diff --git a/build/macos/dmg/3_dist-gimp-apple.sh b/build/macos/dmg/3_dist-gimp-apple.sh
index d05f489b9a..8b692ab9b0 100644
--- a/build/macos/dmg/3_dist-gimp-apple.sh
+++ b/build/macos/dmg/3_dist-gimp-apple.sh
@@ -26,7 +26,7 @@ fi
 
 # 1. GET MACOS TOOLS VERSION
 printf "\e[0Ksection_start:`date +%s`:mac_tlkt\r\e[0KChecking macOS tools\n"
-printf "(INFO): macOS version: $(sw_vers -productVersion)\n"
+printf "(INFO): macOS version: $(sw_vers -productVersion) | Python version: $(python3 --version 2>&1 | sed 's/[^0-9.]//g')\n"
 printf "\e[0Ksection_end:`date +%s`:mac_tlkt\r\e[0K\n"
 
 
@@ -134,40 +134,105 @@ conf_plist "%MUTEX_SUFFIX%" "$MUTEX_SUFFIX"
 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 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/"
+printf '(INFO): generating .DS_Store\n'
+cp -r "$BG_PATH" "$DMG_MOUNT/.background.png"
 ln -s /Applications "$DMG_MOUNT/Applications"
-sync
-sleep 2 #avoid Finder async issues
-if [ -z "$GITLAB_CI" ]; then
-  osascript <<EOF
-tell application "Finder"
-    tell disk "$APPVER"
-        open
-        -- background
-        set bounds of container window to {1, 1, 641, 512}
-        set background picture of icon view options of container window to POSIX file "$DMG_MOUNT/.background/gimp-dmg.png"
-        set toolbar visible of container window to false
-        set pathbar visible of container window to false
-        set statusbar visible of container window to false
-        -- icons
-        set current view of container window to icon view
-        set arrangement of icon view options of container window to not arranged
-        set icon size of icon view options of container window to 110
-        set position of item "$BUNDLE_NAME.app" of container window to {192, 282}
-        set position of item "Applications" of container window to {448, 282}
-        set position of item ".background" of container window to {545, 0}
-        set position of item ".fseventsd" of container window to {545, 0}
-        update without registering applications
-        close
-    end tell
-end tell
+#Ported from https://github.com/salty-salty-studios/first-snow/blob/main/installer/mac/metabuilder.py
+python3 -m venv ds-py3-venv
+source ds-py3-venv/bin/activate
+pip install ds_store biplist mac_alias
+python3 <<-EOF
+from datetime import datetime, timezone
+import ds_store
+import biplist
+import mac_alias
+
+def create_alias(volname, filename):
+  volume = mac_alias.VolumeInfo(
+    volname, datetime.now(timezone.utc),
+    fs_type=mac_alias.ALIAS_HFS_VOLUME_SIGNATURE, disk_type=mac_alias.ALIAS_FIXED_DISK,
+    attribute_flags=0, fs_id=bytes(2),
+  )
+  target = mac_alias.TargetInfo(
+    mac_alias.ALIAS_KIND_FILE, filename,
+    folder_cnid=0, cnid=0, creation_date=datetime.now(timezone.utc),
+    creator_code=bytes(4), type_code=bytes(4),
+    folder_name=volname, carbon_path='{}:{}'.format(volname, filename),
+  )
+  return mac_alias.Alias(volume=volume, target=target)
+
+if __name__ == '__main__':
+  store = ds_store.DSStore.open("$DMG_MOUNT/.DS_Store", 'w+')
+  store['.']['vSrn'] = ('long', 1)
+  store['.']['icvl'] = ('type', 'icnv')
+
+  #background
+  icvp_options = {
+    'backgroundType': 2,
+    'backgroundColorRed': 1.0,
+    'backgroundColorGreen': 1.0,
+    'backgroundColorBlue': 1.0,
+    'backgroundImageAlias': biplist.Data(create_alias("$APPVER", ".background.png").to_bytes()),
+  }
+  bwsp_options = {
+    'WindowBounds': '{{100, 100}, {%s, %s}}' % (640, 512),
+    'ShowToolbar': False,
+    'ShowPathbar': False,
+    'ShowStatusBar': False,
+  }
+
+  #icons
+  icvp_options.update({
+    'viewOptionsVersion': 1,
+    'gridSpacing': 100.0,
+    'gridOffsetX': 0.0,
+    'gridOffsetY': 0.0,
+    'scrollPositionY': 0.0,
+    'arrangeBy': 'none',
+    'labelOnBottom': True,
+    'showItemInfo': False,
+    'showIconPreview': False,
+    'iconSize': 110.0,
+    'textSize': 16.0,
+  })
+  store["$BUNDLE_NAME.app"]['Iloc'] = (192, 282)
+  store["Applications"]['Iloc'] = (448, 282)
+  store['.background.png']['Iloc'] = (524, 0)
+  store['.fseventsd']['Iloc'] = (524, 0)
+
+  store['.']['icvp'] = icvp_options
+  store['.']['bwsp'] = bwsp_options
+  store.close()
 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
+rm -fr ds-py3-venv
+#Works only interactively
+#if [ -z "$GITLAB_CI" ]; then
+#  sync
+#  sleep 2 #avoid Finder async issues
+#  osascript <<EOF
+#tell application "Finder"
+#    tell disk "$APPVER"
+#        open
+#        -- background
+#        set bounds of container window to {1, 1, 641, 512}
+#        set background picture of icon view options of container window to POSIX file "$DMG_MOUNT/.background/gimp-dmg.png"
+#        set toolbar visible of container window to false
+#        set pathbar visible of container window to false
+#        set statusbar visible of container window to false
+#        -- icons
+#        set current view of container window to icon view
+#        set arrangement of icon view options of container window to not arranged
+#        set icon size of icon view options of container window to 110
+#        set text size of icon view options of container window to 16
+#        set position of item "$BUNDLE_NAME.app" of container window to {192, 282}
+#        set position of item "Applications" of container window to {448, 282}
+#        set position of item ".background.png" of container window to {545, 0}
+#        set position of item ".fseventsd" of container window to {545, 0}
+#        update without registering applications
+#        close
+#    end tell
+#end tell
+#EOF
 
 ## 4.3 Set custom .VolumeIcon.icns
 printf '(INFO): copying .VolumeIcon.icns\n'
diff --git a/build/macos/dmg/DS_Store.tar.xz b/build/macos/dmg/DS_Store.tar.xz
deleted file mode 100644
index da8843e9e072d8f91d6e872b4ca16b6b89ac6bb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1900
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