update mac sdk

rodlie · Jan 2, 2022 · f6eae5c · f6eae5c
1 parent fa06ff6
commit f6eae5c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup Qt
-      run: curl -L https://github.com/rodlie/NatronPluginManager/releases/download/continuous/macos-Qt5.12.11.tar.gz --output qt.tar.gz && sudo tar xf qt.tar.gz -C /opt
+      run: curl -L https://github.com/rodlie/NatronPluginManager/releases/download/continuous/qtbase-5.15-static-macos.tar.bz2 --output qt.tar.bz2 && sudo tar xf qt.tar.bz2 -C /opt
     - name: Setup libzip
       run: curl -L https://github.com/rodlie/NatronPluginManager/releases/download/continuous/libzip-HighSierra.tar.gz --output libzip.tar.gz && sudo tar xf libzip.tar.gz -C /opt
     - name: Setup local
@@ -26,7 +26,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup Qt
-      run: curl -L https://github.com/rodlie/NatronPluginManager/releases/download/continuous/macos-Qt5.12.11.tar.gz --output qt.tar.gz && sudo tar xf qt.tar.gz -C /opt
+      run: curl -L https://github.com/rodlie/NatronPluginManager/releases/download/continuous/qtbase-5.15-static-macos.tar.bz2 --output qt.tar.bz2 && sudo tar xf qt.tar.bz2 -C /opt
     - name: Setup libzip
       run: curl -L https://github.com/rodlie/NatronPluginManager/releases/download/continuous/libzip-HighSierra.tar.gz --output libzip.tar.gz && sudo tar xf libzip.tar.gz -C /opt
     - name: Setup local

diff --git a/docs/qt.md b/docs/qt.md
@@ -35,8 +35,30 @@ Natron Plug-in Manager for Windows is built using MXE (MinGW) on Linux. See [min
 
 # macOS
 
-Using Qt 5.15 from macports produces an app bundle twice as large as using the official binaries (5.12), but the official 5.15 binaries are not compatible with older macOS versions anymore. Build from scratch with patches from macports for macOS 10.13.
-
 ```
-N/A
+./configure \
+-prefix /opt/qtbase-5.15 \
+-opensource \
+-release \
+-confirm-license \
+-no-glib \
+-no-dbus \
+-static \
+-nomake examples \
+-nomake tests \
+-no-icu \
+-no-sql-{db2,ibase,mysql,oci,odbc,psql,sqlite2,sqlite,tds} \
+-qt-zlib \
+-qt-libpng \
+-qt-libjpeg \
+-no-fontconfig \
+-qt-freetype \
+-qt-harfbuzz \
+-qt-pcre \
+-no-cups \
+-securetransport \
+-no-avx \
+-no-avx2 \
+-no-avx512
 ```
+
diff --git a/share/macos.sh b/share/macos.sh
@@ -21,7 +21,7 @@
 set -e -x
 
 CWD=`pwd`
-SDK="/opt/Qt5.12.11/5.12.11/clang_64"
+SDK="/opt/qtbase-5.15"
 MKJOBS=${MKJOBS:-1}
 CMAKE=${CMAKE:-/opt/local/bin/cmake}
 OSX_MIN=10.13
@@ -44,14 +44,6 @@ $CMAKE \
 make -j${MKJOBS}
 
 $SDK/bin/macdeployqt NatronPluginManager.app
-
-#rm -rf NatronPluginManager.app/Contents/Frameworks/QtDBus.framework
-rm -rf NatronPluginManager.app/Contents/Frameworks/QtSvg.framework
-
-rm -rf NatronPluginManager.app/Contents/PlugIns/bearer
-rm -rf NatronPluginManager.app/Contents/PlugIns/iconengines
-rm -rf NatronPluginManager.app/Contents/PlugIns/imageformats
-
 strip -S -x NatronPluginManager.app/Contents/MacOS/NatronPluginManager
 
 mkdir NatronPluginManager