Use Qt 5.12.10 for macos-universal, fixes bus error

bootstrap-jack2.sh

@@ -138,7 +138,7 @@ if [ "${WIN32}" -eq 1 ]; then
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/rpcsal.h"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/sal.h"
     remove_file portaudio19 "${PORTAUDIO_VERSION}" "src/hostapi/wasapi/mingw-include/structuredquery.h"
-    build_autoconf portaudio19 "${PORTAUDIO_VERSION}" "--enable-cxx --with-asiodir="${ASIO_DIR}" --with-winapi=asio,directx,wasapi,wdmks,wmme"
+    build_autoconf portaudio19 "${PORTAUDIO_VERSION}" "--enable-cxx --with-asiodir='${ASIO_DIR}' --with-winapi=asio,directx,wasapi,wdmks,wmme"
     install_file portaudio19 "${PORTAUDIO_VERSION}" "include/pa_asio.h" "include"
 fi
 
@@ -163,7 +163,7 @@ if [ "${WIN64}" -eq 1 ]; then
     source setup/functions.sh
 
     copy_download tre tre-x32 "${TRE_VERSION}"
-    build_autoconf tre-x32 "${TRE_VERSION}" "--disable-nls --libdir="${PAWPAW_PREFIX}"/lib32"
+    build_autoconf tre-x32 "${TRE_VERSION}" "--disable-nls --libdir='${PAWPAW_PREFIX}/lib32'"
 
     if [ ! -e "${PAWPAW_PREFIX}/lib/libtre32.a" ]; then
         ln -s "${PAWPAW_PREFIX}/lib32/libtre.a" "${PAWPAW_PREFIX}/lib/libtre32.a"

bootstrap-plugins.sh

@@ -106,7 +106,7 @@ build_autoconf liblo "${LIBLO_VERSION}" "--enable-threads --disable-examples --d
 # lv2
 
 download lv2 "${LV2_VERSION}" "http://lv2plug.in/spec" "tar.bz2"
-build_waf lv2 "${LV2_VERSION}" "--lv2dir=${PAWPAW_PREFIX}/lib/lv2 --no-coverage --no-plugins"
+build_waf lv2 "${LV2_VERSION}" "--lv2dir='${PAWPAW_PREFIX}/lib/lv2' --no-coverage --no-plugins"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # serd
@@ -178,14 +178,14 @@ build_cmake fluidsynth ${FLUIDSYNTH_VERSION} "${FLUIDSYNTH_EXTRAFLAGS}"
 # mxml
 
 download mxml ${MXML_VERSION} "https://github.com/michaelrsweet/mxml/archive"
-build_autoconf mxml ${MXML_VERSION} "--disable-shared --prefix=${PAWPAW_PREFIX}"
+build_autoconf mxml ${MXML_VERSION}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # zlib
 
 if [ "${MACOS}" -eq 0 ]; then
     download zlib ${ZLIB_VERSION} "https://github.com/madler/zlib/archive"
-    build_conf zlib ${ZLIB_VERSION} "--static --prefix=${PAWPAW_PREFIX}"
+    build_conf zlib ${ZLIB_VERSION} "--static --prefix='${PAWPAW_PREFIX}'"
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------

bootstrap-qt.sh

@@ -203,7 +203,7 @@ qtbase_conf_args+=" -no-sctp"
 qtbase_conf_args+=" -no-securetransport"
 qtbase_conf_args+=" -no-syslog"
 qtbase_conf_args+=" -no-tslib"
-if [ "${MACOS_UNIVERSAL}" -eq 0 ]; then
+if [ "${QT5_MVERSION}" = "5.9" ]; then
     qtbase_conf_args+=" -no-xinput2"
     qtbase_conf_args+=" -no-xkbcommon-evdev"
     qtbase_conf_args+=" -no-xkbcommon-x11"
@@ -271,6 +271,7 @@ if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
     patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/common/macx.conf" 's/QMAKE_APPLE_DEVICE_ARCHS = x86_64/QMAKE_APPLE_DEVICE_ARCHS = arm64 x86_64/'
     patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/common/macx.conf" 's/QT_MAC_SDK_VERSION_MIN = 10.13/QT_MAC_SDK_VERSION_MIN = 10.12/'
     patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/common/macx.conf" 's/QT_MAC_SDK_VERSION_MAX = 10.15/QT_MAC_SDK_VERSION_MAX = 10.12/'
