commit: f69bcbfb3473aa317a114334847b617f30caee84 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Wed May 8 00:52:26 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 8 19:19:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69bcbfb
kde-apps/dolphin-plugins-subversion: backport patch to fix ODR violation Closes: https://bugs.gentoo.org/926233 Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> ...> dolphin-plugins-subversion-23.08.5-r1.ebuild} | 26 +++++--- ...> dolphin-plugins-subversion-24.02.2-r1.ebuild} | 5 ++ .../772a4d712abcf1c6c86f25bd306785815132d886.patch | 78 ++++++++++++++++++++++ 3 files changed, 99 insertions(+), 10 deletions(-) diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild similarity index 72% copy from kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2.ebuild copy to kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild index 1ce897a0f471..47a4a3bb272a 100644 --- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2.ebuild +++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-23.08.5-r1.ebuild @@ -7,31 +7,37 @@ 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=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="6" -KEYWORDS="~amd64" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" 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 + >=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 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 similarity index 92% rename from kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-24.02.2.ebuild rename to 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 <nkrasheninni...@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 +
