From bfd63d5b0e96ad32e0d0a8fe15512b6a9ac6fc9e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2024 00:05:36 +0100 Subject: gentoo auto-resync : 21:05:2024 - 00:05:35 --- kde-apps/dolphin-plugins-subversion/Manifest | 8 +-- .../dolphin-plugins-subversion-23.08.5-r1.ebuild | 5 +- .../dolphin-plugins-subversion-24.02.2-r1.ebuild | 67 ------------------- .../dolphin-plugins-subversion-24.04.90.ebuild | 64 ++++++++++++++++++ .../772a4d712abcf1c6c86f25bd306785815132d886.patch | 78 ---------------------- ...olphin-plugins-subversion-23.08.5-fix-lto.patch | 78 ++++++++++++++++++++++ 6 files changed, 147 insertions(+), 153 deletions(-) delete mode 100644 kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2-r1.ebuild create mode 100644 kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.04.90.ebuild delete mode 100644 kde-apps/dolphin-plugins-subversion/files/772a4d712abcf1c6c86f25bd306785815132d886.patch create mode 100644 kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch (limited to 'kde-apps/dolphin-plugins-subversion') diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest index 94e1529d80a4..23417dc917b4 100644 --- a/kde-apps/dolphin-plugins-subversion/Manifest +++ b/kde-apps/dolphin-plugins-subversion/Manifest @@ -1,9 +1,9 @@ -AUX 772a4d712abcf1c6c86f25bd306785815132d886.patch 2039 BLAKE2B de667f70126baeabaf3da3e79ca7b9c64f152929f9a3446d840c02e52dcd7897e00b5337c48d528a3f9bc7aa11a78334af7cee6990ad1e6abc29621d3275ad34 SHA512 47754d821c21d7dff854ecabd45640265e54a3cd59dfc3fe48107dd8f24c704218e179762c0eaaaa4de536683e20b8d1638dec04bbb9b4a7f0433c6e62a57e1f +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.02.2.tar.xz 298356 BLAKE2B e40f64b6a97961ba9f614ba2a795d42c460b65073e1ab5c502cbd87f4810e0e381562890646501446af544aec5e7f790be266ec41407ef156e8a27ac0ba0d555 SHA512 585249422ef1637c2caee044a71d11c621127ef578131d2323e879b12bee2f17082c4811273e6bb0013d1386f7010ded187627965bfce0b1b412b25048cd11d8 +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 1549 BLAKE2B 4a46bb8be4c857d2169fb43606471322d8d0055ec2bcf54fb59154fbd080cc0152517fd0c212c686067679e4739e01c299b7225194c9ef3751594f05d0ab45c6 SHA512 ed90b8a2c56f963aa087ced5dbc2b123ce5321a51bff179f388ac02a688ca2ea956fab5ec67a03682911e565fb76c9898af11123e2c55581793cdce132ede5d1 +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.02.2-r1.ebuild 1510 BLAKE2B 70173b487bf0f721545a1ce725d245387120c1ca98bbe9b10062838444f2da732a09999c7ea96d0750e33f0b48d55463ad4ff20457eb5c1d9ba89972b92b2f00 SHA512 6a9d2558db2c59d37d20e0e8f687f3dff34eb9a76e03442f41cfc15d83bc7be4d93d2aac1e4f37ea51639718e38076a5fc24752d9315e58036b3e426864c21e0 +EBUILD dolphin-plugins-subversion-24.04.90.ebuild 1461 BLAKE2B 3de55c5b5cbbd583752a248fe62370332d06fa2f79cac48e3ca3acd524ec65476bcafd3894c31d1ce69e41456b6f305a69b5ebba0efb547a9708ee8357bc10cf SHA512 ddd6158d090623efd545d165caedc1461693203d173cc5e2641e25a1008a5ddcfcd596573c20dddb5b45b3897e906de559c12c8a1c3b0aafa02a1ac05f73f98f 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 index 47a4a3bb272a..ba0ce994a416 100644 --- 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 @@ -33,10 +33,7 @@ RDEPEND="${DEPEND} >=kde-apps/kompare-${PVCUT}:* " -PATCHES=( - # Backport patch to fix ODR: bug #926233 - "${FILESDIR}"/772a4d712abcf1c6c86f25bd306785815132d886.patch -) +PATCHES=( "${FILESDIR}/${P}-fix-lto.patch" ) # bug 926233 src_prepare() { ecm_src_prepare diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2-r1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2-r1.ebuild deleted file mode 100644 index 27f2be1106ea..000000000000 --- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2-r1.ebuild +++ /dev/null @@ -1,67 +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=6.0.0 -QTMIN=6.6.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="6" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - >=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/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.04.90.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.04.90.ebuild new file mode 100644 index 000000000000..03ef682c8bbe --- /dev/null +++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.04.90.ebuild @@ -0,0 +1,64 @@ +# 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=6.0.0 +QTMIN=6.6.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="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=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/kompare-${PVCUT}:* +" + +src_prepare() { + ecm_src_prepare + # 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() { + 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/files/772a4d712abcf1c6c86f25bd306785815132d886.patch b/kde-apps/dolphin-plugins-subversion/files/772a4d712abcf1c6c86f25bd306785815132d886.patch deleted file mode 100644 index e2157f00fd34..000000000000 --- a/kde-apps/dolphin-plugins-subversion/files/772a4d712abcf1c6c86f25bd306785815132d886.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 772a4d712abcf1c6c86f25bd306785815132d886 Mon Sep 17 00:00:00 2001 -From: Nikolai Krasheninnikov -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 *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/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 new file mode 100644 index 000000000000..e2157f00fd34 --- /dev/null +++ b/kde-apps/dolphin-plugins-subversion/files/dolphin-plugins-subversion-23.08.5-fix-lto.patch @@ -0,0 +1,78 @@ +From 772a4d712abcf1c6c86f25bd306785815132d886 Mon Sep 17 00:00:00 2001 +From: Nikolai Krasheninnikov +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 *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 + -- cgit v1.2.3