+    patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/features/toolchain.prf" 's/-arch $$QMAKE_APPLE_DEVICE_ARCHS/-arch arm64/'
 elif [ "${MACOS}" -eq 1 ]; then
     patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/macx-clang/qmake.conf" 's/10.10/10.8/'
 fi

patches/qtbase/macos-universal/01_force-10.12-universal-build.patch

@@ -1,25 +1,3 @@
-diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
-index 5bab897..ef2f6b2 100644
---- a/src/corelib/io/qfilesystemengine_unix.cpp
-+++ b/src/corelib/io/qfilesystemengine_unix.cpp
-@@ -195,7 +195,7 @@ static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &e
- 
- namespace {
- namespace GetFileTimes {
--#if !QT_CONFIG(futimens) && (QT_CONFIG(futimes))
-+#if 1
- template <typename T>
- static inline typename QtPrivate::QEnableIf<(&T::st_atim, &T::st_mtim, true)>::Type get(const T *p, struct timeval *access, struct timeval *modification)
- {
-@@ -1401,7 +1401,7 @@ bool QFileSystemEngine::setFileTime(int fd, const QDateTime &newDate, QAbstractF
-         return false;
-     }
- 
--#if QT_CONFIG(futimens)
-+#if 0
-     struct timespec ts[2];
- 
-     ts[0].tv_sec = ts[1].tv_sec = 0;
 diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
 index 6265d51..e3d96d7 100644
 --- a/src/gui/painting/qdrawhelper.cpp
@@ -43,59 +21,3 @@ index 3212ffd..05ca742 100644
  
  #include <private/qdrawingprimitive_sse2_p.h>
  #include <private/qpaintengine_raster_p.h>
-diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h
-index 69aa793..ba65b74 100644
---- a/src/plugins/platforms/cocoa/qcocoahelpers.h
-+++ b/src/plugins/platforms/cocoa/qcocoahelpers.h
-@@ -178,7 +178,7 @@ T qt_mac_resolveOption(const T &fallback, QWindow *window, const QByteArray &pro
- 
- // -------------------------------------------------------------------------
- 
--#if !defined(Q_PROCESSOR_X86_64)
-+#if !defined(Q_PROCESSOR_X86_64) && !defined(Q_PROCESSOR_ARM_64)
- #error "32-bit builds are not supported"
- #endif
- 
-@@ -281,6 +281,7 @@ ReturnType qt_msgSendSuper(id receiver, SEL selector, Args... args)
-     return superFn(&sup, selector, args...);
- }
- 
-+#if !defined(Q_PROCESSOR_ARM_64)
- template <typename ReturnType, typename... Args>
- ReturnType qt_msgSendSuper_stret(id receiver, SEL selector, Args... args)
- {
-@@ -295,6 +296,7 @@ ReturnType qt_msgSendSuper_stret(id receiver, SEL selector, Args... args)
-     superStretFn(&ret, &sup, selector, args...);
-     return ret;
- }
-+#endif
- 
- template<typename... Args>
- class QSendSuperHelper {
-@@ -335,11 +337,13 @@ private:
-         return qt_msgSendSuper<ReturnType>(m_receiver, m_selector, std::get<Is>(args)...);
-     }
- 
-+#if !defined(Q_PROCESSOR_ARM_64)
-     template <typename ReturnType, int... Is>
-     if_requires_stret<ReturnType, true> msgSendSuper(std::tuple<Args...>& args, QtPrivate::IndexesList<Is...>)
-     {
-         return qt_msgSendSuper_stret<ReturnType>(m_receiver, m_selector, std::get<Is>(args)...);
-     }
-+#endif
- 
-     template <typename ReturnType>
-     ReturnType msgSendSuper(std::tuple<Args...>& args)
-diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
-index d36a7f6..039fdf4 100644
---- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
-+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
-@@ -372,7 +372,7 @@ QString qt_mac_removeAmpersandEscapes(QString s)
- 
- // -------------------------------------------------------------------------
- 
--#if !defined(Q_PROCESSOR_X86_64)
-+#if !defined(Q_PROCESSOR_X86_64) && !defined(Q_PROCESSOR_ARM_64)
- #error "32-bit builds are not supported"
- #endif
- 

setup/versions.sh

@@ -25,7 +25,7 @@ ZLIB_VERSION=1.2.11
 
 # qt stuff
 if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
-    QT5_VERSION=5.12.5
+    QT5_VERSION=5.12.10
     QT5_MVERSION=5.12
 else
     QT5_VERSION=5.9.8