summaryrefslogtreecommitdiff
path: root/kde-apps/dolphin-plugins-subversion
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/dolphin-plugins-subversion')
-rw-r--r--kde-apps/dolphin-plugins-subversion/Manifest14
-rw-r--r--kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild63
-rw-r--r--kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild65
-rw-r--r--kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.1-r1.ebuild (renamed from kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.04.90.ebuild)17
-rw-r--r--kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.3.ebuild (renamed from kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5.ebuild)34
-rw-r--r--kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch78
-rw-r--r--kde-apps/dolphin-plugins-subversion/metadata.xml2
7 files changed, 27 insertions, 246 deletions
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index 23417dc917b4..449efe10bc58 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,9 +1,5 @@
-AUX dolphin-plugins-subversion-23.08.5-fix-lto.patch 2039 BLAKE2B de667f70126baeabaf3da3e79ca7b9c64f152929f9a3446d840c02e52dcd7897e00b5337c48d528a3f9bc7aa11a78334af7cee6990ad1e6abc29621d3275ad34 SHA512 47754d821c21d7dff854ecabd45640265e54a3cd59dfc3fe48107dd8f24c704218e179762c0eaaaa4de536683e20b8d1638dec04bbb9b4a7f0433c6e62a57e1f
-DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8
-DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
-DIST dolphin-plugins-24.04.90.tar.xz 304688 BLAKE2B 9cb14275badd693abc2dab46f4e9192c63ff0e01ba0f7d5356df14b7c9fdb93c58e6b2fe22e4bd384c7a39457697fc3087093287c357758f86e1d9bb0f1cafc9 SHA512 94bd585ba80304728b228f2a2e623b5f05ecb4a73a80806aa47b4bd6506ec4a7aea52cdeebd3f31de80efe4cd8d2bcaf805de89abd736f87600726593224f5da
-EBUILD dolphin-plugins-subversion-23.04.3.ebuild 1429 BLAKE2B 4a40444ea3df609c8c4096160bac819da9be4e41cba5c57c3f82282b55b1719167ead46780ce13a3efad92910cb7edb806813bdc05af0dbac0f8e7adc9484220 SHA512 46fe30dd8557497f67514287079d15eb3de6e4c90b412e143d41a5907a7c0d3298b2eb2076a3c2362cab0069194c01d05e7fb22fa4a3d98fbdb10a4074d6977b
-EBUILD dolphin-plugins-subversion-23.08.5-r1.ebuild 1491 BLAKE2B 29b1211adc86e157b414d0986bc73cb2f8c1c46bcf42d61c237b206a1f97af4de12fb084855089713dd53fd07ab7b2bacc245e0564ee3ba1d3803e815b8dc79c SHA512 c4eb62d46e435adcd3cd16b6f108beb3f806aa3aefb076be14a6fc0375a35187b41f16a58b985e5ff4a06398484c467b77d957fe31daa3330fa1840c431ab040
-EBUILD dolphin-plugins-subversion-23.08.5.ebuild 1429 BLAKE2B bf9ebcf36d42119bdb5243b85ae084120e280d427bd8d24e96d7a3234b2f96914872662c89ea5d72b91191168c83be31d0a1758ef76fd9efd460d50b39f5a9f3 SHA512 dedfe08e19c92dab5148498af3fe51e1412d9c9d03c7028c864d58dac82c4ffe445f80b560509086aac7bfc1ecdf14e75e62eb832bc10493085e5edcdfd4530c
-EBUILD dolphin-plugins-subversion-24.04.90.ebuild 1461 BLAKE2B 3de55c5b5cbbd583752a248fe62370332d06fa2f79cac48e3ca3acd524ec65476bcafd3894c31d1ce69e41456b6f305a69b5ebba0efb547a9708ee8357bc10cf SHA512 ddd6158d090623efd545d165caedc1461693203d173cc5e2641e25a1008a5ddcfcd596573c20dddb5b45b3897e906de559c12c8a1c3b0aafa02a1ac05f73f98f
-MISC metadata.xml 381 BLAKE2B 592c1524bc05ad8664508ee6616fedd5eaf364e2222c6fe3fb9a27949f56792c4cee994309781593e257c94ea31d7240c9f4e6cf189bb34aa8fae9a3794df265 SHA512 ea4651fe50618e84baf551a34e078680e3b8427a2e7a1075b5ced940b67dd3758b137bba42a0e83ac34d74b65b5c6969225241db51338bf3afdeaa06600a38ed
+DIST dolphin-plugins-24.08.1.tar.xz 317532 BLAKE2B 1f8bbcbcf79ca80e0744cbf5a1ecc4507d1e222c6ef179e01aac62361625d550702d014e28bb409d87cafad5bd57ae5d25bbc289177685681e84aa4261ac4b17 SHA512 d123197d4669611f0d12ad128967686d11b865865472028e60916e85bc4f0a5159e023a2784cba04e069ea5dbd9fd0801617b73e4033cffe1f6d815895aac59c
+DIST dolphin-plugins-24.08.3.tar.xz 317540 BLAKE2B 54fa2e13be2cceb53b12b1edb2d6d7c1793f6ba2bbec67e9e00121b33683aa6bd4895392cbdf5aa7627958c6323984ae3db8b5bbf6b14faba86b13181e0a2614 SHA512 05da7ac7b3ebe085cf0808d8e1eba49372bfeb1488800f40c1d0b9025e743efede1200095a1e660c1d538b2cc1b19f0f717f3d0723043517859f5c2015f961ce
+EBUILD dolphin-plugins-subversion-24.08.1-r1.ebuild 1319 BLAKE2B 96d5526b7b5aaaf0a41d8ad037a1b16c8df1ae0b96fe81651564266505dde43db608222190b8edb1983564b545f5c024f20529f0b8b34d0117c1ae2b188b660c SHA512 051744357da713d1dfd2f49364ac7926bcb298f73712f0f9d16232b51f80e5f36d413b8a48ce929c333d651d0b6f6cfffdae0d00f7d7b725ba3da4fd164469fb
+EBUILD dolphin-plugins-subversion-24.08.3.ebuild 1321 BLAKE2B 110ac0cc9d79833746fffe47c28aea93e10a155ceb9e1df3a99652e0d95a39e02ca2a1c5a84395b7cc136df0602f51262552ed9757e57e95ced95372268f74e5 SHA512 3d4ad82d044acdd7ab67243f188db06072c10f382303633ab8c61f2d16942b205bb4e0f082d22a8210a41242a2fc4799dc83420435efed1c8812ea036817a652
+MISC metadata.xml 410 BLAKE2B 19c3aebce470d75ce9a551aa1100eec6faaf74fa06e74159d859ec31732a3a80170ecfbfe08edd931f9be9a00473ed6485bc2e23a65f7fe18339103cdc909f49 SHA512 752a847319ebf8d110347da3e6949f0ca6847c18453bf2b9a465a8415c79f37b4aefb03cc7fcf6874039c38ff4ee375715892a616c2766e1fd689c18c8b05c10
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild
deleted file mode 100644
index 95de4fbf28b5..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.04.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 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}:5
-"
-
-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
-}
-
-src_install() {
- ecm_src_install
- rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
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 ba0ce994a416..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild
+++ /dev/null
@@ -1,65 +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
-}
-
-src_install() {
- ecm_src_install
- rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.04.90.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.1-r1.ebuild
index 03ef682c8bbe..4335b1968a93 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.04.90.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.1-r1.ebuild
@@ -3,12 +3,11 @@
EAPI=8
-ECM_HANDBOOK="false"
KDE_ORG_NAME="dolphin-plugins"
MY_PLUGIN_NAME="svn"
PVCUT=$(ver_cut 1-3)
-KFMIN=6.0.0
-QTMIN=6.6.2
+KFMIN=6.5.0
+QTMIN=6.7.2
inherit ecm gear.kde.org
DESCRIPTION="Dolphin plugin for Subversion integration"
@@ -16,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
IUSE=""
DEPEND="
@@ -29,11 +28,13 @@ DEPEND="
"
RDEPEND="${DEPEND}
dev-vcs/subversion
+ >=kde-apps/dolphin-plugins-common-${PV}
>=kde-apps/kompare-${PVCUT}:*
"
src_prepare() {
ecm_src_prepare
+ ecm_punt_po_install
# qtconcurrent only required by git
ecm_punt_qt_module Concurrent
# solid, qtdbus only required by mountiso
@@ -42,8 +43,6 @@ src_prepare() {
# 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() {
@@ -53,12 +52,8 @@ src_configure() {
-DBUILD_dropbox=OFF
-DBUILD_git=OFF
-DBUILD_hg=OFF
+ -DBUILD_makefileactions=OFF
-DBUILD_mountiso=OFF
)
ecm_src_configure
}
-
-src_install() {
- ecm_src_install
- rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.3.ebuild
index 199937b4a0cf..4341c6306b10 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.08.3.ebuild
@@ -3,46 +3,46 @@
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
+KFMIN=6.5.0
+QTMIN=6.7.2
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"
+SLOT="6"
+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
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ >=kde-apps/dolphin-${PVCUT}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
"
RDEPEND="${DEPEND}
dev-vcs/subversion
+ >=kde-apps/dolphin-plugins-common-${PV}
>=kde-apps/kompare-${PVCUT}:*
"
src_prepare() {
ecm_src_prepare
+ ecm_punt_po_install
+ # qtconcurrent only required by git
+ ecm_punt_qt_module Concurrent
# 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() {
@@ -52,12 +52,8 @@ src_configure() {
-DBUILD_dropbox=OFF
-DBUILD_git=OFF
-DBUILD_hg=OFF
+ -DBUILD_makefileactions=OFF
-DBUILD_mountiso=OFF
)
ecm_src_configure
}
-
-src_install() {
- ecm_src_install
- rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
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 <nkrasheninnikov@yandex.ru>
-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
-
diff --git a/kde-apps/dolphin-plugins-subversion/metadata.xml b/kde-apps/dolphin-plugins-subversion/metadata.xml
index 858b75c358bc..24e0d59c569a 100644
--- a/kde-apps/dolphin-plugins-subversion/metadata.xml
+++ b/kde-apps/dolphin-plugins-subversion/metadata.xml
@@ -6,7 +6,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<upstream>
- <bugs-to>https://bugs.kde.org/</bugs-to>
+ <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=dolphin</bugs-to>
<remote-id type="kde-invent">sdk/dolphin-plugins</remote-id>
</upstream>
</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 21:08:50 +0000