[patch] Adds qt6 support

root-6.30.02_add_qt6.patch (text/plain), 1.79 KB, created by Rafal Lalik on 2023-12-01 17:26:16 UTC

--- /root-6.30.02.ebuild	2023-11-30 13:40:44.000000000 +0100
+++ root-6.30.02.ebuild	2023-12-01 16:47:35.663558023 +0100
@@ -15,8 +15,9 @@
 
 IUSE="+X aqua +asimage c++14 +c++17 cuda cudnn +davix debug +examples
 	fits fftw fortran +gdml graphviz +gsl http jupyter libcxx +minuit mpi
-	mysql odbc +opengl oracle postgres pythia6 pythia8 +python qt5 R +roofit
-	+root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml xrootd"
+	mysql odbc +opengl oracle postgres pythia6 pythia8 +python qt5 qt6 R
+	+roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc +xml
+	xrootd"
 RESTRICT="test"
 PROPERTIES="test_network"
 
@@ -41,11 +42,12 @@
 	^^ ( c++14 c++17 )
 	cuda? ( tmva )
 	cudnn? ( cuda )
-	!X? ( !asimage !opengl !qt5 )
+	!X? ( !asimage !opengl !qt5 !qt6 )
 	davix? ( ssl xml )
 	jupyter? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( root7 )
+	qt5? ( root7 http )
+	qt6? ( root7 http )
 	roofit? ( minuit )
 	root7? ( || ( c++17 ) )
 	tmva? ( gsl python )
@@ -80,9 +82,12 @@
 		)
 		qt5? (
 			dev-qt/qtcore:5
-			dev-qt/qtgui:5
 			dev-qt/qtwebengine:5[widgets]
 		)
+		qt6? (
+			dev-qt/qtbase:6
+			dev-qt/qtwebengine:6[widgets]
+		)
 	)
 	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
@@ -203,7 +208,6 @@
 		-Dcoverage=OFF
 		-Ddev=OFF
 		-Ddistcc=OFF
-		-Dexceptions=ON
 		-Dfail-on-missing=ON
 		-Dgnuinstall=ON
 		-Dgminimal=OFF
@@ -264,7 +268,6 @@
 		-Dlibcxx=$(usex libcxx)
 		-Dmathmore=$(usex gsl)
 		-Dminuit=$(usex minuit)
-		-Dminuit2=$(usex minuit)
 		-Dmlp=$(usex tmva)
 		-Dmonalisa=OFF
 		-Dmpi=$(usex mpi)
@@ -278,7 +281,7 @@
 		-Dpythia6=$(usex pythia6)
 		-Dpythia8=$(usex pythia8)
 		-Dqt5web=$(usex qt5)
-		-Dqt6web=OFF
+		-Dqt6web=$(usex qt6)
 		-Dr=$(usex R)
 		-Droofit=$(usex roofit)
 		-Droofit_multiprocess=OFF