[rpms/highfive] rawhide: Fix build against eigen3-5.0.0 and xtensor-0.27.0

[rpms/highfive] rawhide: Fix build against eigen3-5.0.0 and xtensor-0.27.0

[Sandro Mani]

A new commit has been pushed.

Repo   : rpms/highfive
Branch : rawhide
Commit : 91c95f8baeec6c42ceb8f0819a1bd3c5df9a52c4
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-06-19T11:07:21+00:00
Stats  : +95/-0 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/highfive/c/91c95f8baeec6c42ceb8f0819a1bd3c5df9a52c4?branch=rawhide

Log:
Fix build against eigen3-5.0.0 and xtensor-0.27.0

---
diff --git a/highfive.spec b/highfive.spec
index 1010dc5..e4ecba6 100644
--- a/highfive.spec
+++ b/highfive.spec
@@ -56,6 +56,10 @@ Source:         https://github.com/highfive-devs/highfive/archive/v%{version}/hi
 # this upstream because a larger CMake modernization effort was already
 # implemented for the upcoming 3.0.0 release.
 Patch:          0001-Downstream-only-Patch-all-cmake_minimum_required-fro.patch
+# Add compatibility for eigen3-5.x
+Patch:          highfive_eigen.patch
+# Fix build with xtensor 0.27
+Patch:          highfive_xtensor.patch
 
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}

diff --git a/highfive_eigen.patch b/highfive_eigen.patch
new file mode 100644
index 0000000..11e9482
--- /dev/null
+++ b/highfive_eigen.patch
@@ -0,0 +1,13 @@
+diff -rupN --no-dereference highfive-2.10.1/CMake/HighFiveTargetDeps.cmake highfive-2.10.1-new/CMake/HighFiveTargetDeps.cmake
+--- highfive-2.10.1/CMake/HighFiveTargetDeps.cmake	2024-12-03 15:31:35.000000000 +0100
++++ highfive-2.10.1-new/CMake/HighFiveTargetDeps.cmake	2025-10-15 14:19:50.122866039 +0200
+@@ -72,6 +72,9 @@ if(NOT TARGET libdeps)
+     if (NOT EIGEN3_INCLUDE_DIRS)
+       find_package(Eigen3 NO_MODULE)
+       if(Eigen3_FOUND)
++        if(TARGET Eigen3::Eigen)
++          get_target_property(EIGEN3_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
++        endif()
+         message(STATUS "Found Eigen ${Eigen3_VERSION}: ${EIGEN3_INCLUDE_DIRS}")
+       else()
+         find_package(PkgConfig)

diff --git a/highfive_xtensor.patch b/highfive_xtensor.patch
new file mode 100644
index 0000000..d9fa011
--- /dev/null
+++ b/highfive_xtensor.patch
@@ -0,0 +1,78 @@
+diff -rupN --no-dereference highfive-2.10.1/CMakeLists.txt highfive-2.10.1-new/CMakeLists.txt
+--- highfive-2.10.1/CMakeLists.txt	2025-10-15 14:19:50.118998217 +0200
++++ highfive-2.10.1-new/CMakeLists.txt	2025-10-15 14:19:50.142095412 +0200
+@@ -87,8 +87,8 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
+     set(CMAKE_CXX_EXTENSIONS OFF)
+ endif()
+ 
+-if(HIGHFIVE_USE_XTENSOR AND CMAKE_CXX_STANDARD LESS 14)
+-    set(CMAKE_CXX_STANDARD 14)
++if(HIGHFIVE_USE_XTENSOR AND CMAKE_CXX_STANDARD LESS 20)
++    set(CMAKE_CXX_STANDARD 20)
+     set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ endif()
+ 
+diff -rupN --no-dereference highfive-2.10.1/include/highfive/H5Easy.hpp highfive-2.10.1-new/include/highfive/H5Easy.hpp
+--- highfive-2.10.1/include/highfive/H5Easy.hpp	2024-12-03 15:31:35.000000000 +0100
++++ highfive-2.10.1-new/include/highfive/H5Easy.hpp	2025-10-15 14:19:50.142463504 +0200
+@@ -28,8 +28,8 @@
+ #endif
+ 
+ #ifdef H5_USE_XTENSOR
+-#include <xtensor/xarray.hpp>
+-#include <xtensor/xtensor.hpp>
++#include <xtensor/containers/xarray.hpp>
++#include <xtensor.hpp>
+ #endif
+ 
+ // optionally enable Eigen plug-in and load the library
+diff -rupN --no-dereference highfive-2.10.1/src/examples/easy_attribute.cpp highfive-2.10.1-new/src/examples/easy_attribute.cpp
+--- highfive-2.10.1/src/examples/easy_attribute.cpp	2024-12-03 15:31:35.000000000 +0100
++++ highfive-2.10.1-new/src/examples/easy_attribute.cpp	2025-10-15 14:19:50.142716200 +0200
+@@ -13,7 +13,7 @@
+ 
+ // optionally enable plug-in xtensor
+ #ifdef H5_USE_XTENSOR
+-#include <xtensor/xtensor.hpp>
++#include <xtensor.hpp>
+ #endif
+ 
+ // optionally enable plug-in Eigen
+diff -rupN --no-dereference highfive-2.10.1/src/examples/easy_dumpoptions.cpp highfive-2.10.1-new/src/examples/easy_dumpoptions.cpp
+--- highfive-2.10.1/src/examples/easy_dumpoptions.cpp	2024-12-03 15:31:35.000000000 +0100
++++ highfive-2.10.1-new/src/examples/easy_dumpoptions.cpp	2025-10-15 14:19:50.142914305 +0200
+@@ -13,7 +13,7 @@
+ 
+ // optionally enable plug-in xtensor
+ #ifdef H5_USE_XTENSOR
+-#include <xtensor/xtensor.hpp>
++#include <xtensor.hpp>
+ #endif
+ 
+ // optionally enable plug-in Eigen
+diff -rupN --no-dereference highfive-2.10.1/src/examples/easy_load_dump.cpp highfive-2.10.1-new/src/examples/easy_load_dump.cpp
+--- highfive-2.10.1/src/examples/easy_load_dump.cpp	2024-12-03 15:31:35.000000000 +0100
++++ highfive-2.10.1-new/src/examples/easy_load_dump.cpp	2025-10-15 14:19:50.143100089 +0200
+@@ -13,7 +13,7 @@
+ 
+ // optionally enable plug-in xtensor
+ #ifdef H5_USE_XTENSOR
+-#include <xtensor/xtensor.hpp>
++#include <xtensor.hpp>
+ #endif
+ 
+ // optionally enable plug-in Eigen
+diff -rupN --no-dereference highfive-2.10.1/tests/unit/tests_high_five_easy.cpp highfive-2.10.1-new/tests/unit/tests_high_five_easy.cpp
+--- highfive-2.10.1/tests/unit/tests_high_five_easy.cpp	2024-12-03 15:31:35.000000000 +0100
++++ highfive-2.10.1-new/tests/unit/tests_high_five_easy.cpp	2025-10-15 14:19:50.143344507 +0200
+@@ -23,8 +23,8 @@
+ #include <highfive/H5Easy.hpp>
+ 
+ #ifdef H5_USE_XTENSOR
+-#include <xtensor/xrandom.hpp>
+-#include <xtensor/xview.hpp>
++#include <xtensor/generators/xrandom.hpp>
++#include <xtensor/views/xview.hpp>
+ #endif
+ 
+ #include <catch2/catch_test_macros.hpp>