mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-06 02:17:34 -08:00
kde-apps/umbrello: Add KF6-based 25.11.70_pre20250817 snapshot
Bug: https://bugs.gentoo.org/954003 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
parent
bc227392de
commit
84326af4b0
@ -316,7 +316,8 @@ fi
|
||||
# list of applications ported to KF6 post-25.08 having to block SLOT=5
|
||||
if $(ver_test -gt 25.11.50); then
|
||||
case ${PN} in
|
||||
rocs)
|
||||
rocs | \
|
||||
umbrello)
|
||||
RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
|
||||
*) ;;
|
||||
esac
|
||||
|
||||
@ -1 +1,2 @@
|
||||
DIST umbrello-25.04.3.tar.xz 5618524 BLAKE2B 8c79a6e839d3a7ebea192f8b7e240500adcd8f4e7dece9ed1834e098e35f6b880b327555ad4455da80941c280a15e1e51070f56b888f4390fca857e439f76120 SHA512 ce6ac3783306e874b4deacf0e097317a49e004d35799b919887b5459de6a24e64865c3557160552b476eb7bba19be6ddccfdee788917b6d8ca21a5061f4fa4d9
|
||||
DIST umbrello-25.11.70_pre20250817-b2541da6.tar.gz 8705686 BLAKE2B b9fb9a4d31eebff7c6011bd225da18a7dff882f4c4b192365b30afcdbb6744fd3f42173f6762da366c21f1ca5542a8959be5505fcc43da9791791499802088dd SHA512 0530879742ee1e3af401fcae8fc8623df9fefa2d26b5bfaf866f499022ebbd426b3bee697ea69e0a54ba74d7f2d9cc2239a42e936e85dcc606cfc8a43ee40f7f
|
||||
|
||||
50
kde-apps/umbrello/files/umbrello-25.11.70-cmake.patch
Normal file
50
kde-apps/umbrello/files/umbrello-25.11.70-cmake.patch
Normal file
@ -0,0 +1,50 @@
|
||||
Pending MR: https://invent.kde.org/sdk/umbrello/-/merge_requests/67
|
||||
|
||||
From 7982ba18ad401c8d030afeb6bda13652addc9f85 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Sun, 17 Aug 2025 18:40:14 +0200
|
||||
Subject: [PATCH] Do not rely on BUILD_WITH_QT6 being set for build targets
|
||||
|
||||
In fact, even QtVersionOption will return early if QT_MAJOR_VERSION
|
||||
is already set. BUILD_WITH_QT6 is not necessarily set in such a case.
|
||||
|
||||
Amends bd0cd90a0ef37e4a2e7fe4eb0602973a58666d04
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
umbrello/CMakeLists.txt | 4 +++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3d0a8581c..304cba56b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -113,7 +113,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
endif()
|
||||
|
||||
if(BUILD_PHP_IMPORT)
|
||||
- if(BUILD_WITH_QT6)
|
||||
+ if(QT_MAJOR_VERSION STREQUAL "6")
|
||||
set(_name KDevelopPGQt)
|
||||
else()
|
||||
set(_name KDevelop-PG-Qt)
|
||||
diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
|
||||
index ce97ff703..c9b2fac00 100644
|
||||
--- a/umbrello/CMakeLists.txt
|
||||
+++ b/umbrello/CMakeLists.txt
|
||||
@@ -535,8 +535,10 @@ target_link_libraries(libumbrello
|
||||
${LIBXSLT_LIBRARIES}
|
||||
${LIBXML2_LIBRARIES}
|
||||
codeimport
|
||||
- $<$<BOOL:${BUILD_WITH_QT6}>:KF6::KIOWidgets>
|
||||
)
|
||||
+if(QT_MAJOR_VERSION STREQUAL "6")
|
||||
+ target_link_libraries(libumbrello KF6::KIOWidgets)
|
||||
+endif()
|
||||
ecm_add_app_icon(umbrello_SRCS
|
||||
ICONS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
|
||||
--
|
||||
2.50.1
|
||||
|
||||
68
kde-apps/umbrello/umbrello-25.11.70_pre20250817.ebuild
Normal file
68
kde-apps/umbrello/umbrello-25.11.70_pre20250817.ebuild
Normal file
@ -0,0 +1,68 @@
|
||||
# Copyright 1999-2025 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"
|
||||
KDE_ORG_COMMIT=b2541da64dc5b4c561904bd72b36f1776b0d9066
|
||||
KFMIN=6.16.0
|
||||
QTMIN=6.9.1
|
||||
inherit ecm gear.kde.org xdg
|
||||
|
||||
DESCRIPTION="KDE UML Modeller"
|
||||
HOMEPAGE="https://apps.kde.org/umbrello/"
|
||||
|
||||
LICENSE="GPL-2" # TODO: CHECK
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64"
|
||||
IUSE="php"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/libxml2:=
|
||||
dev-libs/libxslt
|
||||
>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
|
||||
>=dev-qt/qtsvg-${QTMIN}:6
|
||||
>=kde-frameworks/karchive-${KFMIN}:6
|
||||
>=kde-frameworks/kcompletion-${KFMIN}:6
|
||||
>=kde-frameworks/kconfig-${KFMIN}:6
|
||||
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:6
|
||||
>=kde-frameworks/kcrash-${KFMIN}:6
|
||||
>=kde-frameworks/ki18n-${KFMIN}:6
|
||||
>=kde-frameworks/kiconthemes-${KFMIN}:6
|
||||
>=kde-frameworks/kio-${KFMIN}:6
|
||||
>=kde-frameworks/kjobwidgets-${KFMIN}:6
|
||||
>=kde-frameworks/ktexteditor-${KFMIN}:6
|
||||
>=kde-frameworks/ktextwidgets-${KFMIN}:6
|
||||
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
|
||||
>=kde-frameworks/kwindowsystem-${KFMIN}:6
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:6
|
||||
php? (
|
||||
dev-util/kdevelop:6=
|
||||
dev-util/kdevelop-pg-qt:0
|
||||
dev-util/kdevelop-php:6
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-24.11.80-gentoo-docbundledir.patch # fix hardcoded path
|
||||
"${FILESDIR}"/${PN}-25.11.70-cmake.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
|
||||
-DBUILD_APIDOC=OFF
|
||||
-DBUILD_PHP_IMPORT=$(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
|
||||
}
|
||||
@ -63,6 +63,7 @@ games-util/lgogdownloader gui
|
||||
kde-apps/kde-apps-meta pim
|
||||
kde-apps/kdenetwork-meta bittorrent
|
||||
kde-apps/kleopatra pim
|
||||
kde-apps/umbrello php
|
||||
kde-misc/kio-gdrive share
|
||||
kde-plasma/plasma-nm openconnect
|
||||
net-misc/seafile-client shibboleth
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user