[neon/qt/qtbase/Neon/testing] debian: Use pkgconfig in order to find mysql configuration.

[Lisandro Damián Nicanor Pérez Meyer]

Git commit a924d7d9ef78294b5e392d508930cb8e1c7742ce by Lisandro Damián Nicanor Pérez Meyer.
Committed on 03/10/2020 at 20:32.
Pushed by sitter into branch 'Neon/testing'.

Use pkgconfig in order to find mysql configuration.

This ensures that this step can be done while cross building qtbase.

M  +4    -0    debian/changelog
A  +20   -0    debian/patches/cross_build_mysql.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/a924d7d9ef78294b5e392d508930cb8e1c7742ce

diff --git a/debian/changelog b/debian/changelog
index 85c77df..f5f5d54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtbase-opensource-src (5.15.1+dfsg-2) UNRELEASED; urgency=medium
   * Backport upstream patch to fix multiscreen-related regression that
     affects Plasma.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Apply cross_build_mysql.patch in order to allow cross building on a Debian
+    environment. Thanks Helmut Grohne for the patch! (Closes: #971604).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Sep 2020 20:54:35 +0300
 
 qtbase-opensource-src (5.15.1+dfsg-1) experimental; urgency=medium
diff --git a/debian/patches/cross_build_mysql.patch b/debian/patches/cross_build_mysql.patch
new file mode 100644
index 0000000..9d5ce09
--- /dev/null
+++ b/debian/patches/cross_build_mysql.patch
@@ -0,0 +1,20 @@
+Description: call pkgconfig in order to be able to cross build qtbase with MySql.
+ Qt's build system calls mysql_config... which won't work in a cross build
+ environment like Debian's, as it will throw an exec format error.
+ .
+ In order to solve this call pkgconfig and use mysqlclient.pc.
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
+Forwarded: not-needed
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+
+--- qtbase-opensource-src-5.14.2+dfsg.orig/src/plugins/sqldrivers/configure.json
++++ qtbase-opensource-src-5.14.2+dfsg/src/plugins/sqldrivers/configure.json
+@@ -67,6 +67,7 @@
+             },
+             "headers": "mysql.h",
+             "sources": [
++                { "type": "pkgConfig", "args": "mysqlclient" },
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
+                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
diff --git a/debian/patches/series b/debian/patches/series
index 20d5427..ef164a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ nonlinux_utime.diff
 qdoc_default_incdirs.diff
 path_max.diff
 qstorageinfo_linux.diff
+cross_build_mysql.patch