diff options
author | Eric Hameleers <alien@slackware.com> | 2020-02-15 17:50:19 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-02-15 17:50:19 +0100 |
commit | d54fbdec265cf449cdb4910268b2d242e4f1f997 (patch) | |
tree | 2d701d0ea243ac94276620c171c98ca63b3b0e3c /deps/qt5/patches/qt5.cr206850.patch | |
parent | a850a9990982e8fba1b5f008c18b9567d767e6e7 (diff) | |
download | ktown-d54fbdec265cf449cdb4910268b2d242e4f1f997.tar.gz ktown-d54fbdec265cf449cdb4910268b2d242e4f1f997.tar.xz |
Remove deps that are now part of Slackware
OpenAL got added to Slackware as 'openal-soft';
SDL_sound is now part of the Slackware 'sdl' package;
libxkbcommon and qt5 were added to Slackware in the 'L' series.
Diffstat (limited to 'deps/qt5/patches/qt5.cr206850.patch')
-rw-r--r-- | deps/qt5/patches/qt5.cr206850.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/deps/qt5/patches/qt5.cr206850.patch b/deps/qt5/patches/qt5.cr206850.patch deleted file mode 100644 index 1fb71df..0000000 --- a/deps/qt5/patches/qt5.cr206850.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 - |