diff options
| author | Be <be@mixxx.org> | 2020-12-29 17:04:13 -0600 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2021-01-01 10:38:42 -0600 |
| commit | e19b7587c2d43ca94598a4bad12c009b07dd4c06 (patch) | |
| tree | 2613a63517e83e3cf30fb32d40d94a90b6e34c16 /tools | |
| parent | cb1d8afb361c9f209b4b9f89f05ae35b4e157eac (diff) | |
use macOS build env with Qt 5.12.3, KeyFinder, plus other updates
Qt 5.12.3 is required for Mixxx to show any windows on macOS 11.
https://bugreports.qt.io/browse/QTBUG-87014?focusedCommentId=546025&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-546025
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/macos_buildenv.sh | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh index 5f926eff82..100708252d 100755 --- a/tools/macos_buildenv.sh +++ b/tools/macos_buildenv.sh @@ -38,26 +38,15 @@ case "$COMMAND" in ;; setup) - if [[ "$BUILDENV_NAME" =~ .*macosminimum([0-9]*\.[0-9]*).* ]]; then - # bash and zsh have different ways of getting the matched string - # zsh's BASH_REMATCH option is not actually compatible with bash - # shellcheck disable=SC2154 - if [ -n "${BASH_REMATCH[1]}" ]; then - export MACOSX_DEPLOYMENT_TARGET="${BASH_REMATCH[1]}" - elif [ -n "$match" ]; then - export MACOSX_DEPLOYMENT_TARGET="${match[1]}" - fi - else - echo "Build environment did not match expected pattern. Check ${MIXXX_ROOT}/packaging/macos/build_environment file." >&2 - return - fi + # Minimum required by Qt 5.12 + MACOSX_DEPLOYMENT_TARGET=10.12 BUILDENV_PATH="${BUILDENV_BASEPATH}/${BUILDENV_NAME}" mkdir -p "${BUILDENV_BASEPATH}" if [ ! -d "${BUILDENV_PATH}" ]; then if [ "$1" != "--profile" ]; then echo "Build environment $BUILDENV_NAME not found in mixxx repository, downloading it..." - curl "https://downloads.mixxx.org/builds/buildserver/2.3.x-unix/${BUILDENV_NAME}.tar.gz" -o "${BUILDENV_PATH}.tar.gz" + curl "https://downloads.mixxx.org/builds/buildserver/2.3.x-macosx/${BUILDENV_NAME}.tar.gz" -o "${BUILDENV_PATH}.tar.gz" OBSERVED_SHA256=$(shasum -a 256 "${BUILDENV_PATH}.tar.gz"|cut -f 1 -d' ') if [[ "$OBSERVED_SHA256" == "$BUILDENV_SHA256" ]]; then echo "Download matched expected SHA256 sum $BUILDENV_SHA256" |