diff --git a/0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch b/0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch new file mode 100644 index 0000000..6a54b60 --- /dev/null +++ b/0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch @@ -0,0 +1,35 @@ +From b2bd1eef198b9d4774e1f10c77d6622813938543 Mon Sep 17 00:00:00 2001 +From: Andy Shaw +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 d9aebff700..7694698bff 100644 +--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp ++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +@@ -1160,14 +1160,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.16.1 + diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 3ff0509..6d71eec 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 8 08:48:37 UTC 2018 - fabian@ritter-vogt.de + +- Add patch to fix plugin loading with newer MariaDB versions: + * 0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch + ------------------------------------------------------------------- Fri Feb 2 08:10:28 UTC 2018 - alarrosa@suse.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 1a821aa..d614f60 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -69,6 +69,7 @@ Patch17: qapplication-emit-palettechanged.patch Patch1000: 0001-xcb-verify-if-xrandr-present-before-using-xcb_randr-.patch Patch1001: 0001-Avoid-providing-bad-pixelDeltas-on-X11.patch Patch1002: 0001-QSimpleDrag-Fix-mouse-release-coords-for-delayed-eve.patch +Patch1003: 0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch # patches 2000-3000 and above from upstream 5.11/dev branch # Patch2000: 0001-Remove-QPrintDialogPrivate-applyPrinterProperties-no.patch Patch2001: 0002-Remove-QUnixPrintWidgetPrivate-applyPrinterPropertie.patch @@ -181,45 +182,7 @@ handling. %prep %setup -q -n %{tar_version} -%patch3 -p1 -%patch5 -p1 -%patch6 -p1 -%patch8 -p1 -%patch10 -p1 -%patch12 -p1 -%patch15 -p1 -%patch17 -p1 -%patch1000 -p1 -%patch1001 -p1 -%patch1002 -p1 -%patch2000 -p1 -%patch2001 -p1 -%patch2002 -p1 -%patch2003 -p1 -%patch2004 -p1 -%patch2005 -p1 -%patch2006 -p1 -%patch2007 -p1 -%patch2008 -p1 -%patch2009 -p1 -%patch2010 -p1 -%patch2012 -p1 -%patch2013 -p1 -%patch2014 -p1 -%patch2015 -p1 -%patch2016 -p1 -%patch2017 -p1 -%patch2018 -p1 -%patch2019 -p1 -%patch2020 -p1 -%patch2021 -p1 -%patch2022 -p1 -%patch2023 -p1 -%patch2024 -p1 -%patch2025 -p1 -%patch2026 -p1 -%patch2027 -p1 -%patch2028 -p1 +%autopatch -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,zlib}