commit:     fed00cfad949333be9e72b63a0c70f8bbaf8be00
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 23:16:24 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 21:44:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed00cfa

kde-apps/umbrello: 24.12.0 version bump

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/umbrello/Manifest                         |  1 +
 .../umbrello-24.11.80-gentoo-docbundledir.patch    | 41 +++++++++++++
 kde-apps/umbrello/umbrello-24.12.0.ebuild          | 71 ++++++++++++++++++++++
 3 files changed, 113 insertions(+)

diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 2aac19c8a434..17295e39b985 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1 +1,2 @@
 DIST umbrello-24.08.3.tar.xz 5609628 BLAKE2B 
e5a0feac3e136a43dd2ab7101dc9fe428e9856dc670dcd5fb399fcf949b2a1cf27c002043f739f3027bc73488cda387e0adf0048b038d61012530cd94e90a3fb
 SHA512 
ed9c984f23257df74bf84be1d87dea4b2d22779061d6d371165bc6ab4c3309a6b233a7cd02101947fd4bfde043e3aceede8d2e2e52ecb8da7276f6a43a1d81bb
+DIST umbrello-24.12.0.tar.xz 5617524 BLAKE2B 
664d40b4ea717e03f7c6b9a69d6d153117f8228fc562974619328dc398d187a9973ac88d023f39a24af7891ca867c293e3bf4cc97efc4878cba3f4cd75f5d136
 SHA512 
1dec0f3cd4b23099039b478393c9226c536592674e9a5596f890d1e5d7ab60c303179a074a43d9fea07c70525a1bc7ebefd1ace0b286956a20b339c84ab82294

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 000000000000..7af65f2a297a
--- /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 <[email protected]>
+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 <[email protected]>
+---
+ 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.12.0.ebuild 
b/kde-apps/umbrello/umbrello-24.12.0.ebuild
new file mode 100644
index 000000000000..b5b576811142
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-24.12.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false" # TODO: figure out install error
+ECM_TEST="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="https://apps.kde.org/umbrello/";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# TODO: Re-enable when ported to KF6
+# IUSE="php"
+#      php? (
+#              dev-util/kdevelop:5=
+#              dev-util/kdevelop-pg-qt:5
+#              dev-util/kdevelop-php:5
+#      )
+
+RDEPEND="
+       dev-libs/libxml2
+       dev-libs/libxslt
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtprintsupport-${QTMIN}:5
+       >=dev-qt/qtsvg-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kjobwidgets-${KFMIN}:5
+       >=kde-frameworks/ktexteditor-${KFMIN}:5
+       >=kde-frameworks/ktextwidgets-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-24.11.80-gentoo-docbundledir.patch # fix hardcoded 
path
+)
+
+src_configure() {
+       local mycmakeargs=(
+               -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ 
ECM_QTHELP
+               -DBUILD_APIDOC=OFF
+               -DBUILD_PHP_IMPORT=OFF # $(usex php)
+       )
+       use test && mycmakeargs+=(
+               -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
+               -DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
+               -DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
+       )
+
+       ecm_src_configure
+}

Reply via email to