From 6807ff59621893f6a54d0fa3f18bf2998dbed9d5 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Sat, 4 Feb 2023 11:00:59 -0800
Subject: [PATCH] root: update to 6.28.02

---
 srcpkgs/root/patches/musl.patch       | 21 ---------------------
 srcpkgs/root/patches/python3.11.patch | 15 ---------------
 srcpkgs/root/template                 | 17 ++++++++++-------
 3 files changed, 10 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/root/patches/musl.patch
 delete mode 100644 srcpkgs/root/patches/python3.11.patch

diff --git a/srcpkgs/root/patches/musl.patch b/srcpkgs/root/patches/musl.patch
deleted file mode 100644
index 7605e91675a3..000000000000
--- a/srcpkgs/root/patches/musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/core/thread/src/TPosixThread.cxx b/core/thread/src/TPosixThread.cxx
-index 1e879c1c3a..4e1245baeb 100644
---- a/core/thread/src/TPosixThread.cxx
-+++ b/core/thread/src/TPosixThread.cxx
-@@ -37,13 +37,13 @@ Int_t TPosixThread::Run(TThread *th, const int affinity)
-    pthread_attr_init(attr);
-    
-    if (affinity >= 0) {
--   #ifdef R__MACOSX
--      Warning("Run", "Affinity setting not yet implemented on MacOS");
--   #else
-+   #ifdef __GLIBC__
-       cpu_set_t cpuset;
-       CPU_ZERO(&cpuset);
-       CPU_SET(affinity, &cpuset);
-       pthread_attr_setaffinity_np(attr, sizeof(cpu_set_t), &cpuset);
-+   #else
-+      Warning("Run", "Affinity setting not yet implemented on this platform");
-    #endif
-    }
- 
diff --git a/srcpkgs/root/patches/python3.11.patch b/srcpkgs/root/patches/python3.11.patch
deleted file mode 100644
index 3507945cf73d..000000000000
--- a/srcpkgs/root/patches/python3.11.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Python 3.11 restructures some headers, so fix the includes here.
-
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
-@@ -1,7 +1,9 @@
- // Bindings
- #include "CPyCppyy.h"
- #include "structmember.h"    // from Python
--#if PY_VERSION_HEX >= 0x02050000
-+#if PY_VERSION_HEX >= 0x030B0000
-+#include <Python.h>            // from Python
-+#elif PY_VERSION_HEX >= 0x02050000
- #include "code.h"            // from Python
- #else
- #include "compile.h"         // from Python
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 30e55493ffd6..0cbe92f79ecd 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,6 +1,6 @@
 # Template file for 'root'
 pkgname=root
-version=6.26.10
+version=6.28.02
 revision=1
 # Only i686 and x86_64 seem to be officially supported
 archs="i686* x86_64*"
@@ -9,23 +9,26 @@ configure_args="-Dgnuinstall=ON -Druntime_cxxmodules=OFF
  -Dclad=OFF $(vopt_if fortran '-Dfortran=ON')
  -DXROOTD_XrdCl_LIBRARY=/usr/lib/libXrdCl.so.3
  -DCMAKE_INSTALL_LIBDIR=/usr/lib/root -Dr=ON
- -DCMAKE_INSTALL_SYSCONFDIR='libexec/root'
- $(vopt_if root7 '-Droot7=ON -DCMAKE_CXX_STANDARD=17 -Dwebgui=ON')
+ -DCMAKE_INSTALL_SYSCONFDIR=libexec/root -Dbuiltin_gtest=OFF
+ -DGTEST_INCLUDE_DIRS=/usr/include/gtest/
+ -DGTEST_LIBRARIES=/usr/lib -DGTEST_MAIN_LIBRARIES=/usr/lib
+ -DGMOCK_INCLUDE_DIRS=/usr/include/gmock/
+ -DGMOCK_LIBRARIES=/usr/lib -DGMOCK_MAIN_LIBRARIES=/usr/lib
  -DCMAKE_INSTALL_PYTHONDIR=${py3_sitelib/'usr/'}"
 hostmakedepends="gcc-fortran"
 makedepends="libX11-devel libXpm-devel libXft-devel libXext-devel
  openssl-devel libpng-devel readline-devel tbb-devel liblz4-devel
  pcre-devel xxHash-devel libzstd-devel liblzma-devel libvdt-devel
  libxml2-devel python3-devel python3-numpy R-cran-Rcpp R-cran-RInside
- xrootd"
+ xrootd gtest-devel"
 depends="gcc"
 short_desc="C++ framework for data processing created by CERN"
 maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://root.cern"
 distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
-checksum=8e56bec397104017aa54f9eb554de7a1a134474fe0b3bb0f43a70fc4fabd625f
-build_options="fortran root7"
+checksum=6643c07710e68972b00227c68b20b1016fec16f3fba5f44a571fa1ce5bb42faa
+build_options="fortran"
 build_options_default="fortran"
 python_version=3
 shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so
@@ -33,7 +36,7 @@ shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
-	configure_args+=" -Dssl=OFF"
+	configure_args+=" -Dssl=OFF -Droot7=OFF"
 	;;
 esac