Date: Tuesday, November 22, 2022 @ 21:16:44
Author: kgizdov
Revision: 1351891
upgpkg: root 6.26.10-1: upgpkg: root 6.26.10-1
Modified:
root/trunk/PKGBUILD
Deleted:
root/trunk/fix_rootcling.patch
root/trunk/nlohmann_json.patch
---------------------+
PKGBUILD | 12 +++-------
fix_rootcling.patch | 60 --------------------------------------------------
nlohmann_json.patch | 32 --------------------------
3 files changed, 4 insertions(+), 100 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-22 21:06:57 UTC (rev 1351890)
+++ PKGBUILD 2022-11-22 21:16:44 UTC (rev 1351891)
@@ -6,8 +6,8 @@
pkgbase=root
pkgname=('root' 'root-cuda')
-pkgver=6.26.06
-pkgrel=7
+pkgver=6.26.10
+pkgrel=1
pkgdesc='C++ data analysis framework and interpreter from CERN'
arch=('x86_64')
url='https://root.cern'
@@ -100,10 +100,8 @@
'jupyter_notebook_config.py'
'nbman-for-arch.patch'
'thisroot.fail'
- 'fix_rootcling.patch'
- 'nlohmann_json.patch'
)
-b2sums=('cb9f4b17f7eae36fbd728aa9c03a5705f5d05da0a9c0913fef6145d3fae4843f1a77b3f6251cd6cc322fa7ada4837c0be69aa53b2e1572c72e6e91d1b68aef47'
+b2sums=('8197b3e02b2395806f509b3b17f2936e03506073c96dba10e2ffadef8d26ebad0a270e29c05b090cc1cc20597a427d4643dfb9782675c97cb5864e4ee7bef2d7'
'5da6218a171ee0fbd7b03518dde22787bb0e478a18dcf227eea4e65598c0a0bb299747c6503ad3026804e1a4dbcf4d2b674b83e6ed6e482dd3d14ceb4646dee8'
'b5defce795dbfeee75dab0cc4c20ac84fe55cb11e9acdd5e75831b6db98e6190621867a65427ab44d93b6fe30398db6fd191defb029a6dcd0af087c1e5115451'
'5e4c589fd9e226fcf7ff9ab880687c10ff0f7b7c03fdf12fc477622d6ec291e2dc62e7f5ce7b68856bccf37b64b2f4331f46788548d39fdca57fd832d1f3b437'
@@ -111,9 +109,7 @@
'36c3543d008eda4b0200b730d3ca795de5dca0fee0ba6f98f1e1edfc820a92dfd1352a558c1593f2f8590b3febabfb74857ca59211a71090106ce292e399dd09'
'47a7b4491f1455ddb02c3793c7fbaf05184dba9a5fc9d7378608727e69c778dd5832c49f11f4d2c8204dcffc86fc4786b5616fb381c4e3e629d78db9c86913c5'
'ec89007c4441d0010c0bfa90ca81e78ceeeb97bacaae2cc4814bd9a781062add80eaa6e4b8cf59c1a61e89ca8a14f3af6f1163766550f6db4154f671e5176d39'
-
'3501c944e8cab13fe9f5c8ab75a7cdb4b59bc5b00df4bf45ad246ab8cd6cb1ebde19369bc688458c97ff5f5acd4e86fc19b4c8f57ab4cb422d0a5eacac081138'
-
'5a6b92f685d830853b862c7471f8e802a45923543beb591313abd8aacf383d176d8e283380ab6418caa751449b5abc95391df1ed3ed83ed0b1d3bb9d25056272'
-
'f7f73d45e9d6f64b2b3ca8f0275fc84f1dc75b88a5a148fc389247f5708331f0b9ebc8920a6d411a8ab8dd305c9d7e69300df5797ba1e5c0146a5f01a5d39e9f')
+
'3501c944e8cab13fe9f5c8ab75a7cdb4b59bc5b00df4bf45ad246ab8cd6cb1ebde19369bc688458c97ff5f5acd4e86fc19b4c8f57ab4cb422d0a5eacac081138')
get_pyver () {
python -c 'import sys; print(str(sys.version_info[0]) + "." +
str(sys.version_info[1]))'
Deleted: fix_rootcling.patch
===================================================================
--- fix_rootcling.patch 2022-11-22 21:06:57 UTC (rev 1351890)
+++ fix_rootcling.patch 2022-11-22 21:16:44 UTC (rev 1351891)
@@ -1,60 +0,0 @@
-From af599f6239e87c85c36e5634d04210f74a6ef78b Mon Sep 17 00:00:00 2001
-From: Jonas Rembser <[email protected]>
-Date: Tue, 21 Sep 2021 15:15:17 +0200
-Subject: [PATCH] [cmake] Protect against empty `COMPILE_DEFINITIONS` in
- rootcint command
-
-In the `rootcint` command defined in `RootMacros.cmake`, the
-`COMPILE_DEFINITIONS` from the target are forwarded as compiler flags.
-
-The `COMPILE_DEFINITIONS` are stored in the `module_defs` variable with
-a generator expression:
-
-```
-set(module_defs $<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>)
-```
-
-Then, the definitions are added to the rootcint command with this
-expression:
-
-```
-"$<$<BOOL:${module_defs}>:-D$<JOIN:${module_defs},;-D>>"
-```
-
-This code was almost copied exactly from the CMake documentation
-example:
-
-https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html
-
-In particular, the `BOOL` check makes sure that the if the target
-property is empty, we will not get a bare `-D` with nothing after it,
-corrupting the rootcint command.
-
-However, there is no protextion against the case where the
-`COMPILE_DEFINITIONS` target property is not empty, but its elements are
-empty strings! This happened to me in my recent build.
-
-Instead of trying to figure out where the empty strings are added to the
-`COMPILE_DEFINITIONS`, it is better to also protect against empty target
-property elements in the CMake generator expressions, which is
-implemented in this commit.
----
- cmake/modules/RootMacros.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
-index c52c23d29af4..c62ffc2152a5 100644
---- a/cmake/modules/RootMacros.cmake
-+++ b/cmake/modules/RootMacros.cmake
-@@ -628,7 +628,10 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
- # and list exclusion for generator expressions is too complex.
- set(module_incs
$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:${ARG_MODULE},INCLUDE_DIRECTORIES>>)
- set(module_sysincs
$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:${ARG_MODULE},INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>>)
-- set(module_defs $<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>)
-+ # The COMPILE_DEFINITIONS list might contain empty elements. These are
-+ # removed with the FILTER generator expression, excluding elements that
-+ # match the ^$ regexp (only matches empty strings).
-+ set(module_defs
"$<FILTER:$<TARGET_PROPERTY:${ARG_MODULE},COMPILE_DEFINITIONS>,EXCLUDE,^$>")
- endif()
- endif()
-
Deleted: nlohmann_json.patch
===================================================================
--- nlohmann_json.patch 2022-11-22 21:06:57 UTC (rev 1351890)
+++ nlohmann_json.patch 2022-11-22 21:16:44 UTC (rev 1351891)
@@ -1,32 +0,0 @@
-diff --git a/graf3d/eve7/inc/ROOT/REveElement.hxx
b/graf3d/eve7/inc/ROOT/REveElement.hxx
-index 2a127888a2..9deb3af147 100644
---- a/graf3d/eve7/inc/ROOT/REveElement.hxx
-+++ b/graf3d/eve7/inc/ROOT/REveElement.hxx
-@@ -16,26 +16,13 @@
- #include <ROOT/REveVector.hxx>
- #include <ROOT/REveProjectionBases.hxx>
-
-+#include <nlohmann/json_fwd.hpp>
-+
- #include <map>
- #include <memory>
-
- class TGeoMatrix;
-
--namespace nlohmann {
--template<typename T, typename SFINAE>
--struct adl_serializer;
--
--template <template <typename U, typename V, typename... Args> class
ObjectType,
-- template <typename U, typename... Args> class ArrayType, class
StringType, class BooleanType,
-- class NumberIntegerType, class NumberUnsignedType, class
NumberFloatType,
-- template <typename U> class AllocatorType, template <typename T,
typename SFINAE = void> class JSONSerializer,
-- class BinaryType>
--class basic_json;
--
--using json = basic_json<std::map, std::vector, std::string, bool,
std::int64_t, std::uint64_t, double, std::allocator,
-- adl_serializer, std::vector<std::uint8_t>>;
--} // namespace nlohmann
--
- namespace ROOT {
- namespace Experimental {
