From 5aa9fce9769668e00807b47108899434a4beb431 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Fri, 9 Feb 2024 01:43:20 +0300 Subject: [PATCH] Fix deprecations and weird bugs --- dependencies/boost/setup.sh | 4 ++-- dependencies/qt/scenegraph.patch | 10 ++++++++++ dependencies/qt/setup.sh | 10 ++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 dependencies/qt/scenegraph.patch diff --git a/dependencies/boost/setup.sh b/dependencies/boost/setup.sh index 8a35c2e..a7f9bb9 100755 --- a/dependencies/boost/setup.sh +++ b/dependencies/boost/setup.sh @@ -6,9 +6,9 @@ if [[ ! $(which wget) ]]; then fi ROOT=$(pwd) -VER=1_78_0 +VER=1_84_0 -wget -O ${ROOT}/boost_${VER}.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_${VER}.tar.gz +wget -O ${ROOT}/boost_${VER}.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_${VER}.tar.gz tar -xzf ${ROOT}/boost_${VER}.tar.gz mv ${ROOT}/boost_${VER} boost diff --git a/dependencies/qt/scenegraph.patch b/dependencies/qt/scenegraph.patch new file mode 100644 index 0000000..d31529d --- /dev/null +++ b/dependencies/qt/scenegraph.patch @@ -0,0 +1,10 @@ +--- a/src/plugins/scenegraph/scenegraph.pro 2024-02-09 01:11:28.263528844 +0300 ++++ b/src/plugins/scenegraph/scenegraph.pro 2024-02-09 01:34:10.617174164 +0300 +@@ -1,5 +1,6 @@ + TEMPLATE = subdirs + QT_FOR_CONFIG += quick +-qtConfig(d3d12): SUBDIRS += d3d12 ++# I have no idea why there is no condition to exclude this for cross builds ++# qtConfig(d3d12): SUBDIRS += d3d12 + qtConfig(openvg): SUBDIRS += openvg + diff --git a/dependencies/qt/setup.sh b/dependencies/qt/setup.sh index 0e3b6a9..0162c4d 100755 --- a/dependencies/qt/setup.sh +++ b/dependencies/qt/setup.sh @@ -7,11 +7,13 @@ if [[ ! $(which git) ]]; then exit -1 fi -git clone -b 5.15.2 https://github.com/qt/qtbase.git ${ROOT}/qtbase -git clone -b 5.15.2 https://github.com/qt/qttools.git ${ROOT}/qttools -git clone -b 5.15.2 https://github.com/qt/qttranslations.git ${ROOT}/qttranslations -git clone -b 5.15.2 https://github.com/qt/qtdeclarative.git ${ROOT}/qtdeclarative +git clone -b 5.15 https://github.com/qt/qtbase.git ${ROOT}/qtbase +git clone -b 5.15 https://github.com/qt/qttools.git ${ROOT}/qttools +git clone -b 5.15 https://github.com/qt/qttranslations.git ${ROOT}/qttranslations +git clone -b 5.15 https://github.com/qt/qtdeclarative.git ${ROOT}/qtdeclarative cd ${ROOT}/qtbase patch -s -p1 < ${ROOT}/stack_protector.patch +cd ${ROOT}/qtdeclarative +patch -s -p1 < ${ROOT}/scenegraph.patch cd ${ROOT} -- 1.7.1