From bc81f5d8325daa84b82e768d04873e23852abc14 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Sun, 30 Jan 2022 22:48:33 -0800
Subject: [PATCH] ci: implement mac bundle hacks

---
 .github/workflows/ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4dba22284..15c09aef6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -380,12 +380,16 @@ jobs:
 
           mv app/$BUNDLE_NAME .
           mkdir $BUNDLE_NAME/Contents/Frameworks
-          dylibbundler -b -x "$BUNDLE_NAME/Contents/MacOS/Olive" -s "$DEP_LOCATION/lib" -d "$BUNDLE_NAME/Contents/Frameworks" -p "@executable_path/../Frameworks" $DYLIBBUNDLER_EXTRA_ARGS
+          dylibbundler -b -ns -x "$BUNDLE_NAME/Contents/MacOS/Olive" -s "$DEP_LOCATION/lib" -d "$BUNDLE_NAME/Contents/Frameworks" -p "@executable_path/../Frameworks" $DYLIBBUNDLER_EXTRA_ARGS
 
           # Copy Qt frameworks and plugins
           cp -R $DEP_LOCATION/lib/Qt*.framework $BUNDLE_NAME/Contents/Frameworks
           cp -R $DEP_LOCATION/plugins $BUNDLE_NAME/Contents
 
+          # HACK: On x86_64, dylibbundler doesn't resolve this symlink. Weirdly it does on ARM64,
+          #       but perhaps I'll bring it up with them soon.
+          cp $DEP_LOCATION/Frameworks/libpng16.16.37.0.dylib $DEP_LOCATION/Frameworks/libpng16.16.dylib
+
           if [ "${{ matrix.os-arch }}" == "x86_64" ]
           then
             # Crashpad symbols
@@ -396,6 +400,9 @@ jobs:
             mv Olive.sym "$SYM_DIR"
           fi
 
+          # TEMP: Not sure if this will do anything, just trying it out
+          xattr -cr $BUNDLE_NAME
+
       - name: Deploy Packages
         working-directory: ${{ runner.workspace }}/build
         shell: bash