From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BFBA7158042 for ; Fri, 15 Nov 2024 20:01:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D747FE08A8; Fri, 15 Nov 2024 20:01:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9390E08A8 for ; Fri, 15 Nov 2024 20:01:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1765342FF3 for ; Fri, 15 Nov 2024 20:01:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B288C1915 for ; Fri, 15 Nov 2024 20:00:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1731700407.f6c6a42de43e8d3b5a8e9d5c2b0e69b295871451.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch kde-apps/umbrello/files/umbrello-24.11.80-gentoo-docbundledir.patch kde-apps/umbrello/umbrello-24.11.80.ebuild kde-apps/umbrello/umbrello-24.12.49.9999.ebuild kde-apps/umbrello/umbrello-9999.ebuild X-VCS-Directories: kde-apps/umbrello/files/ kde-apps/umbrello/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f6c6a42de43e8d3b5a8e9d5c2b0e69b295871451 X-VCS-Branch: master Date: Fri, 15 Nov 2024 20:00:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba7b9ca2-20ca-40d8-869e-a7ca0444a8f8 X-Archives-Hash: c659908eb751c26cf31fef724dde3d14 commit: f6c6a42de43e8d3b5a8e9d5c2b0e69b295871451 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 15 19:53:27 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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 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 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() {