From dafa5d9be68997265dd02220b91dcf5cbc41b3d5 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 21 Jul 2024 23:44:51 +0200 Subject: [PATCH] Update ROOT's R interface for Rcpp 1.0.13 --- root-r.patch | 32 ++++++++++++++++++++++++++++++++ root.spec | 9 ++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 root-r.patch diff --git a/root-r.patch b/root-r.patch new file mode 100644 index 0000000..8be2617 --- /dev/null +++ b/root-r.patch @@ -0,0 +1,32 @@ +From 141f62e800bfc54d2fdf76c0750dc6082d00910d Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Sun, 21 Jul 2024 23:09:54 +0200 +Subject: [PATCH] Update ROOT's R interface for Rcpp 1.0.13 + +--- + bindings/r/inc/TRInternalFunction.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/bindings/r/inc/TRInternalFunction.h b/bindings/r/inc/TRInternalFunction.h +index d9bf532205..fa77cbddbc 100644 +--- a/bindings/r/inc/TRInternalFunction.h ++++ b/bindings/r/inc/TRInternalFunction.h +@@ -31,7 +31,15 @@ public: + + RCPP_GENERATE_CTOR_ASSIGN(TRInternalFunction_Impl) + ++#if RCPP_VERSION >= Rcpp_Version(1,0,13) ++ template ++ TRInternalFunction_Impl(OUT(*fun)(T...)) ++ { ++ set(Rcpp::XPtr< Rcpp::CppFunctionN >(new Rcpp::CppFunctionN(fun), false)); ++ } ++#else + #include ++#endif + void update(SEXP) {} + private: + +-- +2.45.2 + diff --git a/root.spec b/root.spec index 1707564..386248b 100644 --- a/root.spec +++ b/root.spec @@ -26,7 +26,7 @@ Name: root Version: 6.32.02 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 3%{?dist} +Release: 4%{?dist} Summary: Numerical data analysis framework License: LGPL-2.1-or-later @@ -77,6 +77,9 @@ Patch9: root-Correct-the-regular-expression-for-the-scheme-p.patch # Fix test failure with tbb 2021.13.0 # https://github.com/root-project/root/pull/16016 Patch10: root-Whitelist-libtbbmalloc-in-library-import-test.patch +# Update ROOT's R interface for Rcpp 1.0.13 +# https://github.com/root-project/root/pull/16075 +Patch11: root-r.patch BuildRequires: gcc-c++ BuildRequires: gcc-gfortran @@ -1929,6 +1932,7 @@ This package contains utility functions for ntuples. %patch -P8 -p1 %patch -P9 -p1 %patch -P10 -p1 +%patch -P11 -p1 # Remove bundled sources in order to be sure they are not used # * afterimage @@ -3568,6 +3572,9 @@ fi %endif %changelog +* Sun Jul 21 2024 Mattias Ellert - 6.32.02-4 +- Update ROOT's R interface for Rcpp 1.0.13 + * Fri Jul 19 2024 Fedora Release Engineering - 6.32.02-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild