public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/
Date: Sun, 23 Mar 2025 14:30:27 +0000 (UTC)	[thread overview]
Message-ID: <1742740204.2c6fbd78eb0772b4588dbc8f0bb898b99651c21a.conikost@gentoo> (raw)

commit:     2c6fbd78eb0772b4588dbc8f0bb898b99651c21a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Mar 12 07:22:55 2025 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 23 14:30:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6fbd78

kde-apps/umbrello: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../umbrello-23.03.80-gentoo-docbundledir.patch    | 41 ----------------------
 1 file changed, 41 deletions(-)

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 c577a72f74a1..000000000000
--- 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 <asturm@gentoo.org>
-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 <asturm@gentoo.org>
----
- 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
-


             reply	other threads:[~2025-03-23 14:30 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-23 14:30 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-03 10:57 [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/ Andreas Sturmlechner
2021-10-31  2:44 Sam James
2021-05-04 22:57 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1742740204.2c6fbd78eb0772b4588dbc8f0bb898b99651c21a.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox