* [PR PATCH] root: update to 6.28.00
@ 2023-02-09 4:35 BenJarg
2023-02-09 16:06 ` dkwo
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: BenJarg @ 2023-02-09 4:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 429 bytes --]
There is a new pull request by BenJarg against master on the void-packages repository
https://github.com/BenJarg/void-packages root-6.28.00
https://github.com/void-linux/void-packages/pull/42161
root: update to 6.28.00
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, (x86_64_glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42161.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-root-6.28.00-42161.patch --]
[-- Type: text/x-diff, Size: 4081 bytes --]
From fa020e88bc4a21b3f8eee328debc277453a5d915 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.00
---
srcpkgs/root/patches/musl.patch | 21 ---------------------
srcpkgs/root/patches/python3.11.patch | 15 ---------------
srcpkgs/root/template | 12 ++++++++----
3 files changed, 8 insertions(+), 40 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..4e57a11d46a2 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.00
revision=1
# Only i686 and x86_64 seem to be officially supported
archs="i686* x86_64*"
@@ -9,7 +9,11 @@ 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'
+ -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
$(vopt_if root7 '-Droot7=ON -DCMAKE_CXX_STANDARD=17 -Dwebgui=ON')
-DCMAKE_INSTALL_PYTHONDIR=${py3_sitelib/'usr/'}"
hostmakedepends="gcc-fortran"
@@ -17,14 +21,14 @@ 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
+checksum=afa1c5c06d0915411cb9492e474ea9ab12b09961a358e7e559013ed63b5d8084
build_options="fortran root7"
build_options_default="fortran"
python_version=3
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: root: update to 6.28.00
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
@ 2023-02-09 16:06 ` dkwo
2023-02-09 16:28 ` BenJarg
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: dkwo @ 2023-02-09 16:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42161#issuecomment-1424439344
Comment:
why was the musl patch removed?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: root: update to 6.28.00
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
2023-02-09 16:06 ` dkwo
@ 2023-02-09 16:28 ` BenJarg
2023-02-09 16:35 ` dkwo
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: BenJarg @ 2023-02-09 16:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by BenJarg on void-packages repository
https://github.com/void-linux/void-packages/pull/42161#issuecomment-1424470371
Comment:
@dkwo I had it merged upstream (root-project/root#10045) and it looks like it made it into this release.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: root: update to 6.28.00
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
2023-02-09 16:06 ` dkwo
2023-02-09 16:28 ` BenJarg
@ 2023-02-09 16:35 ` dkwo
2023-02-09 18:11 ` BenJarg
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: dkwo @ 2023-02-09 16:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3689 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42161#issuecomment-1424480264
Comment:
I see, that makes sense.
Current musl failure:
```
[9677/9682] Building CXX object roofit/xroofit/CMakeFiles/RooFitXRooFit.dir/src/xRooFit.cxx.o
FAILED: roofit/xroofit/CMakeFiles/RooFitXRooFit.dir/src/xRooFit.cxx.o
/usr/bin/g++ -I/builddir/root-6.28.00/roofit/xroofit/inc -I/builddir/root-6.28.00/core/unix/inc -I/builddir/root-6.28.00/core/foundation/v7/inc -I/builddir/root-6.28.00/core/base/v7/inc -I/builddir/root-6.28.00/core/clingutils/inc -I/builddir/root-6.28.00/core/textinput/inc -I/builddir/root-6.28.00/core/thread/inc -I/builddir/root-6.28.00/core/zip/inc -I/builddir/root-6.28.00/core/rint/inc -I/builddir/root-6.28.00/core/clib/inc -I/builddir/root-6.28.00/core/meta/inc -I/builddir/root-6.28.00/core/gui/inc -I/builddir/root-6.28.00/core/cont/inc -I/builddir/root-6.28.00/core/foundation/inc -I/builddir/root-6.28.00/core/base/inc -I/builddir/root-6.28.00/build/ginclude -I/builddir/root-6.28.00/gui/gui/inc -I/builddir/root-6.28.00/graf2d/gpad/inc -I/builddir/root-6.28.00/hist/hist/inc -I/builddir/root-6.28.00/math/mathcore/v7/inc -I/builddir/root-6.28.00/math/mathcore/inc -I/builddir/root-6.28.00/core/imt/inc -I/builddir/root-6.28.00/core/multiproc/inc -I/builddir/root-6.28.00/math/matrix/inc -I/builddir/root-6.28.00/graf2d/graf/inc -I/builddir/root-6.28.00/io/io/v7/inc -I/builddir/root-6.28.00/io/io/inc -I/builddir/root-6.28.00/core/clib/res -I/builddir/root-6.28.00/builtins -I/usr/include/freetype2 -I/builddir/root-6.28.00/gui/ged/inc -I/builddir/root-6.28.00/tree/tree/inc -I/builddir/root-6.28.00/tree/treeplayer/inc -I/builddir/root-6.28.00/roofit/roofitcore/inc -I/builddir/root-6.28.00/math/minuit/inc -I/builddir/root-6.28.00/math/minuit2/inc -I/builddir/root-6.28.00/math/foam/inc -I/builddir/root-6.28.00/math/smatrix/inc -I/builddir/root-6.28.00/roofit/batchcompute/inc -I/builddir/root-6.28.00/roofit/batchcompute/res -I/builddir/root-6.28.00/roofit/common/res -I/builddir/root-6.28.00/roofit/histfactory/inc -I/builddir/root-6.28.00/roofit/roofit/inc -I/builddir/root-6.28.00/roofit/roostats/inc -I/builddir/root-6.28.00/io/xmlparser/inc -I/usr/include/libxml2 -I/builddir/root-6.28.00/roofit/hs3/inc -I/builddir/root-6.28.00/roofit/jsoninterface/inc -I/builddir/root-6.28.00/roofit/xroofit/inc/RooFit -I/builddir/root-6.28.00/net/net/inc -I/builddir/root-6.28.00/graf3d/g3d/inc -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -ffile-prefix-map=/builddir/root-6.28.00/build=. -fdiagnostics-color=always -std=c++17 -Wno-implicit-fallthrough -Wno-noexcept-type -pipe -Wshadow -Wall -W -Woverloaded-virtual -fsigned-char -pthread -fPIC -fno-math-errno -std=c++17 -MD -MT roofit/xroofit/CMakeFiles/RooFitXRooFit.dir/src/xRooFit.cxx.o -MF roofit/xroofit/CMakeFiles/RooFitXRooFit.dir/src/xRooFit.cxx.o.d -o roofit/xroofit/CMakeFiles/RooFitXRooFit.dir/src/xRooFit.cxx.o -c /builddir/root-6.28.00/roofit/xroofit/src/xRooFit.cxx
In file included from /builddir/root-6.28.00/roofit/xroofit/src/xRooFit.cxx:43:
/builddir/root-6.28.00/roofit/xroofit/src/coutCapture.h: In constructor 'cout_redirect::cout_redirect(std::string&, size_t)':
/builddir/root-6.28.00/roofit/xroofit/src/coutCapture.h:21:14: error: assignment of read-only location 'stdout'
21 | stdout = fp;
| ^
/builddir/root-6.28.00/roofit/xroofit/src/coutCapture.h: In destructor 'cout_redirect::~cout_redirect()':
/builddir/root-6.28.00/roofit/xroofit/src/coutCapture.h:28:14: error: assignment of read-only location 'stdout'
28 | stdout = old3;
| ^
```
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: root: update to 6.28.00
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
` (2 preceding siblings ...)
2023-02-09 16:35 ` dkwo
@ 2023-02-09 18:11 ` BenJarg
2023-02-09 22:46 ` [PR PATCH] [Updated] " BenJarg
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: BenJarg @ 2023-02-09 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New comment by BenJarg on void-packages repository
https://github.com/void-linux/void-packages/pull/42161#issuecomment-1424616289
Comment:
@dkwo Yeah, so looking into this, it seems changing the value of `stdout` isn't portable, as it isn't C standard compliant. I'll write a patch to fix `coutCapture.h` for musl.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] root: update to 6.28.00
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
` (3 preceding siblings ...)
2023-02-09 18:11 ` BenJarg
@ 2023-02-09 22:46 ` BenJarg
2023-02-09 22:50 ` BenJarg
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: BenJarg @ 2023-02-09 22:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
There is an updated pull request by BenJarg against master on the void-packages repository
https://github.com/BenJarg/void-packages root-6.28.00
https://github.com/void-linux/void-packages/pull/42161
root: update to 6.28.00
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, (x86_64_glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42161.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-root-6.28.00-42161.patch --]
[-- Type: text/x-diff, Size: 4392 bytes --]
From f14644bb90cd47dda8bce5d058a86fa5dab81e1d 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.00
---
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..a5e6f62430e1 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.00
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=afa1c5c06d0915411cb9492e474ea9ab12b09961a358e7e559013ed63b5d8084
+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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: root: update to 6.28.00
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
` (4 preceding siblings ...)
2023-02-09 22:46 ` [PR PATCH] [Updated] " BenJarg
@ 2023-02-09 22:50 ` BenJarg
2023-03-28 20:52 ` Chocimier
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: BenJarg @ 2023-02-09 22:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
New comment by BenJarg on void-packages repository
https://github.com/void-linux/void-packages/pull/42161#issuecomment-1424942857
Comment:
Ok, so it seems the experimental ROOT 7 features are enable by default now, which includes that new code that doesn't work with musl. So for now, I will just disable these experimental features for musl, until there is a better fix for this.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: root: update to 6.28.00
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
` (5 preceding siblings ...)
2023-02-09 22:50 ` BenJarg
@ 2023-03-28 20:52 ` Chocimier
2023-03-29 19:09 ` [PR PATCH] [Updated] " BenJarg
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Chocimier @ 2023-03-28 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/42161#issuecomment-1487576958
Comment:
6.28/02 is out
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] root: update to 6.28.00
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
` (6 preceding siblings ...)
2023-03-28 20:52 ` Chocimier
@ 2023-03-29 19:09 ` BenJarg
2023-04-04 20:30 ` root: update to 6.28.02 Chocimier
2023-04-11 17:19 ` [PR PATCH] [Merged]: " Chocimier
9 siblings, 0 replies; 11+ messages in thread
From: BenJarg @ 2023-03-29 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
There is an updated pull request by BenJarg against master on the void-packages repository
https://github.com/BenJarg/void-packages root-6.28.00
https://github.com/void-linux/void-packages/pull/42161
root: update to 6.28.00
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, (x86_64_glibc)
A patch file from https://github.com/void-linux/void-packages/pull/42161.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-root-6.28.00-42161.patch --]
[-- Type: text/x-diff, Size: 4392 bytes --]
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: root: update to 6.28.02
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
` (7 preceding siblings ...)
2023-03-29 19:09 ` [PR PATCH] [Updated] " BenJarg
@ 2023-04-04 20:30 ` Chocimier
2023-04-11 17:19 ` [PR PATCH] [Merged]: " Chocimier
9 siblings, 0 replies; 11+ messages in thread
From: Chocimier @ 2023-04-04 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/42161#issuecomment-1496566954
Comment:
Looks fine, waiting for finish of big builds.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Merged]: root: update to 6.28.02
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
` (8 preceding siblings ...)
2023-04-04 20:30 ` root: update to 6.28.02 Chocimier
@ 2023-04-11 17:19 ` Chocimier
9 siblings, 0 replies; 11+ messages in thread
From: Chocimier @ 2023-04-11 17:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
There's a merged pull request on the void-packages repository
root: update to 6.28.02
https://github.com/void-linux/void-packages/pull/42161
Description:
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, (x86_64_glibc)
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-04-11 17:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-09 4:35 [PR PATCH] root: update to 6.28.00 BenJarg
2023-02-09 16:06 ` dkwo
2023-02-09 16:28 ` BenJarg
2023-02-09 16:35 ` dkwo
2023-02-09 18:11 ` BenJarg
2023-02-09 22:46 ` [PR PATCH] [Updated] " BenJarg
2023-02-09 22:50 ` BenJarg
2023-03-28 20:52 ` Chocimier
2023-03-29 19:09 ` [PR PATCH] [Updated] " BenJarg
2023-04-04 20:30 ` root: update to 6.28.02 Chocimier
2023-04-11 17:19 ` [PR PATCH] [Merged]: " Chocimier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).