Move to Qt6.

astro/stellarium/Makefile

@@ -4,6 +4,7 @@ COMMENT=		free open source planetarium
 
 V=			23.3
 DISTNAME=		stellarium-${V}
+REVISION=		0
 
 CATEGORIES=		astro x11
 
@@ -14,31 +15,32 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE=		Yes
 
-WANTLIB += ${COMPILER_LIBCXX} QXlsxQt5 Qt5Charts Qt5Concurrent Qt5Core
-WANTLIB += Qt5Gui Qt5Multimedia Qt5MultimediaWidgets Qt5Network
-WANTLIB += Qt5OpenGL Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
-WANTLIB += Qt5Quick Qt5Script Qt5SerialPort Qt5WebChannel Qt5WebEngineCore
-WANTLIB += Qt5WebEngineWidgets Qt5Widgets c gps m z
+WANTLIB += ${COMPILER_LIBCXX} GL QXlsxQt6 Qt6Charts Qt6Concurrent
+WANTLIB += Qt6Core Qt6Gui Qt6Multimedia Qt6MultimediaWidgets Qt6Network
+WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6Positioning Qt6PrintSupport
+WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick Qt6SerialPort Qt6WebChannel
+WANTLIB += Qt6WebEngineCore Qt6WebEngineWidgets Qt6Widgets c gps
+WANTLIB += m xkbcommon z
 
-SITES=	https://github.com/Stellarium/stellarium/releases/download/v${V}/
+SITES=			https://github.com/Stellarium/stellarium/releases/download/v${V}/
 
 MODULES=		devel/cmake \
 			lang/python \
-			x11/qt5
+			x11/qt6
 
 MODCMAKE_LDFLAGS=	-L${LOCALBASE}/lib
 MODPY_RUNDEP=		No
 
-BUILD_DEPENDS=		astro/calcmysky \
+BUILD_DEPENDS=		astro/calcmysky>=0.3.1p0 \
 			devel/indi,-libs
 
 LIB_DEPENDS=		misc/gpsd \
-			textproc/qxlsx \
-			x11/qt5/qtcharts \
-			x11/qt5/qtmultimedia \
-			x11/qt5/qtscript \
-			x11/qt5/qtserialport \
-			x11/qt5/qtwebengine
+			textproc/qxlsx,qt6 \
+			x11/qt6/qtcharts \
+			x11/qt6/qtmultimedia \
+			x11/qt6/qtpositioning \
+			x11/qt6/qtserialport \
+			x11/qt6/qtwebengine
 
 # used to download more stars definitions
 RUN_DEPENDS=		net/curl \
@@ -52,10 +54,6 @@ PORTHOME=		${WRKDIR}
 CONFIGURE_ARGS=		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
 			-DSTELLARIUM_RELEASE_BUILD=1
 
-# needs Qt6 WebEngineWidgets;
-# !!! sync Qt version with astro/calcmysky
-CONFIGURE_ARGS +=	-DENABLE_QT6=OFF
-
 CFLAGS +=		-I${LOCALBASE}/include -I${X11BASE}/include
 CXXFLAGS +=		-I${LOCALBASE}/include -I${X11BASE}/include
 

astro/stellarium/patches/patch-src_StelLogger_cpp

@@ -0,0 +1,46 @@
+/usr/ports/pobj/stellarium-23.3/stellarium-23.3/src/StelLogger.cpp:218:49: error: no member named 'SkipEmptyParts' in 'QString'; did you mean 'Qt::SkipEmptyParts'?
+        QStringList dmesgLines = dmesgData.split('\n', QString::SkipEmptyParts);
+                                                       ^~~~~~~~~~~~~~~~~~~~~~~
+                                                       Qt::SkipEmptyParts
+/usr/local/include/X11/qt6/QtCore/qnamespace.h:127:9: note: 'Qt::SkipEmptyParts' declared here
+        SkipEmptyParts = 0x1,
+
+Index: src/StelLogger.cpp
+--- src/StelLogger.cpp.orig
++++ src/StelLogger.cpp
+@@ -96,11 +96,7 @@ void StelLogger::init(const QString& logFilePath)
+ 	lspci.start("lspci", { "-v" }, QIODevice::ReadOnly);
+ 	lspci.waitForFinished(300);
+ 	const QString pciData(lspci.readAll());
+-	#if (QT_VERSION>=QT_VERSION_CHECK(5, 14, 0))
+ 	QStringList pciLines = pciData.split('\n', Qt::SkipEmptyParts);
+-	#else
+-	QStringList pciLines = pciData.split('\n', QString::SkipEmptyParts);
+-	#endif
+ 	for (int i = 0; i<pciLines.size(); i++)
+ 	{
+ 		if(pciLines.at(i).contains("VGA compatible controller"))
+@@ -180,11 +176,7 @@ void StelLogger::init(const QString& logFilePath)
+ 	systemProfiler.waitForStarted();
+ 	systemProfiler.waitForFinished();
+ 	const QString systemData(systemProfiler.readAllStandardOutput());
+-	#if (QT_VERSION>=QT_VERSION_CHECK(5, 14, 0))
+ 	QStringList systemLines = systemData.split('\n', Qt::SkipEmptyParts);
+-	#else
+-	QStringList systemLines = systemData.split('\n', QString::SkipEmptyParts);
+-	#endif
+ 	for (int i = 0; i<systemLines.size(); i++)
+ 	{
+ 		// hardware overview
+@@ -214,11 +206,7 @@ void StelLogger::init(const QString& logFilePath)
+ 	dmesg.waitForStarted();
+ 	dmesg.waitForFinished();
+ 	const QString dmesgData(dmesg.readAll());
+-	#if (QT_VERSION>=QT_VERSION_CHECK(5, 14, 0))
+-	QStringList dmesgLines = dmesgData.split('\n', QString::SkipEmptyParts);
+-	#else
+ 	QStringList dmesgLines = dmesgData.split('\n', Qt::SkipEmptyParts);
+-	#endif
+ 	for (int i = 0; i<dmesgLines.size(); i++)
+ 	{
+ 		if (dmesgLines.at(i).contains("memory"))