[gentoo-commits] repo/gentoo:master commit in: sci-electronics/pulseview/, sci-electronics/pulseview/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     7800a7313078655324196395106967fa23932d4f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 16:06:44 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 17:15:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7800a731

sci-electronics/pulseview: Port to Qt6

Build failure is the same regardless of Qt5 or Qt6, so might as well port it.

Bug: https://bugs.gentoo.org/948044
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../pulseview-0.5.0-glibmm-2.68-required.patch      | 18 ++++++++++++++++++
 sci-electronics/pulseview/pulseview-9999.ebuild     | 21 +++++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch b/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch
new file mode 100644
index 000000000000..46309724517a
--- /dev/null
+++ b/sci-electronics/pulseview/files/pulseview-0.5.0-glibmm-2.68-required.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,14 +120,7 @@
+ 
+ list(APPEND PKGDEPS glib-2.0>=2.28.0)
+ 
+-# Try to find the prefered glibmm-2.4. If not found then add glibmm-2.68
+-# to the dependency list.
+-pkg_check_modules(GLIBMM_2_4 glibmm-2.4>=2.28.0)
+-if(GLIBMM_2_4_FOUND)
+-	list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
+-else()
+-	list(APPEND PKGDEPS glibmm-2.68>=2.68.0)
+-endif()
++list(APPEND PKGDEPS glibmm-2.68>=2.68.0)
+ 
+ if(ENABLE_FLOW)
+ 	list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0)

diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index f6e44dc48a2f..848be745da93 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 inherit cmake xdg-utils
 
@@ -20,25 +20,25 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="+decode static"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
 RDEPEND="
 	>=dev-cpp/glibmm-2.28.0:2
 	dev-libs/boost:=
 	>=dev-libs/glib-2.28.0:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
 	>=sci-libs/libsigrok-0.6.0:=[cxx]
 	decode? ( >=sci-libs/libsigrokdecode-0.6.0:= )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
 
 DOCS=( HACKING NEWS README )
 
+PATCHES=( "${FILESDIR}/${PN}-0.5.0-glibmm-2.68-required.patch" )
+
 src_prepare() {
 	cmake_src_prepare
 	cmake_comment_add_subdirectory manual
@@ -47,6 +47,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_WERROR=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
 		-DENABLE_DECODE=$(usex decode)
 		-DSTATIC_PKGDEPS_LIBS=$(usex static)
 	)