diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-05-09 00:01:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-09 00:01:03 +0100 |
commit | a0ce545d52f231499bf9f3644493113d8af58ec9 (patch) | |
tree | 4d67c09eed0c2ae28d1317f72d7f7b08b4f6aeea /kde-apps/dolphin-plugins-subversion | |
parent | 5181ced3f3566a9610b85922b083c8f84f20d78f (diff) |
gentoo auto-resync : 09:05:2024 - 00:01:03
Diffstat (limited to 'kde-apps/dolphin-plugins-subversion')
-rw-r--r-- | kde-apps/dolphin-plugins-subversion/Manifest | 4 | ||||
-rw-r--r-- | kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild | 68 | ||||
-rw-r--r-- | kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2-r1.ebuild (renamed from kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2.ebuild) | 5 | ||||
-rw-r--r-- | kde-apps/dolphin-plugins-subversion/files/772a4d712abcf1c6c86f25bd306785815132d886.patch | 78 |
4 files changed, 154 insertions, 1 deletions
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest index 8a9392c94cc3..94e1529d80a4 100644 --- a/kde-apps/dolphin-plugins-subversion/Manifest +++ b/kde-apps/dolphin-plugins-subversion/Manifest @@ -1,7 +1,9 @@ +AUX 772a4d712abcf1c6c86f25bd306785815132d886.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.02.2.tar.xz 298356 BLAKE2B e40f64b6a97961ba9f614ba2a795d42c460b65073e1ab5c502cbd87f4810e0e381562890646501446af544aec5e7f790be266ec41407ef156e8a27ac0ba0d555 SHA512 585249422ef1637c2caee044a71d11c621127ef578131d2323e879b12bee2f17082c4811273e6bb0013d1386f7010ded187627965bfce0b1b412b25048cd11d8 EBUILD dolphin-plugins-subversion-23.04.3.ebuild 1429 BLAKE2B 4a40444ea3df609c8c4096160bac819da9be4e41cba5c57c3f82282b55b1719167ead46780ce13a3efad92910cb7edb806813bdc05af0dbac0f8e7adc9484220 SHA512 46fe30dd8557497f67514287079d15eb3de6e4c90b412e143d41a5907a7c0d3298b2eb2076a3c2362cab0069194c01d05e7fb22fa4a3d98fbdb10a4074d6977b +EBUILD dolphin-plugins-subversion-23.08.5-r1.ebuild 1549 BLAKE2B 4a46bb8be4c857d2169fb43606471322d8d0055ec2bcf54fb59154fbd080cc0152517fd0c212c686067679e4739e01c299b7225194c9ef3751594f05d0ab45c6 SHA512 ed90b8a2c56f963aa087ced5dbc2b123ce5321a51bff179f388ac02a688ca2ea956fab5ec67a03682911e565fb76c9898af11123e2c55581793cdce132ede5d1 EBUILD dolphin-plugins-subversion-23.08.5.ebuild 1429 BLAKE2B bf9ebcf36d42119bdb5243b85ae084120e280d427bd8d24e96d7a3234b2f96914872662c89ea5d72b91191168c83be31d0a1758ef76fd9efd460d50b39f5a9f3 SHA512 dedfe08e19c92dab5148498af3fe51e1412d9c9d03c7028c864d58dac82c4ffe445f80b560509086aac7bfc1ecdf14e75e62eb832bc10493085e5edcdfd4530c -EBUILD dolphin-plugins-subversion-24.02.2.ebuild 1393 BLAKE2B 4c40a15e3ee072e9db817a17e5ed0f8d06deb9b8cf7c33af1c5eee67b0332d0fa0d1e3d9218f3dbcb6f6831e6f630ff7f1fa732134918ec9b90311204290a48c SHA512 c579a5f0011b83291224292effdfc55e02ec168ea427ccde59ec4f73207e51e26561a5f819b2acd69210fce1fd9c23a1b3ef6e344a09631caf7751f54591d8b2 +EBUILD dolphin-plugins-subversion-24.02.2-r1.ebuild 1510 BLAKE2B 70173b487bf0f721545a1ce725d245387120c1ca98bbe9b10062838444f2da732a09999c7ea96d0750e33f0b48d55463ad4ff20457eb5c1d9ba89972b92b2f00 SHA512 6a9d2558db2c59d37d20e0e8f687f3dff34eb9a76e03442f41cfc15d83bc7be4d93d2aac1e4f37ea51639718e38076a5fc24752d9315e58036b3e426864c21e0 MISC metadata.xml 381 BLAKE2B 592c1524bc05ad8664508ee6616fedd5eaf364e2222c6fe3fb9a27949f56792c4cee994309781593e257c94ea31d7240c9f4e6cf189bb34aa8fae9a3794df265 SHA512 ea4651fe50618e84baf551a34e078680e3b8427a2e7a1075b5ced940b67dd3758b137bba42a0e83ac34d74b65b5c6969225241db51338bf3afdeaa06600a38ed 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 new file mode 100644 index 000000000000..47a4a3bb272a --- /dev/null +++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild @@ -0,0 +1,68 @@ +# 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=( + # Backport patch to fix ODR: bug #926233 + "${FILESDIR}"/772a4d712abcf1c6c86f25bd306785815132d886.patch +) + +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.02.2.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2-r1.ebuild index 1ce897a0f471..27f2be1106ea 100644 --- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2.ebuild +++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2-r1.ebuild @@ -32,6 +32,11 @@ RDEPEND="${DEPEND} >=kde-apps/kompare-${PVCUT}:* " +PATCHES=( + # Backport patch to fix ODR: bug #926233 + "${FILESDIR}"/772a4d712abcf1c6c86f25bd306785815132d886.patch +) + src_prepare() { ecm_src_prepare # solid, qtdbus only required by mountiso diff --git a/kde-apps/dolphin-plugins-subversion/files/772a4d712abcf1c6c86f25bd306785815132d886.patch b/kde-apps/dolphin-plugins-subversion/files/772a4d712abcf1c6c86f25bd306785815132d886.patch new file mode 100644 index 000000000000..e2157f00fd34 --- /dev/null +++ b/kde-apps/dolphin-plugins-subversion/files/772a4d712abcf1c6c86f25bd306785815132d886.patch @@ -0,0 +1,78 @@ +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 + |