commit:     2cb8d44372ae568c49ffb65e7b7535bd982c11c9
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 10:11:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 22:14:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2cb8d443

dev-qt/qtsql: Extend the MariaDB define check

See also: https://mail.kde.org/pipermail/distributions/2018-February/000265.html
See also: https://codereview.qt-project.org/#/c/206850/
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch  | 35 ++++++++++++++++++++++
 ...-5.11.0_alpha.ebuild => qtsql-5.10.1-r1.ebuild} |  5 ++++
 dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild             |  5 ++++
 dev-qt/qtsql/qtsql-5.11.9999.ebuild                |  5 ++++
 dev-qt/qtsql/qtsql-5.9.9999.ebuild                 |  5 ++++
 dev-qt/qtsql/qtsql-5.9999.ebuild                   |  5 ++++
 6 files changed, 60 insertions(+)

diff --git a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch 
b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
new file mode 100644
index 00000000..79de44dc
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
@@ -0,0 +1,35 @@
+From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.s...@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/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild 
b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
similarity index 92%
copy from dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
copy to dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
@@ -28,6 +28,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+       # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
 QT5_TARGET_SUBDIRS=(
        src/sql
        src/plugins/sqldrivers

diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild 
b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
@@ -28,6 +28,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+       # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
 QT5_TARGET_SUBDIRS=(
        src/sql
        src/plugins/sqldrivers

diff --git a/dev-qt/qtsql/qtsql-5.11.9999.ebuild 
b/dev-qt/qtsql/qtsql-5.11.9999.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.11.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.9999.ebuild
@@ -28,6 +28,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+       # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
 QT5_TARGET_SUBDIRS=(
        src/sql
        src/plugins/sqldrivers

diff --git a/dev-qt/qtsql/qtsql-5.9.9999.ebuild 
b/dev-qt/qtsql/qtsql-5.9.9999.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.9.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.9999.ebuild
@@ -28,6 +28,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+       # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
 QT5_TARGET_SUBDIRS=(
        src/sql
        src/plugins/sqldrivers

diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9999.ebuild
@@ -28,6 +28,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+       # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
 QT5_TARGET_SUBDIRS=(
        src/sql
        src/plugins/sqldrivers

Reply via email to