diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-04-29 19:48:43 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-04-29 20:12:05 +0200 |
commit | aff6177c63d673521e08b7e359d908256ffd1cac (patch) | |
tree | 887d2cb01d9a70eee5603320c2623f04a6ac4875 /kde-apps/akonadi | |
parent | gnome-base/gnome-shell: fix bug triggered by version validation ignoring sett... (diff) | |
download | gentoo-aff6177c63d673521e08b7e359d908256ffd1cac.tar.gz gentoo-aff6177c63d673521e08b7e359d908256ffd1cac.tar.bz2 gentoo-aff6177c63d673521e08b7e359d908256ffd1cac.zip |
kde-apps: Drop unused patches
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-apps/akonadi')
4 files changed, 0 insertions, 208 deletions
diff --git a/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch deleted file mode 100644 index 8f33abb246d6..000000000000 --- a/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch +++ /dev/null @@ -1,39 +0,0 @@ -Gentoo-bug: 530012 - -diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 5cfaa33..1d1ea02 100644 ---- a/src/server/storage/dbconfigmysql.cpp -+++ b/src/server/storage/dbconfigmysql.cpp -@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings) - << QStringLiteral("/usr/local/sbin") - << QStringLiteral("/usr/local/libexec") - << QStringLiteral("/usr/libexec") -+ << QStringLiteral("/usr/share/mysql/scripts") - << QStringLiteral("/opt/mysql/libexec") - << QStringLiteral("/opt/local/lib/mysql5/bin") - << QStringLiteral("/opt/mysql/sbin"); -@@ -512,7 +513,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt - return 0 == execute(mMysqlInstallDbPath, - { QStringLiteral("--defaults-file=%1").arg(confFile), - QStringLiteral("--force"), -- QStringLiteral("--basedir=%1").arg(baseDir), -+ QStringLiteral("--basedir=/usr"), - QStringLiteral("--datadir=%1/").arg(dataDir) }); - } - -@@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const - return 0 == execute(mMysqldPath, - { QStringLiteral("--defaults-file=%1").arg(confFile), - QStringLiteral("--initialize"), -+ QStringLiteral("--basedir=/usr"), - QStringLiteral("--datadir=%1/").arg(dataDir) }); - } - -@@ -538,6 +540,6 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri - // Don't use --force, it has been removed in MySQL 5.7.5 - return 0 == execute(mMysqlInstallDbPath, - { QStringLiteral("--defaults-file=%1").arg(confFile), -- QStringLiteral("--basedir=%1").arg(baseDir), -+ QStringLiteral("--basedir=/usr"), - QStringLiteral("--datadir=%1/").arg(dataDir) }); - } diff --git a/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch b/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch deleted file mode 100644 index 73347f04b3c1..000000000000 --- a/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit 248671e8200ff0883877b6d0e56700ef99ff3b51 -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -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 <QString> - -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 <boost/shared_ptr.hpp> - --#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-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch b/kde-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch deleted file mode 100644 index 3b48253d46d8..000000000000 --- a/kde-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit d98e29a07f4acc3bf01f06f25b3eef5522397e2e -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -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 <exception> 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 <exception> 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 <exception> 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 <QObject> -+#include <QByteArray> -+#include <exception> - --class QByteArray; - class QString; - - namespace Akonadi diff --git a/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch deleted file mode 100644 index 6acd5b86dc8f..000000000000 --- a/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 2fe8bf8b73b9f5f5d19c87099b71a71f2595e70f -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sat Feb 11 21:29:05 2017 +0100 - - Build akonadixml unconditionally - - It makes more sense now that akonadiconsole depends on it. - - REVIEW: 129941 - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4141947..4e79dc0 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -16,6 +16,4 @@ add_subdirectory(core) - add_subdirectory(agentbase) - add_subdirectory(widgets) - add_subdirectory(selftest) --if(BUILD_TOOLS) -- add_subdirectory(xml) --endif() -+add_subdirectory(xml) |