Signed-off-by: falkTX <falktx@falktx.com>pull/25/head
@@ -8,7 +8,7 @@ on: | |||||
branches: | branches: | ||||
- '*' | - '*' | ||||
env: | env: | ||||
CACHE_VERSION: 2 | |||||
CACHE_VERSION: 3 | |||||
DEBIAN_FRONTEND: noninteractive | DEBIAN_FRONTEND: noninteractive | ||||
HOMEBREW_NO_AUTO_UPDATE: 1 | HOMEBREW_NO_AUTO_UPDATE: 1 | ||||
@@ -280,6 +280,7 @@ PYQT5_EXTRAFLAGS="--qmake ${PAWPAW_PREFIX}/bin/qmake --sip ${PAWPAW_PREFIX}/bin/ | |||||
download PyQt5${PYQT5_SUFFIX} "${PYQT5_VERSION}" "${PYQT5_DOWNLOAD_URL}" | download PyQt5${PYQT5_SUFFIX} "${PYQT5_VERSION}" "${PYQT5_DOWNLOAD_URL}" | ||||
build_pyqt PyQt5${PYQT5_SUFFIX} "${PYQT5_VERSION}" "${PYQT5_EXTRAFLAGS} --concatenate --confirm-license" | build_pyqt PyQt5${PYQT5_SUFFIX} "${PYQT5_VERSION}" "${PYQT5_EXTRAFLAGS} --concatenate --confirm-license" | ||||
# --verbose | |||||
if [ "${CROSS_COMPILING}" -eq 1 ]; then | if [ "${CROSS_COMPILING}" -eq 1 ]; then | ||||
unset PKG_CONFIG_LIBDIR | unset PKG_CONFIG_LIBDIR | ||||
@@ -89,8 +89,8 @@ if [ "${MACOS}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then | |||||
GLIB_EXTRAFLAGS+=" --with-threads=posix" | GLIB_EXTRAFLAGS+=" --with-threads=posix" | ||||
fi | fi | ||||
if [ "${WIN64}" -eq 1 ]; then | |||||
export EXTRA_CFLAGS="-Wno-format" | |||||
if [ "${WIN32}" -eq 1 ]; then | |||||
export EXTRA_CFLAGS="-Wno-format -Wno-format-overflow" | |||||
fi | fi | ||||
download glib ${GLIB_VERSION} "${GLIB_URL}" "tar.xz" | download glib ${GLIB_VERSION} "${GLIB_URL}" "tar.xz" | ||||
@@ -271,9 +271,13 @@ elif [ "${MACOS}" -eq 1 ]; then | |||||
patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/macx-clang/qmake.conf" 's/10.10/10.8/' | patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/macx-clang/qmake.conf" 's/10.10/10.8/' | ||||
fi | fi | ||||
if [ "${WIN32}" -eq 1 ]; then | if [ "${WIN32}" -eq 1 ]; then | ||||
patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/win32-g++/qmake.conf" 's/= -shared/= -static -shared/' | |||||
patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/win32-g++/qmake.conf" 's/= -fno-keep-inline-dllexport/= -Wno-deprecated-declarations -fno-keep-inline-dllexport/' | |||||
patch_file qtbase${qtsuffix} ${QT5_VERSION} "src/plugins/platforms/direct2d/direct2d.pro" 's/-lVersion/-lversion/' | |||||
if [ "${QT5_MVERSION}" = "5.12" ]; then | |||||
patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/common/g++-win32.conf" 's/= -shared/= -static -shared/' | |||||
patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/win32-g++/qmake.conf" 's/= -fno-keep-inline-dllexport/= -Wno-deprecated-declarations -fno-keep-inline-dllexport/' | |||||
else | |||||
patch_file qtbase${qtsuffix} ${QT5_VERSION} "mkspecs/win32-g++/qmake.conf" 's/= -shared/= -static -shared/' | |||||
patch_file qtbase${qtsuffix} ${QT5_VERSION} "src/plugins/platforms/direct2d/direct2d.pro" 's/-lVersion/-lversion/' | |||||
fi | |||||
fi | fi | ||||
build_qt_conf qtbase "${qtbase_conf_args}" | build_qt_conf qtbase "${qtbase_conf_args}" | ||||
@@ -42,6 +42,12 @@ ZLIB_URL=https://github.com/madler/zlib.git | |||||
FFTW_VERSION=3.3.10 | FFTW_VERSION=3.3.10 | ||||
FFTW_URL=http://www.fftw.org | FFTW_URL=http://www.fftw.org | ||||
LIBFFI_VERSION=3.3 | |||||
LIBFFI_URL=https://sourceware.org/pub/libffi | |||||
PCRE_VERSION=8.45 | |||||
PCRE_URL=http://download.sourceforge.net/pcre | |||||
GLIB_MVERSION=2.45 | GLIB_MVERSION=2.45 | ||||
GLIB_VERSION=2.45.8 | GLIB_VERSION=2.45.8 | ||||
GLIB_URL=https://download.gnome.org/sources/glib/${GLIB_MVERSION} | GLIB_URL=https://download.gnome.org/sources/glib/${GLIB_MVERSION} | ||||
@@ -49,9 +55,6 @@ GLIB_URL=https://download.gnome.org/sources/glib/${GLIB_MVERSION} | |||||
LIBLO_VERSION=0.31 | LIBLO_VERSION=0.31 | ||||
LIBLO_URL=http://download.sourceforge.net/liblo | LIBLO_URL=http://download.sourceforge.net/liblo | ||||
PCRE_VERSION=8.45 | |||||
PCRE_URL=http://download.sourceforge.net/pcre | |||||
LV2_VERSION=6cefc7df1a6158c79d23029df183c09b10b88cad | LV2_VERSION=6cefc7df1a6158c79d23029df183c09b10b88cad | ||||
LV2_URL=https://gitlab.com/lv2/lv2.git | LV2_URL=https://gitlab.com/lv2/lv2.git | ||||
@@ -116,9 +119,6 @@ QT5_URL=https://download.qt.io/archive/qt/${QT5_MVERSION}/${QT5_VERSION}/submodu | |||||
FILE_VERSION=5.34 | FILE_VERSION=5.34 | ||||
FILE_URL=ftp://ftp.astron.com/pub/file | FILE_URL=ftp://ftp.astron.com/pub/file | ||||
LIBFFI_VERSION=3.3 | |||||
LIBFFI_URL=https://sourceware.org/pub/libffi | |||||
if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then | if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then | ||||
CXFREEZE_VERSION=e1c33afea842bc61dac82145a8a0be5fbd318a92 # 6.4.2 | CXFREEZE_VERSION=e1c33afea842bc61dac82145a8a0be5fbd318a92 # 6.4.2 | ||||
PYTHON_VERSION=3.9.5 | PYTHON_VERSION=3.9.5 | ||||