From 34bcf7e56669ca699af3c55a5236addabce76ce2 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Tue, 21 Mar 2023 20:11:04 -0700 Subject: [PATCH] fix dependency packaging for Mac OS --- CHANGELOG.md | 1 + Makefile | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06b67bb..53ea61f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ### Fixed - [#90](https://github.com/dweymouth/supersonic/issues/90) Wrong covers get loaded for albums if server has different IDs for album and cover art - [#88](https://github.com/dweymouth/supersonic/issues/88) Incorrect icon size for Mac OS + [#87](https://github.com/dweymouth/supersonic/issues/87) Fix dependency bundling for Mac OS ## [0.0.1-alpha2] - 2023-03-17 diff --git a/Makefile b/Makefile index 2ae51a9..28ca584 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,15 @@ app_name = Supersonic build: go build +# dylibbundler doesn't seem to pick up on the Python framework dependency, +# so the last 3 cmds move it over manually. This is a bit fragile though +# since it assumes a specific location and version of the dependency package_macos: fyne package -os darwin -name $(app_name) -icon $(icon_path_mac) dylibbundler -od -b -x ./Supersonic.app/Contents/MacOS/supersonic -d ./Supersonic.app/Contents/Frameworks/ -p @executable_path/../Frameworks/ + install_name_tool -change "/usr/local/opt/python@3.11/Frameworks/Python.framework/Versions/3.11/Python" "@executable_path/../Frameworks/Python" "./Supersonic.app/Contents/Frameworks/libvapoursynth-script.0.dylib" + cp /usr/local/opt/python@3.11/Frameworks/Python.framework/Versions/3.11/Python ./Supersonic.app/Contents/Frameworks + codesign --force --deep --preserve-metadata=entitlements,requirements,flags,runtime --sign - "./Supersonic.app/Contents/MacOS/supersonic" package_windows: fyne package -os windows -name $(app_name) -icon $(icon_path)