From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkdepim/files/, kde-apps/libkcddb/files/, kde-apps/akonadi/files/
Date: Fri, 5 Mar 2021 08:53:25 +0000 (UTC) [thread overview]
Message-ID: <1614934374.affe4fefb36e2fac1f2eb01494c26030fdcff738.asturm@gentoo> (raw)
commit: affe4fefb36e2fac1f2eb01494c26030fdcff738
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 5 08:52:54 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 5 08:52:54 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=affe4fef
kde-apps: Drop unused patches
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/akonadi-18.12.2-mysql56-crash.patch | 52 ---------------------
.../files/libkcddb-20.12.1-unused-dep.patch | 54 ----------------------
.../files/libkdepim-20.12.1-unused-dep.patch | 37 ---------------
3 files changed, 143 deletions(-)
diff --git a/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch
deleted file mode 100644
index ede8a19d84..0000000000
--- a/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b2ebd0e2d594ae71d4e1db4874f72a655f9eeb12 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 26 Jan 2019 21:09:14 +0100
-Subject: [PATCH] Find mysql_install_db and add required option
-
-Rebase patch onto 19.03.80
-Gentoo-bug: 530012
----
- src/server/storage/dbconfigmysql.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index dfff6fc29..80039c8ba 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -66,6 +66,7 @@ static QString findExecutable(const QString &bin)
- 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"),
-@@ -588,7 +589,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)
- });
- }
-@@ -602,6 +603,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)
- });
- }
-@@ -622,7 +624,7 @@ 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)
- });
- }
---
-2.20.1
-
diff --git a/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch b/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch
deleted file mode 100644
index 908d8ee939..0000000000
--- a/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From fdddc63be6b5a2b95bd3ff7177b02e58d922bed2 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Tue, 29 Dec 2020 09:10:33 +0100
-Subject: [PATCH] Drop unused linkage to KF5::Codecs
-
-GIT_SILENT
-
-* asturm 2020-12-29: rebased, added relevant include cleanup part from 44a7ec47
----
- CMakeLists.txt | 2 +-
- libkcddb/CMakeLists.txt | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b9ee121..30a6717 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,7 @@
- set(REQUIRED_QT_VERSION 5.4.0)
-
- find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Network Widgets)
--find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config DocTools Codecs I18n KIO WidgetsAddons)
-+find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config DocTools I18n KIO WidgetsAddons)
-
- ecm_setup_version("5.0.0"
- VARIABLE_PREFIX KCDDB
-diff --git a/libkcddb/CMakeLists.txt b/libkcddb/CMakeLists.txt
-index e0c0e6a..3b239a9 100644
---- a/libkcddb/CMakeLists.txt
-+++ b/libkcddb/CMakeLists.txt
-@@ -52,7 +52,6 @@ target_link_libraries(KF5Cddb
- PUBLIC
- KF5::ConfigGui
- PRIVATE
-- KF5::Codecs
- KF5::I18n
- KF5::KIOCore
- Qt5::Network)
-diff --git a/libkcddb/musicbrainz/musicbrainzlookup.cpp b/libkcddb/musicbrainz/musicbrainzlookup.cpp
-index b8e7261..89b89db 100644
---- a/libkcddb/musicbrainz/musicbrainzlookup.cpp
-+++ b/libkcddb/musicbrainz/musicbrainzlookup.cpp
-@@ -21,8 +21,6 @@
- #include <musicbrainz5/NameCredit.h>
- #include <musicbrainz5/SecondaryType.h>
-
--#include <KCodecs/KCodecs>
--
- #include <QCryptographicHash>
- #include <QDebug>
-
---
-GitLab
-
diff --git a/kde-apps/libkdepim/files/libkdepim-20.12.1-unused-dep.patch b/kde-apps/libkdepim/files/libkdepim-20.12.1-unused-dep.patch
deleted file mode 100644
index 32bee46e71..0000000000
--- a/kde-apps/libkdepim/files/libkdepim-20.12.1-unused-dep.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6c468905d6d8b0a910a4f1d423a226815c630acb Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Thu, 10 Dec 2020 07:15:35 +0100
-Subject: [PATCH] Remove KF5Codecs
-
----
- CMakeLists.txt | 1 -
- src/libkdepim/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5232c8d..a9b2c1b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,7 +27,6 @@ set(QT_REQUIRED_VERSION "5.13.0")
-
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus Network)
-
--find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
-diff --git a/src/libkdepim/CMakeLists.txt b/src/libkdepim/CMakeLists.txt
-index 9f5eaff..9ff0420 100644
---- a/src/libkdepim/CMakeLists.txt
-+++ b/src/libkdepim/CMakeLists.txt
-@@ -59,7 +59,6 @@ target_include_directories(KF5Libkdepim PUBLIC "$<BUILD_INTERFACE:${libkdepim_SO
-
- target_link_libraries(KF5Libkdepim
- PRIVATE
-- KF5::Codecs
- KF5::Completion
- KF5::I18n
- KF5::ConfigGui
---
-GitLab
-
reply other threads:[~2021-03-05 8:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1614934374.affe4fefb36e2fac1f2eb01494c26030fdcff738.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox