Merge branch 'bugfixes' into feature

arch1t3cht · Oct 13, 2023 · eb434fe · eb434fe
2 parents b3eb182 + bf02b0a
commit eb434fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -143,7 +143,7 @@ jobs:
         if: startsWith(matrix.config.os, 'ubuntu-')
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build build-essential libx11-dev libwxgtk3.0-gtk3-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libuchardet-dev libpulse-dev libopenal-dev libjansson-dev
+          sudo apt-get install ninja-build build-essential libx11-dev libwxgtk3.0-gtk3-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libuchardet-dev libpulse-dev libopenal-dev libjansson-dev nasm
 
       - name: Configure
         run: meson setup build ${{ matrix.config.args }} -Dbuildtype=${{ matrix.config.buildtype }}

diff --git a/tools/osx-bundle.sh b/tools/osx-bundle.sh
@@ -105,5 +105,12 @@ echo
 echo "---- Fixing libraries ----"
 sudo python3 "${SRC_DIR}/tools/osx-fix-libs.py" "${PKG_DIR}/Contents/MacOS/aegisub" || exit $?
 
+echo
+echo "---- Resigning ----"
+# After bundling and rewriting dylib paths we need to resign everything.
+for fname in "${PKG_DIR}/Contents/MacOS/"*; do
+  codesign -s ${AEGISUB_BUNDLE_SIGNATURE:--} -vf "${fname}"
+done
+
 echo
 echo "Done creating \"${PKG_DIR}\""