From f6c6a42de43e8d3b5a8e9d5c2b0e69b295871451 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 15 Nov 2024 20:53:27 +0100 Subject: 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 --- .../umbrello-23.03.80-gentoo-docbundledir.patch | 41 ---------------------- .../umbrello-24.11.80-gentoo-docbundledir.patch | 41 ++++++++++++++++++++++ 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 +- 5 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch create mode 100644 kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch (limited to 'kde-apps') diff --git a/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch deleted file mode 100644 index c577a72f74..0000000000 --- a/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 20e7b4e1cf4e150e7de2d9fa3f0ee43f434e8ec3 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Thu, 5 Nov 2020 14:39:51 +0100 -Subject: [PATCH] Fix hardcoded docbook install paths for Gentoo - -Gentoo sets KDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help". - -Signed-off-by: Andreas Sturmlechner ---- - umbrello/umlappprivate.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp -index 08c138518..28e5d3086 100644 ---- a/umbrello/umlappprivate.cpp -+++ b/umbrello/umlappprivate.cpp -@@ -33,17 +33,17 @@ QString UMLAppPrivate::findWelcomeFile() - - // from custom install - foreach(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)); - } -- dirList.append(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/doc/HTML/en/umbrello/apphelp")); -+ dirList.append(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/help/en/umbrello/apphelp")); - - QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); - // from real installation - foreach(const QString &location, locations) { - foreach(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) { - QString filePath = dir + QStringLiteral("/index.cache.bz2"); --- -2.40.0 - diff --git a/kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch new file mode 100644 index 0000000000..7af65f2a29 --- /dev/null +++ b/kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch @@ -0,0 +1,41 @@ +From ce2c9900c36376cde471344e699b37f28ececd98 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 5 Nov 2020 14:39:51 +0100 +Subject: [PATCH] Fix hardcoded docbook install paths for Gentoo + +Gentoo sets KDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help". + +Signed-off-by: Andreas Sturmlechner +--- + umbrello/umlappprivate.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp +index 8966837fb..d5a56bfd8 100644 +--- a/umbrello/umlappprivate.cpp ++++ b/umbrello/umlappprivate.cpp +@@ -33,17 +33,17 @@ QString UMLAppPrivate::findWelcomeFile() + + // from custom install + 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)); + } +- dirList.append(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/doc/HTML/en/umbrello/apphelp")); ++ dirList.append(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/help/en/umbrello/apphelp")); + + QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); + // from real installation + 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)); + } + for(const QString &dir : dirList) { + QString filePath = dir + QStringLiteral("/index.cache.bz2"); +-- +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() { -- cgit v1.2.3-65-gdbad