diff options
Diffstat (limited to 'source/l/qt6/patches')
| -rw-r--r-- | source/l/qt6/patches/nodejs-allow-32bit.patch | 16 | ||||
| -rw-r--r-- | source/l/qt6/patches/qt5.mysql.h.diff | 11 | ||||
| -rw-r--r-- | source/l/qt6/patches/qt6-3d_gcc13.patch | 11 | ||||
| -rw-r--r-- | source/l/qt6/patches/qt6-webengine_32bit_compressing_files.patch | 25 |
4 files changed, 63 insertions, 0 deletions
diff --git a/source/l/qt6/patches/nodejs-allow-32bit.patch b/source/l/qt6/patches/nodejs-allow-32bit.patch new file mode 100644 index 000000000..5b84823c5 --- /dev/null +++ b/source/l/qt6/patches/nodejs-allow-32bit.patch @@ -0,0 +1,16 @@ +--- ./qtwebengine/configure.cmake.orig 2024-02-27 13:57:02.000000000 -0600 ++++ ./qtwebengine/configure.cmake 2024-02-27 17:49:26.845071893 -0600 +@@ -492,13 +492,6 @@ + MESSAGE "node.js version 14 or later is required." + ) + add_check_for_support( +- MODULES QtWebEngine +- CONDITION NOT (Nodejs_ARCH STREQUAL "ia32") AND +- NOT (Nodejs_ARCH STREQUAL "x86") AND +- NOT (Nodejs_ARCH STREQUAL "arm") +- MESSAGE "32bit version of Nodejs is not supported." +-) +-add_check_for_support( + MODULES QtWebEngine QtPdf + CONDITION Python3_EXECUTABLE + MESSAGE "Python version 3.6 or later is required." diff --git a/source/l/qt6/patches/qt5.mysql.h.diff b/source/l/qt6/patches/qt5.mysql.h.diff new file mode 100644 index 000000000..f1cf11b91 --- /dev/null +++ b/source/l/qt6/patches/qt5.mysql.h.diff @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.orig 2017-05-26 14:43:31.000000000 +0200 ++++ qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-06-17 22:11:34.211899826 +0200 +@@ -57,7 +57,7 @@ + #include <QtCore/qt_windows.h> + #endif + +-#include <mysql.h> ++#include <mysql/mysql.h> + + #ifdef QT_PLUGIN + #define Q_EXPORT_SQLDRIVER_MYSQL diff --git a/source/l/qt6/patches/qt6-3d_gcc13.patch b/source/l/qt6/patches/qt6-3d_gcc13.patch new file mode 100644 index 000000000..7128597de --- /dev/null +++ b/source/l/qt6/patches/qt6-3d_gcc13.patch @@ -0,0 +1,11 @@ +--- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp.orig 2023-09-24 13:38:48.000000000 +0200 ++++ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp 2023-10-04 14:00:15.901256244 +0200 +@@ -51,6 +51,7 @@ + #include "FBXUtil.h" + #include <assimp/defs.h> + #include <stdint.h> ++#include <cstdint> + #include <assimp/Exceptional.h> + #include <assimp/ByteSwapper.h> + #include <assimp/DefaultLogger.hpp> + diff --git a/source/l/qt6/patches/qt6-webengine_32bit_compressing_files.patch b/source/l/qt6/patches/qt6-webengine_32bit_compressing_files.patch new file mode 100644 index 000000000..9bbf73dc8 --- /dev/null +++ b/source/l/qt6/patches/qt6-webengine_32bit_compressing_files.patch @@ -0,0 +1,25 @@ +Author: Patrick Franz <deltaone@debian.org> +Description: Building on 32-bit architectures fails when trying to compress + files in the devtools-frontend. +Forwarded: not-needed + +--- a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js ++++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js +@@ -75,7 +75,16 @@ async function main(argv) { + const fileList = argv[fileListPosition + 1]; + const fileListContents = await readTextFile(fileList); + const files = fileListContents.split(' '); +- await Promise.all(files.map(filename => filename.trim()).map(compressFile)); ++ for (let i = 0; i < files.length; i++) { ++ const fileName = files[i].trim(); ++ try { ++ await compressFile(fileName); ++ } catch (e) { ++ console.log('Failing compressing', fileName); ++ console.log(e); ++ process.exit(1); ++ } ++ } + } + + main(process.argv).catch(err => { |