From befa20d4487ffb8faf457aa0b7d7e0d054d26c07 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 20 Nov 2025 16:38:40 +0000 Subject: Update KDDockWidgets to 2.4 with qt6, build hotspot for qt6 --- .../3b42145fe60f38e1b35bd4140ca967c496606dd8.patch | 27 --------- .../ec54b1efe74ca4b6cc1e432046de6269029c02ed.patch | 28 +++++++++ dev-util/hotspot/hotspot-1.5.1-r2.ebuild | 58 ------------------ dev-util/hotspot/hotspot-1.5.1-r3.ebuild | 68 ++++++++++++++++++++++ .../KDDockWidgets/KDDockWidgets-1.7.0.ebuild | 24 -------- .../KDDockWidgets/KDDockWidgets-2.4.0.ebuild | 35 +++++++++++ kde-frameworks/KDDockWidgets/Manifest | 2 +- 7 files changed, 132 insertions(+), 110 deletions(-) delete mode 100644 dev-util/hotspot/files/3b42145fe60f38e1b35bd4140ca967c496606dd8.patch create mode 100644 dev-util/hotspot/files/ec54b1efe74ca4b6cc1e432046de6269029c02ed.patch delete mode 100644 dev-util/hotspot/hotspot-1.5.1-r2.ebuild create mode 100644 dev-util/hotspot/hotspot-1.5.1-r3.ebuild delete mode 100644 kde-frameworks/KDDockWidgets/KDDockWidgets-1.7.0.ebuild create mode 100644 kde-frameworks/KDDockWidgets/KDDockWidgets-2.4.0.ebuild diff --git a/dev-util/hotspot/files/3b42145fe60f38e1b35bd4140ca967c496606dd8.patch b/dev-util/hotspot/files/3b42145fe60f38e1b35bd4140ca967c496606dd8.patch deleted file mode 100644 index 3415b3e..0000000 --- a/dev-util/hotspot/files/3b42145fe60f38e1b35bd4140ca967c496606dd8.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3b42145fe60f38e1b35bd4140ca967c496606dd8 Mon Sep 17 00:00:00 2001 -From: DarkDefender -Date: Mon, 30 Jan 2023 15:06:04 +0100 -Subject: [PATCH] Make libdebugd check in perfparser.cmake take into account - library status - -There are cases where `HAVE_DWFL_GET_DEBUGINFOD_CLIENT` can be true -while `LIBDEBUGINFOD_LIBRARIES` is marked as "NOT-FOUND". - -Add extra check to take this into account. ---- - 3rdparty/perfparser.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/3rdparty/perfparser.cmake b/3rdparty/perfparser.cmake -index fc401a7d..a5f64b07 100644 ---- a/3rdparty/perfparser.cmake -+++ b/3rdparty/perfparser.cmake -@@ -44,7 +44,7 @@ if (Zstd_FOUND) - target_compile_definitions(libhotspot-perfparser PUBLIC HAVE_ZSTD=1) - endif() - --if (HAVE_DWFL_GET_DEBUGINFOD_CLIENT) -+if (HAVE_DWFL_GET_DEBUGINFOD_CLIENT AND LIBDEBUGINFOD_LIBRARIES) - target_link_libraries(libhotspot-perfparser PRIVATE ${LIBDEBUGINFOD_LIBRARIES}) - target_compile_definitions(libhotspot-perfparser PRIVATE HAVE_DWFL_GET_DEBUGINFOD_CLIENT=1) - endif() diff --git a/dev-util/hotspot/files/ec54b1efe74ca4b6cc1e432046de6269029c02ed.patch b/dev-util/hotspot/files/ec54b1efe74ca4b6cc1e432046de6269029c02ed.patch new file mode 100644 index 0000000..056e5fa --- /dev/null +++ b/dev-util/hotspot/files/ec54b1efe74ca4b6cc1e432046de6269029c02ed.patch @@ -0,0 +1,28 @@ +From ec54b1efe74ca4b6cc1e432046de6269029c02ed Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Thu, 27 Feb 2025 23:33:07 +0100 +Subject: [PATCH] Fix build with Qt 6.9 + +That version added some overloads to setBrush [1], making the {} +ambiguous: +"hotspot/src/models/timelinedelegate.cpp:197:26: error: call of overloaded +'setBrush()' is ambiguous" + +[1] qtbase commit: 2ad79c626d7a94e545886152ce5ac3feabf619a2 +--- + src/models/timelinedelegate.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/models/timelinedelegate.cpp b/src/models/timelinedelegate.cpp +index b567f280b..e666d122e 100644 +--- a/src/models/timelinedelegate.cpp ++++ b/src/models/timelinedelegate.cpp +@@ -194,7 +194,7 @@ void TimeLineDelegate::paint(QPainter* painter, const QStyleOptionViewItem& opti + painter->drawRect(threadTimeRect.adjusted(-1, -1, 0, 0)); + + // visualize all events +- painter->setBrush({}); ++ painter->setBrush(QBrush()); + + if (offCpuCostId != -1) { + const auto offCpuColor = scheme.background(KColorScheme::NegativeBackground).color(); diff --git a/dev-util/hotspot/hotspot-1.5.1-r2.ebuild b/dev-util/hotspot/hotspot-1.5.1-r2.ebuild deleted file mode 100644 index 6166f30..0000000 --- a/dev-util/hotspot/hotspot-1.5.1-r2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -RESTRICT="mirror" - -DESCRIPTION="Hotspot - the Linux perf GUI for performance analysis" -HOMEPAGE="https://github.com/KDAB/hotspot" -vperfparser="851ebf0a033e73854c934d150a120f013bae2a66" -vprefixticklabels="6e86393f546429113e4ee78f7702eb820b21a0d2" -SRC_URI="https://github.com/KDAB/${PN}/archive/refs/tags/v${PV}.tar.gz - https://github.com/KDAB/perfparser/archive/${vperfparser}.tar.gz - https://github.com/koenpoppe/PrefixTickLabels/archive/${vprefixticklabels}.tar.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="" -REQUIRE_USE="" - -RDEPEND=" - >=dev-qt/qtcore-5.15.0 - >=dev-qt/qtwidgets-5.15.0 - >=dev-qt/qtnetwork-5.15.0 - >=dev-qt/qttest-5.15.0 - virtual/libelf - sys-devel/gettext - kde-frameworks/KDDockWidgets - kde-frameworks/extra-cmake-modules - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kitemmodels:5 - kde-frameworks/kitemviews:5 - kde-frameworks/kparts:5 - kde-frameworks/ktextwidgets:5 - kde-frameworks/kwindowsystem:5 - kde-frameworks/solid:5 - kde-frameworks/sonnet:5 - kde-frameworks/threadweaver:5 -