CI: Update build scripts - e656f4e

obsproject · Dec 4, 2020 · 84940fa · 84940fa
1 parent e656f4e
commit 84940fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/build-script-macos-01.sh b/build-script-macos-01.sh
@@ -11,8 +11,8 @@ export COLOR_BLUE=$(tput setaf 4)
 export COLOR_ORANGE=$(tput setaf 3)
 export COLOR_RESET=$(tput sgr0)
 
-export MAC_QT_VERSION="5.14.1"
-export MAC_QT_HASH="6f17f488f512b39c2feb57d83a5e0a13dcef32999bea2e2a8f832f54a29badb8"
+export MAC_QT_VERSION="5.15.2"
+export MAC_QT_HASH="3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240"
 export LIBLAME_VERSION="3.100"
 export LIBLAME_HASH="ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e"
 export LIBPNG_VERSION="1.6.37"

diff --git a/build-script-macos-02.sh b/build-script-macos-02.sh
@@ -11,8 +11,8 @@ export COLOR_BLUE=$(tput setaf 4)
 export COLOR_ORANGE=$(tput setaf 3)
 export COLOR_RESET=$(tput sgr0)
 
-export MAC_QT_VERSION="5.14.1"
-export MAC_QT_HASH="6f17f488f512b39c2feb57d83a5e0a13dcef32999bea2e2a8f832f54a29badb8"
+export MAC_QT_VERSION="5.15.2"
+export MAC_QT_HASH="3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240"
 export LIBLAME_VERSION="3.100"
 export LIBLAME_HASH="ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e"
 export LIBPNG_VERSION="1.6.37"
@@ -176,7 +176,9 @@ build_06_build_dependency_qt() {
         ${BASE_DIR}/utils/apply_patch "https://github.com/qt/qtbase/commit/8e5d6b422136dcca51f2c18fddcf28016f5ab99a.patch?full_index=1" "943e5e69160a39bcda0e88289b27c95732db1a195f0cf211601f10f1a067e608"
         cd ..
     else
-        cd qt-everywhere-src-${MAC_QT_VERSION}
+        cd qt-everywhere-src-${MAC_QT_VERSION}/qtbase
+        ${BASE_DIR}/utils/apply_patch "https://gist.githubusercontent.com/PatTheMav/e296886af7485d8cc85857ea4e99706b/raw/efa9f697c3b6332eeb58ce49aaccec2bb4a1674b/obs-issue-3799-qt.patch" "234ee6b21a008a233382c872ac097707ce83e401d3bcd5f1b244c09c0817f3aa"
+        cd ..
     fi
     mkdir build
     cd build