PKGBUILDs/qt5-base/mingw-w64-static/0014-Fix-linking-against-sh...

From b4f40814cb08f20a6af9437627afa5f87596072a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 14/31] Fix linking against shared/static MariaDB

Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
---
 src/plugins/sqldrivers/configure.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
index 5603ceb37b..ba74280e8c 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
@@ -57,6 +57,9 @@
             "label": "MySQL",
             "test": "unix/mysql",
             "sources": [
+                { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },
+                { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "condition": "config.win32 && !features.shared" },
+                { "libs": "-lmariadb", "condition": "config.win32 && features.shared" },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
-- 
2.13.2
Update mingw-w64 Qt packages to 5.9.1 2017-06-30 22:27:38 +02:00			`From b4f40814cb08f20a6af9437627afa5f87596072a Mon Sep 17 00:00:00 2001`
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time 2017-01-23 21:37:13 +01:00			`From: Martchus <martchus@gmx.net>`
			`Date: Sun, 18 Sep 2016 18:56:55 +0200`
Update mingw-w64-qt5 packages to 5.9.0 2017-06-02 18:20:04 +02:00			`Subject: [PATCH 14/31] Fix linking against shared/static MariaDB`
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time 2017-01-23 21:37:13 +01:00
Update mingw-w64-qt5 packages to 5.9.0 2017-06-02 18:20:04 +02:00			`Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b`
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time 2017-01-23 21:37:13 +01:00			`---`
Update mingw-w64 Qt packages to 5.9.1 2017-06-30 22:27:38 +02:00			`src/plugins/sqldrivers/configure.json \| 3 +++`
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time 2017-01-23 21:37:13 +01:00			`1 file changed, 3 insertions(+)`

Update mingw-w64 Qt packages to 5.9.1 2017-06-30 22:27:38 +02:00			`diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json`
			`index 5603ceb37b..ba74280e8c 100644`
			`--- a/src/plugins/sqldrivers/configure.json`
			`+++ b/src/plugins/sqldrivers/configure.json`
Update mingw-w64-qt5 packages to 5.9.0 2017-06-02 18:20:04 +02:00			`@@ -57,6 +57,9 @@`
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time 2017-01-23 21:37:13 +01:00			`"label": "MySQL",`
			`"test": "unix/mysql",`
			`"sources": [`
Fix mingw-w64-qt5-base-static * Fix StaticQt5::Test * Fix linking against static MariaDB 2017-03-22 19:59:13 +01:00			`+ { "libs": "-lmariadbclient -lssl -lcrypto -lgdi32 -lws2_32 -lpthread -lz -lm", "condition": "config.win32 && !features.shared" },`
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time 2017-01-23 21:37:13 +01:00			`+ { "libs": "-Wl,-Bdynamic -lmariadb -Wl,-Bstatic", "condition": "config.win32 && !features.shared" },`
			`+ { "libs": "-lmariadb", "condition": "config.win32 && features.shared" },`
Update mingw-w64-qt5 packages to 5.9.0 2017-06-02 18:20:04 +02:00			`{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },`
			`{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },`
			`{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },`
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time 2017-01-23 21:37:13 +01:00			`--`
Update mingw-w64 Qt packages to 5.9.1 2017-06-30 22:27:38 +02:00			`2.13.2`
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time 2017-01-23 21:37:13 +01:00