[arch-commits] Commit in qt5-base/trunk (PKGBUILD qt5-base-mariadb-10.6.patch)

[Antonio Rojas]

    Date: Monday, August 2, 2021 @ 21:59:08
  Author: arojas
Revision: 421090

Bump revision

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/qt5-base-mariadb-10.6.patch

-----------------------------+
 PKGBUILD                    |   11 +++++++----
 qt5-base-mariadb-10.6.patch |    9 ---------
 2 files changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-02 21:58:16 UTC (rev 421089)
+++ PKGBUILD	2021-08-02 21:59:08 UTC (rev 421090)
@@ -3,9 +3,9 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-pkgver=5.15.2+kde+r210
+pkgver=5.15.2+kde+r211
 pkgrel=1
-_commit=663d240a18f5acac82fd2bd0fd4a33c4f47b260a
+_commit=f0f4d885ed2fb088cadc8e25c0161d37f9e8770b
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -31,11 +31,13 @@
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         qt5-base-cflags.patch
         qt5-base-nostrip.patch
-        qt5-base-mariadb-10.6.patch)
+        qt5-base-mariadb-10.6.patch
+        qt5-base-mariadb-10.6-2.patch)
 sha256sums=('SKIP'
             'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
             '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
-            'dde1c2c7300a6e05b12145f0c0b180991aa5929a4bf13c026eef6511593f357b')
+            '21b0a7fea57ecbc7ca8e729dc316f1bbd1de6eb9eceae00ddcbf20c6830c7518'
+            '2bf3334e1611e4288e17529bce9de8f830574f001c579e02573607171066b4fe')
 
 pkgver() {
   cd $_pkgfqn
@@ -46,6 +48,7 @@
   cd ${_pkgfqn}
 
   git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
+  patch -p1 < ../qt5-base-mariadb-10.6-2.patch # Fix broken mysql version detection with mariadb 10.6
   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

Modified: qt5-base-mariadb-10.6.patch
===================================================================
--- qt5-base-mariadb-10.6.patch	2021-08-02 21:58:16 UTC (rev 421089)
+++ qt5-base-mariadb-10.6.patch	2021-08-02 21:59:08 UTC (rev 421090)
@@ -2,15 +2,6 @@
 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