Patch qt for newer mac fix

data/macos/build-deps.sh

@@ -4,12 +4,12 @@
 # automake, autoconf, bison, flex, libtool
 # p5-libxml-perl, p5-xml-libxml, p7zip, pkgconfig
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # stop on error
 
 set -e
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # cd to correct path
 
 if [ -f Makefile ]; then
@@ -21,7 +21,7 @@ fi
 
 source common.env
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # function to remove old stuff
 
 cleanup()
@@ -59,7 +59,7 @@ exit 0
 
 }
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # function to build base libs
 
 build_base()
@@ -79,7 +79,7 @@ export CXXFLAGS="${CFLAGS} -fvisibility-inlines-hidden"
 export LDFLAGS="-fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs"
 export LDFLAGS="${LDFLAGS} -L${PREFIX}/lib -m${ARCH}"
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # pkgconfig
 
 if [ ! -d pkg-config-${PKG_CONFIG_VERSION} ]; then
@@ -97,7 +97,7 @@ if [ ! -f pkg-config-${PKG_CONFIG_VERSION}_$ARCH/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # liblo
 
 if [ ! -d liblo-${LIBLO_VERSION} ]; then
@@ -117,13 +117,13 @@ if [ ! -f liblo-${LIBLO_VERSION}_$ARCH/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 
 if [ x"${ARCH}" = x"32" ]; then
   return
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # file/magic
 
 if [ ! -d file-${FILE_VERSION} ]; then
@@ -140,7 +140,7 @@ if [ ! -f file-${FILE_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # libogg
 
 if [ ! -d libogg-${LIBOGG_VERSION} ]; then
@@ -157,7 +157,7 @@ if [ ! -f libogg-${LIBOGG_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # libvorbis
 
 if [ ! -d libvorbis-${LIBVORBIS_VERSION} ]; then
@@ -174,7 +174,7 @@ if [ ! -f libvorbis-${LIBVORBIS_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # flac
 
 if [ ! -d flac-${FLAC_VERSION} ]; then
@@ -194,7 +194,7 @@ if [ ! -f flac-${FLAC_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # libsndfile
 
 if [ ! -d libsndfile-${LIBSNDFILE_VERSION} ]; then
@@ -212,7 +212,7 @@ if [ ! -f libsndfile-${LIBSNDFILE_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # libgig
 
 if [ ! -d libgig-${LIBGIG_VERSION} ]; then
@@ -233,7 +233,7 @@ if [ ! -f libgig-${LIBGIG_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # linuxsampler
 
 if [ ! -d linuxsampler-${LINUXSAMPLER_VERSION} ]; then
@@ -249,8 +249,6 @@ if [ ! -f linuxsampler-${LINUXSAMPLER_VERSION}/build-done ]; then
     sed -i -e "s|HAVE_AU|HAVE_VST|" src/hostplugins/Makefile.am
     touch patched
   fi
-  #rm -f configure
-  #env PATH=/opt/local/bin:$PATH make -f Makefile.svn configure
   env PATH=/opt/local/bin:$PATH /opt/local/bin/aclocal -I /opt/local/share/aclocal
   env PATH=/opt/local/bin:$PATH /opt/local/bin/glibtoolize --force --copy
   env PATH=/opt/local/bin:$PATH /opt/local/bin/autoheader
@@ -272,7 +270,7 @@ if [ ! -f linuxsampler-${LINUXSAMPLER_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # libffi
 
 if [ ! -d libffi-${LIBFFI_VERSION} ]; then
@@ -289,7 +287,7 @@ if [ ! -f libffi-${LIBFFI_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # gettext
 
 if [ ! -d gettext-${GETTEXT_VERSION} ]; then
@@ -306,7 +304,7 @@ if [ ! -f gettext-${GETTEXT_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # glib
 
 if [ ! -d glib-${GLIB_VERSION} ]; then
@@ -329,7 +327,7 @@ if [ ! -f glib-${GLIB_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # fluidsynth
 
 if [ ! -d fluidsynth-${FLUIDSYNTH_VERSION} ]; then
@@ -355,7 +353,7 @@ fi
 
 }
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # build base libs
 
 export ARCH=32
@@ -364,7 +362,7 @@ build_base
 export ARCH=64
 build_base
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # set flags for qt stuff
 
 export PREFIX=${TARGETDIR}/carla
@@ -381,7 +379,7 @@ export MAKE=/usr/bin/make
 export CFG_ARCH=x86_64
 export QMAKESPEC=macx-clang
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # qt5-base download
 
 if [ ! -d qtbase-opensource-src-${QT5_VERSION} ]; then
@@ -390,13 +388,17 @@ if [ ! -d qtbase-opensource-src-${QT5_VERSION} ]; then
   /opt/local/bin/7z x qtbase-opensource-src-${QT5_VERSION}.tar
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # qt5-base (64bit, shared, framework)
 
 if [ ! -f qtbase-opensource-src-${QT5_VERSION}/build-done ]; then
   cd qtbase-opensource-src-${QT5_VERSION}
   if [ ! -f configured ]; then
-    sed -i -e "s|AWK=.*|AWK=/opt/local/bin/gawk|" configure
+    if [ ! -f carla-patched ]; then
+      sed -i -e "s|AWK=.*|AWK=/opt/local/bin/gawk|" configure
+      patch -p1 -i ../patches/qt55-newosx-fix.patch
+      touch carla-patched
+    fi
     chmod +x configure
     chmod -R 777 config.tests/unix/
     ./configure -release -shared -opensource -confirm-license -force-pkg-config -platform macx-clang -framework \
@@ -462,7 +464,7 @@ QT59_ARGS="./configure -prefix ${PREFIX} -plugindir ${PREFIX}/lib/qt5/plugins -h
                 -qt-sqlite
 "
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # qt5-mac-extras
 
 if [ ! -d qtmacextras-opensource-src-${QT5_VERSION} ]; then
@@ -480,7 +482,7 @@ if [ ! -f qtmacextras-opensource-src-${QT5_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # qt5-svg
 
 if [ ! -d qtsvg-opensource-src-${QT5_VERSION} ]; then
@@ -498,7 +500,7 @@ if [ ! -f qtsvg-opensource-src-${QT5_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # python
 
 if [ ! -d Python-${PYTHON_VERSION} ]; then
@@ -515,7 +517,7 @@ if [ ! -f Python-${PYTHON_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # sip
 
 if [ ! -d sip-${SIP_VERSION} ]; then
@@ -532,7 +534,7 @@ if [ ! -f sip-${SIP_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # pyqt5
 
 if [ ! -d PyQt-gpl-${PYQT5_VERSION} ]; then
@@ -549,7 +551,7 @@ if [ ! -f PyQt-gpl-${PYQT5_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # pyliblo
 
 if [ ! -d pyliblo-${PYLIBLO_VERSION} ]; then
@@ -566,7 +568,7 @@ if [ ! -f pyliblo-${PYLIBLO_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # cxfreeze
 
 if [ ! -d cx_Freeze-${CXFREEZE_VERSION} ]; then
@@ -583,4 +585,4 @@ if [ ! -f cx_Freeze-${CXFREEZE_VERSION}/build-done ]; then
   cd ..
 fi
 
-# ------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------