commit: f6c6a42de43e8d3b5a8e9d5c2b0e69b295871451 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 15 19:53:27 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 15 19:53:27 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6c6a42d
kde-apps/umbrello: Rebase gentoo-docbundledir.patch on top of 24.12 Broken by foreach-loop to for-loop conversion Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...r.patch => umbrello-24.11.80-gentoo-docbundledir.patch} | 14 +++++++------- kde-apps/umbrello/umbrello-24.11.80.ebuild | 2 +- kde-apps/umbrello/umbrello-24.12.49.9999.ebuild | 2 +- kde-apps/umbrello/umbrello-9999.ebuild | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch similarity index 85% rename from kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch rename to kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch index c577a72f74..7af65f2a29 100644 --- a/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch +++ b/kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch @@ -1,4 +1,4 @@ -From 20e7b4e1cf4e150e7de2d9fa3f0ee43f434e8ec3 Mon Sep 17 00:00:00 2001 +From ce2c9900c36376cde471344e699b37f28ececd98 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Thu, 5 Nov 2020 14:39:51 +0100 Subject: [PATCH] Fix hardcoded docbook install paths for Gentoo @@ -11,13 +11,13 @@ Signed-off-by: Andreas Sturmlechner <[email protected]> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp -index 08c138518..28e5d3086 100644 +index 8966837fb..d5a56bfd8 100644 --- a/umbrello/umlappprivate.cpp +++ b/umbrello/umlappprivate.cpp @@ -33,17 +33,17 @@ QString UMLAppPrivate::findWelcomeFile() // from custom install - foreach(const QString &lang, langList) { + for(const QString &lang : langList) { - dirList.append(QCoreApplication::applicationDirPath() + QString(QStringLiteral("/../share/doc/HTML/%1/umbrello/apphelp")).arg(lang)); + dirList.append(QCoreApplication::applicationDirPath() + QString(QStringLiteral("/../share/help/%1/umbrello/apphelp")).arg(lang)); } @@ -26,16 +26,16 @@ index 08c138518..28e5d3086 100644 QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); // from real installation - foreach(const QString &location, locations) { - foreach(const QString &lang, langList) { + for(const QString &location : locations) { + for (const QString &lang : langList) { - dirList.append(QString(QStringLiteral("%1/doc/HTML/%2/umbrello/apphelp")).arg(location).arg(lang)); + dirList.append(QString(QStringLiteral("%1/help/%2/umbrello/apphelp")).arg(location).arg(lang)); } - dirList.append(QString(QStringLiteral("%1/doc/HTML/en/umbrello/apphelp")).arg(location)); + dirList.append(QString(QStringLiteral("%1/help/en/umbrello/apphelp")).arg(location)); } - foreach(const QString &dir, dirList) { + for(const QString &dir : dirList) { QString filePath = dir + QStringLiteral("/index.cache.bz2"); -- -2.40.0 +2.47.0 diff --git a/kde-apps/umbrello/umbrello-24.11.80.ebuild b/kde-apps/umbrello/umbrello-24.11.80.ebuild index e988cb09e2..7da5c4553b 100644 --- a/kde-apps/umbrello/umbrello-24.11.80.ebuild +++ b/kde-apps/umbrello/umbrello-24.11.80.ebuild @@ -52,7 +52,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-23.03.80-gentoo-docbundledir.patch # fix hardcoded path + "${FILESDIR}"/${P}-gentoo-docbundledir.patch # fix hardcoded path ) src_configure() { diff --git a/kde-apps/umbrello/umbrello-24.12.49.9999.ebuild b/kde-apps/umbrello/umbrello-24.12.49.9999.ebuild index 40c48779c7..e700d658cc 100644 --- a/kde-apps/umbrello/umbrello-24.12.49.9999.ebuild +++ b/kde-apps/umbrello/umbrello-24.12.49.9999.ebuild @@ -52,7 +52,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-23.03.80-gentoo-docbundledir.patch # fix hardcoded path + "${FILESDIR}"/${PN}-24.11.80-gentoo-docbundledir.patch # fix hardcoded path ) src_configure() { diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild index 40c48779c7..e700d658cc 100644 --- a/kde-apps/umbrello/umbrello-9999.ebuild +++ b/kde-apps/umbrello/umbrello-9999.ebuild @@ -52,7 +52,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-23.03.80-gentoo-docbundledir.patch # fix hardcoded path + "${FILESDIR}"/${PN}-24.11.80-gentoo-docbundledir.patch # fix hardcoded path ) src_configure() {
