From 704ee65583cad0713567c8f787c3f531045b9315 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 24 Feb 2018 12:57:46 +0100
Subject: deps/qt5: Extend the MariaDB define check to cover the later versions
 too

---
 deps/qt5/patches/qt5.cr206850.patch | 43 +++++++++++++++++++++++++++++++++++++
 deps/qt5/qt5.SlackBuild             |  5 +++++
 2 files changed, 48 insertions(+)
 create mode 100644 deps/qt5/patches/qt5.cr206850.patch

diff --git a/deps/qt5/patches/qt5.cr206850.patch b/deps/qt5/patches/qt5.cr206850.patch
new file mode 100644
index 0000000..1fb71df
--- /dev/null
+++ b/deps/qt5/patches/qt5.cr206850.patch
@@ -0,0 +1,43 @@
+The latest MariaDB versions aren't caught properly by the checks in Qt, which 
+may cause a regression to appear (regression, because it was already fixed in 
+Qt by Dan Vratil): this manifests itself in Akonadi losing its connection to
+the database if running for long periods of time.
+
+Until this is fixed in Qt, you may want to apply this patch in your packages:
+
+https://codereview.qt-project.org/#/c/206850/
+
+From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.shaw@qt.io>
+Date: Wed, 27 Sep 2017 09:23:10 +0200
+Subject: [PATCH] Extend the MariaDB define check to cover the later versions too
+
+Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1
+---
+ src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+index 6e428fb..b2d3e85 100644
+--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+@@ -1159,14 +1159,14 @@ static void qLibraryInit()
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+ 
+-#ifdef MARIADB_BASE_VERSION
++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
+     qAddPostRoutine(mysql_server_end);
+ #endif
+ }
+ 
+ static void qLibraryEnd()
+ {
+-#if !defined(MARIADB_BASE_VERSION)
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+ # if !defined(Q_NO_MYSQL_EMBEDDED)
+ #  if MYSQL_VERSION_ID > 40000
+ #   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
+-- 
+2.7.4
+
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 9aaaf51..a94224c 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -144,6 +144,11 @@ cd qtbase
   cat $CWD/patches/qt5.qtbug-66103.patch | patch -p1 --verbose || exit 1
 cd -
 
+# Extend the MariaDB define check to cover the later versions too:
+cd qtbase
+  cat $CWD/patches/qt5.cr206850.patch | patch -p1 --verbose || exit 1
+cd -
+
 # Fix missing private includes: QTBUG-37417
 sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \
   -i qtbase/mkspecs/features/create_cmake.prf
-- 
cgit v1.2.3