devel/root: Update to 6.34/04

'qt6web' support is now added as a port option.
This defaults to OFF, mirroring the source's default build options.

ChangeLog:	https://root.cern/doc/v634/release-notes.html#release-6.34.04
PR:		285099
This commit is contained in:
Erik Jensen 2025-03-02 12:07:57 +00:00 committed by Nuno Teixeira
parent ff6a6f656d
commit 93a94ec927
4 changed files with 18 additions and 22 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= root
DISTVERSION= 6.34.02
DISTVERSION= 6.34.04
CATEGORIES= devel science math parallel python
MASTER_SITES= https://root.cern/download/
DISTFILES= ${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
@ -56,14 +56,13 @@ CMAKE_OFF= arrow builtin_cfitsio builtin_cppzmq builtin_davix builtin_fftw3 \
builtin_xxhash builtin_zeromq builtin_zlib builtin_zstd cefweb clad cocoa \
cuda cudnn daos dcache fcgi fftw3 geombuilder gviz libcxx llvm13_broken_tests \
macos_native memory_termination minuit2_mpi minuit2_omp mpi odbc proof pythia8 \
qt6web r roofit_multiprocess runtime_cxxmodules shadowpw test_distrdf_pyspark \
tmva-gpu tmva-rmva tmva-sofie unfold unuran uring vc vecgeom win_broken_tests \
winrtdebug
# Port build options; DOCS also on by default
r roofit_multiprocess runtime_cxxmodules shadowpw test_distrdf_pyspark tmva-gpu \
tmva-rmva tmva-sofie unfold unuran uring vc vecgeom win_broken_tests winrtdebug
# See https://root.cern/install/build_from_source/#all-build-options
OPTIONS_DEFINE= DOCS ASIMAGE DATAFRAME DAVIX FITS FORTRAN GDML HTTP IMT MATHMORE \
MYSQL OPENGL PGSQL PYROOT QT5WEB ROOFIT ROOT7 SPECTRUM SQLITE SSL TMLP TMVAML \
VDT WEBGUI X11 XML XROOTD
MYSQL OPENGL PGSQL PYROOT QT5WEB QT6WEB ROOFIT ROOT7 SPECTRUM SQLITE SSL TMLP \
TMVAML VDT WEBGUI X11 XML XROOTD
OPTIONS_DEFAULT= ASIMAGE DATAFRAME DAVIX FITS GDML HTTP IMT MATHMORE OPENGL \
PYROOT ROOFIT ROOT7 SPECTRUM SSL TMLP TMVAML VDT WEBGUI X11 XML XROOTD
OPTIONS_SUB= yes
@ -145,6 +144,12 @@ QT5WEB_USES= qt:5
QT5WEB_USE= qt=buildtools:build,qmake:build \
qt=core,declarative,gui,location,network,printsupport,webchannel,webengine,widgets
QT6WEB_CMAKE_BOOL= qt6web
QT6WEB_DESC= Enable support for Qt6 web-based display
QT6WEB_IMPLIES= WEBGUI
QT6WEB_USES= qt:6
QT6WEB_USE= qt=base,declarative,positioning,webchannel,webengine
ROOFIT_CMAKE_BOOL= roofit
ROOFIT_DESC= Build the advanced fitting package RooFit, and RooStats for statistical tests

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1737048417
SHA256 (root_v6.34.02.source.tar.gz) = 166bec562e420e177aaf3133fa3fb09f82ecddabe8a2e1906345bad442513f94
SIZE (root_v6.34.02.source.tar.gz) = 197303012
TIMESTAMP = 1740857833
SHA256 (root_v6.34.04.source.tar.gz) = e320c5373a8e87bb29b7280954ca8355ad8c4295cf49235606f0c8b200acb374
SIZE (root_v6.34.04.source.tar.gz) = 197307579

View file

@ -1,12 +0,0 @@
--- cmake/modules/SetUpFreeBSD.cmake.orig 2024-03-21 09:58:40 UTC
+++ cmake/modules/SetUpFreeBSD.cmake
@@ -11,6 +11,9 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i686)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i686)
set(FP_MATH_FLAGS "-msse2 -mfpmath=sse")
set(ROOT_ARCHITECTURE freebsdi686)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i386) # FreeBSD port maintainer note: Treating i386 as i686 works
+ set(FP_MATH_FLAGS "-msse2 -mfpmath=sse")
+ set(ROOT_ARCHITECTURE freebsdi386)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
set(ROOT_ARCHITECTURE freebsdarm64)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)

View file

@ -3975,6 +3975,9 @@ lib/root/libRIO.so.%%SHLIB_VER%%
%%QT5WEB%%lib/root/libROOTQt5WebDisplay.so
%%QT5WEB%%lib/root/libROOTQt5WebDisplay.so.%%SHLIB_SHVER%%
%%QT5WEB%%lib/root/libROOTQt5WebDisplay.so.%%SHLIB_VER%%
%%QT6WEB%%lib/root/libROOTQt6WebDisplay.so
%%QT6WEB%%lib/root/libROOTQt6WebDisplay.so.%%SHLIB_SHVER%%
%%QT6WEB%%lib/root/libROOTQt6WebDisplay.so.%%SHLIB_VER%%
%%TMVAML%%lib/root/libROOTTMVASofie.rootmap
%%TMVAML%%lib/root/libROOTTMVASofie.so
%%TMVAML%%lib/root/libROOTTMVASofie.so.%%SHLIB_SHVER%%