* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/
@ 2019-02-13 13:32 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-02-13 13:32 UTC (permalink / raw
To: gentoo-commits
commit: d30261e88e695a52e8bafabb6f06cd4faad20536
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 13:23:31 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 13:31:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30261e8
kde-apps/umbrello: Fix build with KF 5.54
Tested-by: Manuel Mommertz <2kmm <AT> gmx.de>
Closes: https://bugs.gentoo.org/677868
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../umbrello/files/umbrello-18.08.3-kf-5.54.patch | 32 ++++++++++++++++++++++
kde-apps/umbrello/umbrello-18.08.3.ebuild | 4 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch b/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch
new file mode 100644
index 00000000000..2cf4e6a72ee
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch
@@ -0,0 +1,32 @@
+From 62a9e5e6afdd920779f1211afb0381857659e578 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Thu, 6 Dec 2018 13:36:34 +0100
+Subject: Fix KDE CI compile error with Qt 5.10 on linux
+
+The error was "specialization of template<class T>
+struct QMetaTypeId in different namespace [-fpermissive]"
+
+The Qt 5.10 related issue is fixed by using another approach
+to exclude KF5 class KAboutData.
+---
+ umbrello/main.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/umbrello/main.cpp b/umbrello/main.cpp
+index e3315fa..9d2acd8 100644
+--- a/umbrello/main.cpp
++++ b/umbrello/main.cpp
+@@ -19,9 +19,8 @@
+
+ // kde includes
+ #if QT_VERSION > 0x050000
+-namespace dummy {
+-#include <kaboutdata.h>
+-}
++// prevent including of <kaboutdata.h>
++#define KABOUTDATA_H
+ #include <k4aboutdata.h>
+ #define KAboutData K4AboutData
+ #include <KCrash>
+--
+cgit v1.1
diff --git a/kde-apps/umbrello/umbrello-18.08.3.ebuild b/kde-apps/umbrello/umbrello-18.08.3.ebuild
index c570c012f3e..2afd90e22b9 100644
--- a/kde-apps/umbrello/umbrello-18.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-18.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -48,6 +48,8 @@ RDEPEND="${COMMON_DEPEND}
!<kde-apps/kde4-l10n-17.07.80
"
+PATCHES=( "${FILESDIR}/${P}-kf-5.54.patch" )
+
src_configure() {
local mycmakeargs=(
-DBUILD_KF5=ON
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/
@ 2020-10-12 16:15 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-10-12 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 5be844c556c7798bfa50df9da494d0d9f3296d6c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 15:06:15 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 16:15:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be844c5
kde-apps/umbrello: Patch out dev-qt/qtwebkit dependency, fix DEPENDs
- Update HOMEPAGE
- kde-frameworks/kdelibs4support is being linked to
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/umbrello-20.08.3-no-qtwebkit.patch | 105 +++++++++++++++++++++
.../files/umbrello-20.08.3-unused-qtwebkit.patch | 25 +++++
...o-20.08.2.ebuild => umbrello-20.08.2-r1.ebuild} | 11 +--
3 files changed, 135 insertions(+), 6 deletions(-)
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
new file mode 100644
index 00000000000..8f1a63675d8
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
@@ -0,0 +1,105 @@
+From 0500feddb6ff02cd42624b0d3018c5292481b031 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Oct 2020 11:46:24 +0200
+Subject: [PATCH] Disable defunct WelcomePage to get rid of QtWebKit
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 -
+ cmake/modules/ECMKDE4Macros.cmake | 2 +-
+ umbrello/CMakeLists.txt | 2 --
+ umbrello/uml.cpp | 2 +-
+ umbrello/umlappprivate.h | 5 ++++-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d2d897683..ac70ffe4e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,7 +89,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+ Test
+ Widgets
+ Xml
+- WebKitWidgets
+ )
+
+ # search packages used by KDE
+diff --git a/cmake/modules/ECMKDE4Macros.cmake b/cmake/modules/ECMKDE4Macros.cmake
+index 3de472295..28eb1c180 100644
+--- a/cmake/modules/ECMKDE4Macros.cmake
++++ b/cmake/modules/ECMKDE4Macros.cmake
+@@ -106,7 +106,7 @@ macro(find_package package)
+ #message("-- ${ARGV} --")
+ if("${package}" MATCHES "^(Qt5)")
+ #message("-- replaced by finding Qt4 --")
+- _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest QtWebKit)
++ _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest)
+ elseif("${package}" MATCHES "^(KF5)$")
+ #message("-- replaced by finding KDE4 --")
+ _find_package(KDE4 REQUIRED)
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
+index 264b25fde..22480642d 100644
+--- a/umbrello/CMakeLists.txt
++++ b/umbrello/CMakeLists.txt
+@@ -525,7 +525,6 @@ if(NOT BUILD_KF5)
+ Qt4::QtCore
+ Qt4::QtGui
+ Qt4::QtXml
+- Qt4::QtWebKit
+ ${LIBXML2_LIBRARIES}
+ ${LIBXSLT_LIBRARIES}
+ ${KDE4_KTEXTEDITOR_LIBS}
+@@ -549,7 +548,6 @@ else()
+ Qt5::Xml
+ Qt5::PrintSupport
+ Qt5::Svg
+- Qt5::WebKitWidgets
+ KF5::Archive
+ KF5::Completion
+ KF5::CoreAddons
+diff --git a/umbrello/uml.cpp b/umbrello/uml.cpp
+index 1e0be0c5a..98ce70aef 100644
+--- a/umbrello/uml.cpp
++++ b/umbrello/uml.cpp
+@@ -996,7 +996,7 @@ void UMLApp::initView()
+ m_d->createObjectsWindow();
+ #endif
+ m_d->createStereotypesWindow();
+- m_d->createWelcomeWindow();
++// m_d->createWelcomeWindow();
+
+ m_debugDock = new QDockWidget(i18n("&Debug"), this);
+ m_debugDock->setObjectName(QLatin1String("DebugDock"));
+diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
+index a85de1f22..b9d50a5c1 100644
+--- a/umbrello/umlappprivate.h
++++ b/umbrello/umlappprivate.h
+@@ -42,7 +42,7 @@
+ #include <QFileInfo>
+ #include <QListWidget>
+ #include <QObject>
+-#include <QWebView>
++// #include <QWebView>
+
+ class QWidget;
+
+@@ -151,6 +151,8 @@ public slots:
+
+ void createWelcomeWindow()
+ {
++ return;
++/*
+ QString file = findWelcomeFile();
+ if (file.isEmpty())
+ return;
+@@ -171,6 +173,7 @@ public slots:
+
+ viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
+ connect(viewWelcomeWindow, SIGNAL(triggered(bool)), welcomeWindow, SLOT(setVisible(bool)));
++*/
+ }
+
+ void slotWelcomeWindowLinkClicked(const QUrl &url)
+--
+2.28.0
+
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch
new file mode 100644
index 00000000000..bb1fde2878e
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch
@@ -0,0 +1,25 @@
+From 5263f4e391c50c72e000da6c2bcf1123c28192e5 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Wed, 21 Jun 2017 14:05:28 +0200
+Subject: [PATCH] Remove finding WebKitWidgets, not used
+
+---
+ lib/kdev5-php/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/kdev5-php/CMakeLists.txt b/lib/kdev5-php/CMakeLists.txt
+index 2a40b48ae..6ef58b0c9 100644
+--- a/lib/kdev5-php/CMakeLists.txt
++++ b/lib/kdev5-php/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(KDECMakeSettings)
+ include(GenerateExportHeader)
+ include(FeatureSummary)
+
+-find_package(Qt5 REQUIRED Core Widgets Test WebKitWidgets)
++find_package(Qt5 REQUIRED Core Widgets Test)
+ find_package(KF5 REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+ find_package(KDevelop-PG-Qt REQUIRED)
+--
+2.28.0
+
diff --git a/kde-apps/umbrello/umbrello-20.08.2.ebuild b/kde-apps/umbrello/umbrello-20.08.2-r1.ebuild
similarity index 91%
rename from kde-apps/umbrello/umbrello-20.08.2.ebuild
rename to kde-apps/umbrello/umbrello-20.08.2-r1.ebuild
index 574a19707ac..d1052ac66c7 100644
--- a/kde-apps/umbrello/umbrello-20.08.2.ebuild
+++ b/kde-apps/umbrello/umbrello-20.08.2-r1.ebuild
@@ -12,8 +12,7 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
-https://umbrello.kde.org"
+HOMEPAGE="https://kde.org/applications/en/umbrello https://umbrello.kde.org"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
@@ -26,7 +25,6 @@ RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwebkit-5.212.0_pre20180120:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
@@ -35,6 +33,7 @@ RDEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
@@ -49,9 +48,9 @@ RDEPEND="
dev-util/kdevelop-pg-qt
)
"
-DEPEND="${RDEPEND}
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/
@ 2023-04-29 21:51 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-04-29 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 4d685bdee13a2f14acf1812358f7b82a14468e0a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 19:30:19 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 21:50:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d685bde
kde-apps/umbrello: drop 22.12.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/umbrello/Manifest | 1 -
.../umbrello-20.08.3-gentoo-docbundledir.patch | 41 ------------
kde-apps/umbrello/umbrello-22.12.3.ebuild | 74 ----------------------
3 files changed, 116 deletions(-)
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 1c90a1103078..12ef595435c8 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,2 +1 @@
-DIST umbrello-22.12.3.tar.xz 5801500 BLAKE2B 5ac29cf8c3e994dae896ee12f430423c53a95682d23a6f2833d889c125107cd3a8691516ab5e2b1295d0da7504dae2501030e15374945b3b40b23792702c483b SHA512 a88984c79f176f2589e83f8e94434ef641f35dd4b0a9f361a2d7b1c117c416c898a3b26aa419a2b8c4746dd5f2eab9c6a35c81b34441e0471051962017744cf8
DIST umbrello-23.04.0.tar.xz 5774008 BLAKE2B 25b8ab6c63c5d5813e3348da7d7e08bbdb4b3648891d769f2a6c590935b52eee29f08014f5944fdd76080bb286ed9df1ae437f04dc9967ff0b37b584f79f9094 SHA512 aca07d2bdea918ed3d3b12cc3a8dd0bbd875200f7326e6a1d011ee04a98feefb49e23b015aa0bb089b3f1e9bc0d05029fad597ec8206020bb7f8e72bf20127fd
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch
deleted file mode 100644
index e3915379be2a..000000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 29186bb3c1c3e4de89d77340db966c660789cdab 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 d8bae2cfe..8c1c58a02 100644
---- a/umbrello/umlappprivate.cpp
-+++ b/umbrello/umlappprivate.cpp
-@@ -36,17 +36,17 @@ QString UMLAppPrivate::findWelcomeFile()
-
- // from custom install
- foreach(const QString &lang, langList) {
-- dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/doc/HTML/%1/umbrello/apphelp")).arg(lang));
-+ dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/help/%1/umbrello/apphelp")).arg(lang));
- }
-- dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/doc/HTML/en/umbrello/apphelp"));
-+ dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../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(QLatin1String("%1/doc/HTML/%2/umbrello/apphelp")).arg(location).arg(lang));
-+ dirList.append(QString(QLatin1String("%1/help/%2/umbrello/apphelp")).arg(location).arg(lang));
- }
-- dirList.append(QString(QLatin1String("%1/doc/HTML/en/umbrello/apphelp")).arg(location));
-+ dirList.append(QString(QLatin1String("%1/help/en/umbrello/apphelp")).arg(location));
- }
- #else
- KLocale *local = KGlobal::locale();
---
-2.29.2
-
diff --git a/kde-apps/umbrello/umbrello-22.12.3.ebuild b/kde-apps/umbrello/umbrello-22.12.3.ebuild
deleted file mode 100644
index 322e4a9cdcd1..000000000000
--- a/kde-apps/umbrello/umbrello-22.12.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 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.101.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://apps.kde.org/umbrello/ https://umbrello.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="php"
-
-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/kdelibs4support-${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
- php? (
- dev-util/kdevelop:5=
- dev-util/kdevelop-pg-qt:5
- dev-util/kdevelop-php:5
- )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.08.3-gentoo-docbundledir.patch # fix hardcoded path
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
- -DBUILD_APIDOC=OFF
- -DBUILD_KF5=ON
- -DBUILD_PHP_IMPORT=$(usex php)
- -DBUILD_unittests=$(usex test)
- )
- use test && mycmakeargs+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/
@ 2024-12-12 21:49 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-12-12 21:49 UTC (permalink / raw
To: gentoo-commits
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 <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 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-12 21:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-12 21:49 [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-04-29 21:51 Andreas Sturmlechner
2020-10-12 16:15 Andreas Sturmlechner
2019-02-13 13:32 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox