diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | qt5-base-mariadb-10.6.patch | 23 |
3 files changed, 37 insertions, 8 deletions
@@ -1,8 +1,8 @@ pkgbase = qt5-base-headless pkgdesc = A cross-platform application and UI framework - headless build, no QtGui or QtWidgets - pkgver = 5.15.2+kde+r207 + pkgver = 5.15.2+kde+r210 pkgrel = 1 - url = https://www.qt.io/ + url = https://www.qt.io arch = x86_64 groups = qt groups = qt5 @@ -29,11 +29,13 @@ pkgbase = qt5-base-headless conflicts = qtchooser conflicts = qt5-base options = !lto - source = git+https://invent.kde.org/qt/qt/qtbase#commit=6ee419d6597fb297c2f35d5be63c4eb16ae9b12c + source = git+https://invent.kde.org/qt/qt/qtbase#commit=663d240a18f5acac82fd2bd0fd4a33c4f47b260a source = qt5-base-cflags.patch source = qt5-base-nostrip.patch + source = qt5-base-mariadb-10.6.patch sha256sums = SKIP sha256sums = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094 + sha256sums = dde1c2c7300a6e05b12145f0c0b180991aa5929a4bf13c026eef6511593f357b pkgname = qt5-base-headless @@ -4,11 +4,11 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=qt5-base-headless -pkgver=5.15.2+kde+r207 +pkgver=5.15.2+kde+r210 pkgrel=1 -_commit=6ee419d6597fb297c2f35d5be63c4eb16ae9b12c +_commit=663d240a18f5acac82fd2bd0fd4a33c4f47b260a arch=('x86_64') -url='https://www.qt.io/' +url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') pkgdesc='A cross-platform application and UI framework - headless build, no QtGui or QtWidgets' groups=('qt' 'qt5') @@ -25,10 +25,12 @@ options=(!lto) _pkgfqn=qtbase source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit qt5-base-cflags.patch - qt5-base-nostrip.patch) + qt5-base-nostrip.patch + qt5-base-mariadb-10.6.patch) sha256sums=('SKIP' 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c' - '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') + '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094' + 'dde1c2c7300a6e05b12145f0c0b180991aa5929a4bf13c026eef6511593f357b') pkgver() { cd $_pkgfqn @@ -39,6 +41,8 @@ prepare() { cd ${_pkgfqn} git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump + patch -p1 < ../qt5-base-mariadb-10.6.patch # Fix broken mysql version detection with mariadb 10.6 + patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake } diff --git a/qt5-base-mariadb-10.6.patch b/qt5-base-mariadb-10.6.patch new file mode 100644 index 000000000000..cebbafd4b470 --- /dev/null +++ b/qt5-base-mariadb-10.6.patch @@ -0,0 +1,23 @@ +diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +index a641935dc5..19e6a8286d 100644 +--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp ++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +@@ -1355,7 +1355,7 @@ bool QMYSQLDriver::open(const QString& db, + } + + #if MYSQL_VERSION_ID >= 50007 +- if (mysql_get_client_version() >= 50503 && mysql_get_server_version(d->mysql) >= 50503) { ++ if (true) { + // force the communication to be utf8mb4 (only utf8mb4 supports 4-byte characters) + mysql_set_character_set(d->mysql, "utf8mb4"); + #if QT_CONFIG(textcodec) +@@ -1371,8 +1371,7 @@ bool QMYSQLDriver::open(const QString& db, + } + #endif // MYSQL_VERSION_ID >= 50007 + +- d->preparedQuerysEnabled = mysql_get_client_version() >= 40108 +- && mysql_get_server_version(d->mysql) >= 40100; ++ d->preparedQuerysEnabled = true; + + #if QT_CONFIG(thread) + mysql_thread_init(); |