commit: e615401794dc97b0fdee894c5c71ce7977af2f7f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Sep 1 20:55:34 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 2 07:17:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6154017
kde-apps/dolphin-plugins-subversion: drop 23.08.5-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/dolphin-plugins-subversion/Manifest | 1 - .../dolphin-plugins-subversion-23.08.5-r1.ebuild | 60 ----------------- ...olphin-plugins-subversion-23.08.5-fix-lto.patch | 78 ---------------------- 3 files changed, 139 deletions(-) diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest index d6ec315950e3..faf47fcdda0a 100644 --- a/kde-apps/dolphin-plugins-subversion/Manifest +++ b/kde-apps/dolphin-plugins-subversion/Manifest @@ -1,3 +1,2 @@ -DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852 DIST dolphin-plugins-24.05.2.tar.xz 305512 BLAKE2B 4f5a2b8e7e7131d55610622669398c537f5ef2a0f69bdcce431d28efd1784e31bd57fccabe93d380d38b7cfbbedb0f7ef79deb6de297deba57420373767c9a38 SHA512 7e8df3f14f0db6114a85e3077a515ea598f436d52ce6d199ead97119604455e06cc8585281cd2aa49068134505bce8bcce461976fad791d5729d278344a30c56 DIST dolphin-plugins-24.08.0.tar.xz 316660 BLAKE2B 00140dcea345f15caa0bbb50845ad4719cf92420c505ad510c505e9e7a4d0ea8aeb4cd23133bca0f44de34bbf98704545eb9c28f34d5fc8988f2b2154e3db8c2 SHA512 8d72253ecf3b44b4a81ff4ab952913683b2b679220620f153dae4b045e008faccc768e40e48d6dbf41a49a15409e4fa728feee30decbf2a4a35741bf9db87fa3 diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild deleted file mode 100644 index f245b1086aba..000000000000 --- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="false" -KDE_ORG_NAME="dolphin-plugins" -MY_PLUGIN_NAME="svn" -PVCUT=$(ver_cut 1-3) -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Dolphin plugin for Subversion integration" -HOMEPAGE="https://apps.kde.org/dolphin_plugins/"; - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/dolphin-${PVCUT}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 -" -RDEPEND="${DEPEND} - dev-vcs/subversion - >=kde-apps/kompare-${PVCUT}:* -" - -PATCHES=( "${FILESDIR}/${P}-fix-lto.patch" ) # bug 926233 - -src_prepare() { - ecm_src_prepare - # solid, qtdbus only required by mountiso - ecm_punt_qt_module DBus - ecm_punt_kf_module Solid - # kxmlgui, qtnetwork only required by dropbox - ecm_punt_qt_module Network - ecm_punt_kf_module XmlGui - # delete non-${PN} translations - find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_${MY_PLUGIN_NAME}=ON - -DBUILD_bazaar=OFF - -DBUILD_dropbox=OFF - -DBUILD_git=OFF - -DBUILD_hg=OFF - -DBUILD_mountiso=OFF - ) - ecm_src_configure -} diff --git a/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch b/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch deleted file mode 100644 index e2157f00fd34..000000000000 --- a/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 772a4d712abcf1c6c86f25bd306785815132d886 Mon Sep 17 00:00:00 2001 -From: Nikolai Krasheninnikov <[email protected]> -Date: Tue, 2 Apr 2024 09:07:53 +0000 -Subject: [PATCH] svn: Fix gcc-13 One Definition Rule compilation error with - LTO enabled - -columns_t enum defined multiple times in different translation units. Although this -should not be an error, we move the definition to a separate unnamed namespace. - -BUG: 482524 ---- - svn/svncommitdialog.cpp | 10 +++++----- - svn/svnlogdialog.cpp | 14 +++++++------- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/svn/svncommitdialog.cpp b/svn/svncommitdialog.cpp -index 41152434..f9a44265 100644 ---- a/svn/svncommitdialog.cpp -+++ b/svn/svncommitdialog.cpp -@@ -54,6 +54,11 @@ QStringList makeContext(const QStringList &list, const QHash<QString, KVersionCo - return ret; - } - -+enum columns_t { -+ columnPath, -+ columnStatus -+}; -+ - } - - struct svnCommitEntryInfo_t { -@@ -67,11 +72,6 @@ struct svnCommitEntryInfo_t { - }; - Q_DECLARE_METATYPE(svnCommitEntryInfo_t); - --enum columns_t { -- columnPath, -- columnStatus --}; -- - SvnCommitDialog::SvnCommitDialog(const QHash<QString, KVersionControlPlugin::ItemVersion> *versionInfo, const QStringList& context, QWidget *parent) : - QDialog(parent), - m_versionInfoHash(versionInfo), -diff --git a/svn/svnlogdialog.cpp b/svn/svnlogdialog.cpp -index 21abadaa..685f7ec5 100644 ---- a/svn/svnlogdialog.cpp -+++ b/svn/svnlogdialog.cpp -@@ -49,6 +49,13 @@ bool resetAndRevertFileToRevision(const QString &filePath, ulong revision) - return true; - } - -+enum columns_t { -+ columnRevision, -+ columnAuthor, -+ columnDate, -+ columnMessage -+}; -+ - } - - struct svnLogEntryInfo_t { -@@ -64,13 +71,6 @@ struct svnLogEntryInfo_t { - }; - Q_DECLARE_METATYPE(svnLogEntryInfo_t); - --enum columns_t { -- columnRevision, -- columnAuthor, -- columnDate, -- columnMessage --}; -- - SvnLogDialog::SvnLogDialog(const QString& contextDir, QWidget *parent) : - QDialog(parent), - m_contextDir(contextDir), --- -GitLab -
