Update KDDockWidgets to 2.4 with qt6, build hotspot for qt6HEADmain

5 files changed, 71 insertions, 49 deletions

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 <darkdefende@gmail.com>
-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 <mail@heiko-becker.de>
+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(<brace-enclosed initializer list>)' 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-r3.ebuild
index 6166f30..7c86e33 100644
--- a/dev-util/hotspot/hotspot-1.5.1-r2.ebuild
+++ b/dev-util/hotspot/hotspot-1.5.1-r3.ebuild
@@ -23,33 +23,43 @@ 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
+	>=dev-qt/qtbase-6.5
+	>=dev-qt/qtsvg-6.4
+	>=dev-qt/qtdeclarative-6.4
 	virtual/libelf
 	sys-devel/gettext
-	kde-frameworks/KDDockWidgets
+	kde-frameworks/KDDockWidgets[qt6]
 	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
+	>=kde-frameworks/kconfigwidgets-6.20
+	>=kde-frameworks/kcoreaddons-6.20
+	>=kde-frameworks/ki18n-5.42
+	>=kde-frameworks/kio-6.20
+	>=kde-frameworks/kitemmodels-5.42
+	>=kde-frameworks/kitemviews-6.20
+	>=kde-frameworks/kparts-5.42
+	>=kde-frameworks/kwindowsystem-5.42
+	>=kde-frameworks/knotifications-5.42
+	>=kde-frameworks/kiconthemes-5.42
+	>=kde-frameworks/solid-5.42
+	>=kde-frameworks/threadweaver-5.42
 	<dev-util/perf-6.16
-	<dev-libs/qcustomplot-2.1.1-r10
+	dev-libs/qcustomplot
 	media-gfx/kgraphviewer
 	"
 
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	eapply ${FILESDIR}/ec54b1efe74ca4b6cc1e432046de6269029c02ed.patch
+	default
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=("-DQT6_BUILD=ON")
+	cmake_src_configure
+}
+
 src_unpack() {
 	default
 	rmdir ${S}/3rdparty/perfparser ${S}/3rdparty/PrefixTickLabels
diff --git a/kde-frameworks/KDDockWidgets/KDDockWidgets-1.7.0.ebuild b/kde-frameworks/KDDockWidgets/KDDockWidgets-2.4.0.ebuild
index f84a867..4e4bcb8 100644
--- a/kde-frameworks/KDDockWidgets/KDDockWidgets-1.7.0.ebuild
+++ b/kde-frameworks/KDDockWidgets/KDDockWidgets-2.4.0.ebuild
@@ -11,14 +11,25 @@ SRC_URI="https://github.com/KDAB/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64"
+IUSE="qt6"
 
 DEPEND="
-	dev-qt/qtwidgets
-	dev-qt/qtx11extras
-	dev-qt/qtquickcontrols2
+	qt6? (
+		dev-qt/qtbase:6
+		dev-qt/qtdeclarative:6 )
+	!qt6? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtquickcontrols2:5 )
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-build/cmake
 	dev-build/ninja
 "
+
+src_configure()
+{
+	local mycmakeargs=("-DKDDockWidgets_QT6=$(usex qt6)")
+	cmake_src_configure
+}
diff --git a/kde-frameworks/KDDockWidgets/Manifest b/kde-frameworks/KDDockWidgets/Manifest
index 87af297..2daa642 100644
--- a/kde-frameworks/KDDockWidgets/Manifest
+++ b/kde-frameworks/KDDockWidgets/Manifest
@@ -1 +1 @@
-DIST KDDockWidgets-1.7.0.tar.gz 3908508 BLAKE2B ba8c6690f6157271844e25c3c411c81225637df358fea478e7a87f6d00915cf1bdf2ba3c2f1b0d95c65221605d57f4c6e50c385307556dd35a1fc596eda49a81 SHA512 d91d74621682d1234eb2596b1cdb808daf564c25545ccabbb4750c621a8d7a7479669fa86fc4c379af6d5421c4c0b46705b3881d72955a5a3c82b8d255f9d648
+DIST KDDockWidgets-2.4.0.tar.gz 5668458 BLAKE2B aaf800d7359b350d69a9b72e513cb06fe32d8a7791519267e1102732294bbc679dd9ad0ea32c229133d66833f8dd9ed63d7dc58c92dededfb3fddc93e4c9fb56 SHA512 1e220c5cf608c5bb9242b530eb1e45a15dae462b126c12d253483a1213e72374baa75943d8734c5dc79e34b03b480d1a87cd59cb945996abc0ab20b5d649a5cb