From 52b1f1cb9f8d4e1fb1fcbde59930a105a819b0b4 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 30 Jul 2020 19:45:19 +0200 Subject: Cleanup unused KDE patches Thanks to Patrick Volkerding for the effort. --- kde/patch/akonadi/akonadi_mariadb_qtsql.patch | 91 ------------------------- kde/patch/akonadi/akonadi_rename-header.patch | 77 --------------------- kde/patch/akonadi/akonadi_revert-abs-path.patch | 70 ------------------- 3 files changed, 238 deletions(-) delete mode 100644 kde/patch/akonadi/akonadi_mariadb_qtsql.patch delete mode 100644 kde/patch/akonadi/akonadi_rename-header.patch delete mode 100644 kde/patch/akonadi/akonadi_revert-abs-path.patch (limited to 'kde/patch/akonadi') diff --git a/kde/patch/akonadi/akonadi_mariadb_qtsql.patch b/kde/patch/akonadi/akonadi_mariadb_qtsql.patch deleted file mode 100644 index 7ec6d7c..0000000 --- a/kde/patch/akonadi/akonadi_mariadb_qtsql.patch +++ /dev/null @@ -1,91 +0,0 @@ -Patch taken from https://cgit.kde.org/akonadi.git/patch/?id=b145f47f000978b9d39edc1882849ec7f6b3ef79 - -Upstream bug reports: -https://bugs.kde.org/show_bug.cgi?id=383991 -https://bugreports.qt.io/browse/QTBUG-63108 - -From b145f47f000978b9d39edc1882849ec7f6b3ef79 Mon Sep 17 00:00:00 2001 -From: Heinz Wiesinger -Date: Sun, 17 Sep 2017 10:56:44 +0200 -Subject: Only remove init connections to the database on server shutdown. - -Summary: -With MariaDB 10.2 libmysqlclient was replaced with libmariadb that -changed how establishing database connections behaves. The MySQL -QSQL driver calls mysql_server_end() on QSqlDatabase::removeDatabase() -if the overall connection count dropped to 0 (which it does when -the init connection is removed). -A future QSqlDatabase:addDatabase() would call mysql_server_init() -again, but this no longer works with libmariadb as that one only -allows calling mysql_server_init() once. Future calls are simply -ignored. - -In order to prevent this from happening we have to keep the -init connection open until the server shuts down, so the connection -count only drops to 0 at shutdown and mysql_server_end() isn't -called before. - -This is a workaround for QTBUG-63108 - -CCBUG: 383991 - -Reviewers: dvratil, mlaurent - -Reviewed By: dvratil - -Subscribers: #kde_pim - -Tags: #kde_pim - -Differential Revision: https://phabricator.kde.org/D7858 ---- - src/server/akonadi.cpp | 3 ++- - src/server/storage/dbconfigmysql.cpp | 4 +++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/server/akonadi.cpp b/src/server/akonadi.cpp -index 4364e63..bcb7e88 100644 ---- a/src/server/akonadi.cpp -+++ b/src/server/akonadi.cpp -@@ -423,13 +423,14 @@ bool AkonadiServer::createDatabase() - success = false; - } - } -- QSqlDatabase::removeDatabase(initCon); - return success; - } - - void AkonadiServer::stopDatabaseProcess() - { - if (!DbConfig::configuredDatabase()->useInternalServer()) { -+ // closing initConnection this late to work around QTBUG-63108 -+ QSqlDatabase::removeDatabase(QStringLiteral("initConnection")); - return; - } - -diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 2bd231d..d565706 100644 ---- a/src/server/storage/dbconfigmysql.cpp -+++ b/src/server/storage/dbconfigmysql.cpp -@@ -492,7 +492,6 @@ bool DbConfigMysql::startInternalServer() - } - } - -- QSqlDatabase::removeDatabase(initCon); - return success; - } - -@@ -520,6 +519,9 @@ void DbConfigMysql::stopInternalServer() - return; - } - -+ // closing initConnection this late to work around QTBUG-63108 -+ QSqlDatabase::removeDatabase(QStringLiteral("initConnection")); -+ - disconnect(mDatabaseProcess, static_cast(&QProcess::finished), - this, &DbConfigMysql::processFinished); - --- -cgit v0.11.2 - - diff --git a/kde/patch/akonadi/akonadi_rename-header.patch b/kde/patch/akonadi/akonadi_rename-header.patch deleted file mode 100644 index 73347f0..0000000 --- a/kde/patch/akonadi/akonadi_rename-header.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit 248671e8200ff0883877b6d0e56700ef99ff3b51 -Author: Andreas Sturmlechner -Date: Sat Jan 7 14:38:17 2017 +0100 - - Rename exception.h to exceptionbase.h - - REVIEW: 129788 - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 6ac851e..fa996b9 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -95,7 +95,7 @@ ecm_generate_headers(AkonadiCore_base_HEADERS - EntityDeletedAttribute - EntityDisplayAttribute - EntityHiddenAttribute -- Exception -+ ExceptionBase - GidExtractorInterface - IndexPolicyAttribute - Item -diff --git a/src/core/exception.cpp b/src/core/exception.cpp -index f229c1a..14f7330 100644 ---- a/src/core/exception.cpp -+++ b/src/core/exception.cpp -@@ -17,7 +17,7 @@ - 02110-1301, USA. - */ - --#include "exception.h" -+#include "exceptionbase.h" - - #include - -diff --git a/src/core/exception.h b/src/core/exceptionbase.h -similarity index 100% -rename from src/core/exception.h -rename to src/core/exceptionbase.h -diff --git a/src/core/item.h b/src/core/item.h -index de71cad..5ec62c8 100644 ---- a/src/core/item.h -+++ b/src/core/item.h -@@ -23,7 +23,7 @@ - - #include "akonadicore_export.h" - #include "attribute.h" --#include "exception.h" -+#include "exceptionbase.h" - #include "tag.h" - #include "collection.h" - #include "relation.h" -diff --git a/src/core/itempayloadinternals_p.h b/src/core/itempayloadinternals_p.h -index 0a4de3c..1626f10 100644 ---- a/src/core/itempayloadinternals_p.h -+++ b/src/core/itempayloadinternals_p.h -@@ -32,7 +32,7 @@ - - #include - --#include "exception.h" -+#include "exceptionbase.h" - - //@cond PRIVATE Doxygen 1.7.1 hangs processing this file. so skip it. - //for more info, see https://bugzilla.gnome.org/show_bug.cgi?id=531637 -diff --git a/src/core/protocolhelper.cpp b/src/core/protocolhelper.cpp -index f740e9d..c218f0c 100644 ---- a/src/core/protocolhelper.cpp -+++ b/src/core/protocolhelper.cpp -@@ -23,7 +23,7 @@ - #include "collectionstatistics.h" - #include "item_p.h" - #include "collection_p.h" --#include "exception.h" -+#include "exceptionbase.h" - #include "itemserializer_p.h" - #include "itemserializerplugin.h" - #include "servermanager.h" diff --git a/kde/patch/akonadi/akonadi_revert-abs-path.patch b/kde/patch/akonadi/akonadi_revert-abs-path.patch deleted file mode 100644 index 3b48253..0000000 --- a/kde/patch/akonadi/akonadi_revert-abs-path.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit d98e29a07f4acc3bf01f06f25b3eef5522397e2e -Author: Andreas Sturmlechner -Date: Thu Jan 5 22:41:02 2017 +0100 - - Revert "Workaround an include loop on case-insensitive systems" - - Do not hardcode absolute patchs to GCC headers. - - This reverts commit 59b9d6b79425c9ec1e5df059a2593580048c4adf. - - REVIEW: 129788 - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 72589cd..6ac851e 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -257,21 +257,6 @@ ecm_generate_headers(AkonadiCore_jobs_HEADERS - RELATIVE jobs - ) - --# This is a workaround for conflict between our "Exception" fancy header and --# C++ stdlib's "exception" header which occurs in case-insensitive systems. --# For that reason we generate std_exception.h file, which contains an absolute --# path to the stdlib's exception header file, which resolves the ambiguity --# when including from within Akonadi. --include(FindStdlibInclude) --findStdlibInclude("exception" std_exception_file) --if (NOT "${std_exception_file}" STREQUAL "") -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/std_exception.h.in -- ${CMAKE_CURRENT_BINARY_DIR}/std_exception.h -- ) --else() -- message(FATAL_ERROR "stdlib include absolute path not found") --endif() -- - set(akonadicore_dbus_xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.NotificationManager.xml) - qt5_add_dbus_interface(akonadicore_dbus_SRCS ${akonadicore_dbus_xml} notificationmanagerinterface) - -@@ -338,7 +323,6 @@ install(TARGETS - - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/akonadicore_export.h -- ${CMAKE_CURRENT_BINARY_DIR}/std_exception.h - ${AkonadiCore_base_HEADERS} - ${AkonadiCore_models_HEADERS} - ${AkonadiCore_jobs_HEADERS} -diff --git a/src/core/exception.h b/src/core/exception.h -index d07ca71..2a376df 100644 ---- a/src/core/exception.h -+++ b/src/core/exception.h -@@ -20,16 +20,11 @@ - #ifndef AKONADI_EXCEPTION_H - #define AKONADI_EXCEPTION_H - --// The std_exception.h file is generated at build-time and #includes C++ stdlib --// header "exception" by aboslute path. This is to workaround an include loop on --// case-insensitive systems, where #include includes our "Exception" --// fancy header instead of stdlib's exception, causing an endless loop of --// includes between "Exception" and "exception.h". --#include "std_exception.h" -- - #include "akonadicore_export.h" -+#include -+#include -+#include - --class QByteArray; - class QString; - - namespace Akonadi -- cgit v1.2.3-65-gdbad