rpms/root
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 6.20.02

Browse source 
Drop patches accepted upstream
  root-dont-download-input-file-if-it-already-exists.patch
  root-fix-plugin-definition.patch
  root-man-install.patch
  root-pretty-printers.patch
  root-python3.patch
  root-stress-aarch64-ppc64le.patch
Drop patches no longer relevant due to changes to the code
  root-missing-include-string.patch
  root-static-constexpr.patch
Add workaround for PyROOT issues on ppc64le in EPEL 7
  root-epel7-ppc64le-pyroot.patch (patch conditionally applied)
Fix path to moved data file in tutorial
  root-moved-file.patch
Split the root-roofit subpackage into four different packages
  root-roofit, root-roofit-core, root-roofit-more and root-roostats
  The root-roofit-more library splits out the part of roofit that depends on
    the root-mathmore package
New subpackage: root-histv7
This commit is contained in:
Mattias Ellert 2020-03-23 10:03:24 +01:00
commit fba71390e2
18 changed files with 458 additions and 663 deletions
Download patch file Download diff file Expand all files Collapse all files

192
root-python3.8-object.patch
View file

@ -1,7 +1,7 @@
diff -ur root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx root-6.18.04/bindings/pyroot/src/MethodProxy.cxx
--- root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/MethodProxy.cxx 2020-03-13 16:46:56.538971601 +0100
@@ -839,7 +839,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot/src/MethodProxy.cxx root-6.20.02/bindings/pyroot/src/MethodProxy.cxx
--- root-6.20.02.orig/bindings/pyroot/src/MethodProxy.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/MethodProxy.cxx 2020-03-15 19:43:20.946684699 +0100
@@ -845,7 +845,8 @@
sizeof(MethodProxy), // tp_basicsize
0, // tp_itemsize
(destructor)mp_dealloc, // tp_dealloc
@ -11,7 +11,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx root-6.18.04/bind
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -888,6 +889,12 @@
@@ -894,6 +895,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -24,10 +24,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/MethodProxy.cxx root-6.18.04/bind
};
} // namespace PyROOT
diff -ur root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.18.04/bindings/pyroot/src/ObjectProxy.cxx
--- root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/ObjectProxy.cxx 2020-03-13 16:46:56.539971591 +0100
@@ -397,7 +397,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.20.02/bindings/pyroot/src/ObjectProxy.cxx
--- root-6.20.02.orig/bindings/pyroot/src/ObjectProxy.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/ObjectProxy.cxx 2020-03-15 19:43:20.946684699 +0100
@@ -398,7 +398,8 @@
sizeof(ObjectProxy), // tp_basicsize
0, // tp_itemsize
(destructor)op_dealloc, // tp_dealloc
@ -37,7 +37,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.18.04/bind
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -449,6 +450,12 @@
@@ -450,6 +451,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -50,9 +50,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/ObjectProxy.cxx root-6.18.04/bind
};
} // namespace PyROOT
diff -ur root-6.18.04.orig/bindings/pyroot/src/PropertyProxy.cxx root-6.18.04/bindings/pyroot/src/PropertyProxy.cxx
--- root-6.18.04.orig/bindings/pyroot/src/PropertyProxy.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/PropertyProxy.cxx 2020-03-13 16:46:56.539971591 +0100
diff -ur root-6.20.02.orig/bindings/pyroot/src/PropertyProxy.cxx root-6.20.02/bindings/pyroot/src/PropertyProxy.cxx
--- root-6.20.02.orig/bindings/pyroot/src/PropertyProxy.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/PropertyProxy.cxx 2020-03-15 19:43:20.946684699 +0100
@@ -133,7 +133,8 @@
sizeof(PropertyProxy), // tp_basicsize
0, // tp_itemsize
@ -76,10 +76,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/PropertyProxy.cxx root-6.18.04/bi
};
} // namespace PyROOT
diff -ur root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx root-6.18.04/bindings/pyroot/src/PyRootType.cxx
--- root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/PyRootType.cxx 2020-03-13 16:46:56.539971591 +0100
@@ -230,7 +230,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot/src/PyRootType.cxx root-6.20.02/bindings/pyroot/src/PyRootType.cxx
--- root-6.20.02.orig/bindings/pyroot/src/PyRootType.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/PyRootType.cxx 2020-03-15 19:43:20.946684699 +0100
@@ -232,7 +232,8 @@
sizeof(PyROOT::PyRootClass),// tp_basicsize
0, // tp_itemsize
0, // tp_dealloc
@ -89,7 +89,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx root-6.18.04/bindi
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -279,6 +280,12 @@
@@ -281,6 +282,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -102,9 +102,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/PyRootType.cxx root-6.18.04/bindi
};
} // namespace PyROOT
diff -ur root-6.18.04.orig/bindings/pyroot/src/Pythonize.cxx root-6.18.04/bindings/pyroot/src/Pythonize.cxx
--- root-6.18.04.orig/bindings/pyroot/src/Pythonize.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/Pythonize.cxx 2020-03-13 16:46:56.540971580 +0100
diff -ur root-6.20.02.orig/bindings/pyroot/src/Pythonize.cxx root-6.20.02/bindings/pyroot/src/Pythonize.cxx
--- root-6.20.02.orig/bindings/pyroot/src/Pythonize.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/Pythonize.cxx 2020-03-15 19:43:20.947684688 +0100
@@ -944,6 +944,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
@ -118,9 +118,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/Pythonize.cxx root-6.18.04/bindin
};
static PyObject* vector_iter( PyObject* v ) {
diff -ur root-6.18.04.orig/bindings/pyroot/src/RootModule.cxx root-6.18.04/bindings/pyroot/src/RootModule.cxx
--- root-6.18.04.orig/bindings/pyroot/src/RootModule.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/RootModule.cxx 2020-03-13 16:46:56.540971580 +0100
diff -ur root-6.20.02.orig/bindings/pyroot/src/RootModule.cxx root-6.20.02/bindings/pyroot/src/RootModule.cxx
--- root-6.20.02.orig/bindings/pyroot/src/RootModule.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/RootModule.cxx 2020-03-15 19:43:20.948684678 +0100
@@ -134,6 +134,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
@ -134,9 +134,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/RootModule.cxx root-6.18.04/bindi
};
PyObject _PyROOT_NullPtrStruct = {
diff -ur root-6.18.04.orig/bindings/pyroot/src/TCustomPyTypes.cxx root-6.18.04/bindings/pyroot/src/TCustomPyTypes.cxx
--- root-6.18.04.orig/bindings/pyroot/src/TCustomPyTypes.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/TCustomPyTypes.cxx 2020-03-13 16:46:56.540971580 +0100
diff -ur root-6.20.02.orig/bindings/pyroot/src/TCustomPyTypes.cxx root-6.20.02/bindings/pyroot/src/TCustomPyTypes.cxx
--- root-6.20.02.orig/bindings/pyroot/src/TCustomPyTypes.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/TCustomPyTypes.cxx 2020-03-15 19:43:20.948684678 +0100
@@ -19,7 +19,8 @@
0, // tp_basicsize
0, // tp_itemsize
@ -206,10 +206,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/TCustomPyTypes.cxx root-6.18.04/b
};
} // namespace PyROOT
diff -ur root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.18.04/bindings/pyroot/src/TemplateProxy.cxx
--- root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/TemplateProxy.cxx 2020-03-13 16:46:56.541971570 +0100
@@ -395,7 +395,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.20.02/bindings/pyroot/src/TemplateProxy.cxx
--- root-6.20.02.orig/bindings/pyroot/src/TemplateProxy.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/TemplateProxy.cxx 2020-03-15 19:43:20.948684678 +0100
@@ -492,7 +492,8 @@
sizeof(TemplateProxy), // tp_basicsize
0, // tp_itemsize
(destructor)tpp_dealloc, // tp_dealloc
@ -219,7 +219,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.18.04/bi
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -444,6 +445,12 @@
@@ -541,6 +542,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -232,9 +232,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/TemplateProxy.cxx root-6.18.04/bi
};
} // namespace PyROOT
diff -ur root-6.18.04.orig/bindings/pyroot/src/TTupleOfInstances.cxx root-6.18.04/bindings/pyroot/src/TTupleOfInstances.cxx
--- root-6.18.04.orig/bindings/pyroot/src/TTupleOfInstances.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot/src/TTupleOfInstances.cxx 2020-03-13 16:46:56.540971580 +0100
diff -ur root-6.20.02.orig/bindings/pyroot/src/TTupleOfInstances.cxx root-6.20.02/bindings/pyroot/src/TTupleOfInstances.cxx
--- root-6.20.02.orig/bindings/pyroot/src/TTupleOfInstances.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot/src/TTupleOfInstances.cxx 2020-03-15 19:43:20.948684678 +0100
@@ -42,7 +42,8 @@
0, // tp_basicsize
0, // tp_itemsize
@ -258,10 +258,25 @@ diff -ur root-6.18.04.orig/bindings/pyroot/src/TTupleOfInstances.cxx root-6.18.0
};
} // namespace PyROOT
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx 2020-03-13 16:47:15.029777701 +0100
@@ -168,7 +168,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/CMakeLists.txt 2020-03-15 19:43:20.949684667 +0100
@@ -64,11 +64,6 @@
target_compile_options(cppyy PRIVATE -Wno-deprecated-register)
endif()
-# Disables warnings due to new field tp_vectorcall in Python 3.8
-if(NOT MSVC AND ${PYTHON_VERSION_STRING} VERSION_GREATER_EQUAL "3.8")
- target_compile_options(cppyy PRIVATE -Wno-missing-field-initializers)
-endif()
-
target_include_directories(cppyy PRIVATE ${CMAKE_BINARY_DIR}/include) # needed for string_view backport
target_include_directories(cppyy PUBLIC ${PYTHON_INCLUDE_DIRS}
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDataMember.cxx 2020-03-15 19:43:20.949684667 +0100
@@ -167,7 +167,8 @@
sizeof(CPPDataMember), // tp_basicsize
0, // tp_itemsize
(destructor)pp_dealloc, // tp_dealloc
@ -271,7 +286,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDa
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -217,6 +218,12 @@
@@ -216,6 +217,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -284,10 +299,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPDa
};
} // namespace CPyCppyy
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx 2020-03-13 16:47:15.029777701 +0100
@@ -385,7 +385,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPInstance.cxx 2020-03-15 19:43:20.949684667 +0100
@@ -565,7 +565,8 @@
sizeof(CPPInstance), // tp_basicsize
0, // tp_itemsize
(destructor)op_dealloc, // tp_dealloc
@ -297,7 +312,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPIn
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -437,6 +438,12 @@
@@ -617,6 +618,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -310,10 +325,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPIn
};
} // namespace CPyCppyy
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx 2020-03-13 16:47:15.030777691 +0100
@@ -813,7 +813,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOverload.cxx 2020-03-15 19:43:20.950684656 +0100
@@ -889,7 +889,8 @@
sizeof(CPPOverload), // tp_basicsize
0, // tp_itemsize
(destructor)mp_dealloc, // tp_dealloc
@ -323,7 +338,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOv
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -862,6 +863,12 @@
@@ -938,6 +939,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -336,10 +351,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPOv
};
} // namespace CPyCppyy
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx 2020-03-13 16:47:15.030777691 +0100
@@ -424,7 +424,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPScope.cxx 2020-03-15 19:43:20.950684656 +0100
@@ -596,7 +596,8 @@
sizeof(CPyCppyy::CPPScope), // tp_basicsize
0, // tp_itemsize
0, // tp_dealloc
@ -349,7 +364,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPSc
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -473,6 +474,12 @@
@@ -649,6 +650,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -362,9 +377,9 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPPSc
};
} // namespace CPyCppyy
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx 2020-03-13 16:47:15.030777691 +0100
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCppyyModule.cxx 2020-03-15 19:43:20.951684646 +0100
@@ -140,6 +140,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
@ -378,10 +393,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CPyCp
};
namespace {
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx 2020-03-13 16:57:57.529034828 +0100
@@ -32,6 +32,12 @@
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/CustomPyTypes.cxx 2020-03-15 19:43:20.951684646 +0100
@@ -33,6 +33,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -394,7 +409,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
};
//= long type allowed for reference passing ==================================
@@ -54,6 +60,12 @@
@@ -59,6 +65,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -406,8 +421,21 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
+#endif
};
//- custom type representing typedef to pointer of class ---------------------
@@ -89,6 +101,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
+#if PY_VERSION_HEX >= 0x03080000
+ , 0 // tp_vectorcall
+#if PY_VERSION_HEX < 0x03090000
+ , 0 // tp_print (python 3.8 only)
+#endif
+#endif
};
//= instancemethod object with a more efficient call function ================
@@ -219,6 +231,12 @@
@@ -254,6 +272,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -420,7 +448,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
};
@@ -269,6 +287,12 @@
@@ -304,6 +328,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -433,7 +461,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
};
@@ -320,6 +344,12 @@
@@ -355,6 +385,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -446,10 +474,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Custo
};
} // namespace CPyCppyy
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx 2020-03-13 16:47:15.031777680 +0100
@@ -657,7 +657,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLevelViews.cxx 2020-03-15 19:43:20.951684646 +0100
@@ -651,7 +651,8 @@
sizeof(CPyCppyy::LowLevelView),// tp_basicsize
0, // tp_itemsize
(destructor)ll_dealloc, // tp_dealloc
@ -459,7 +487,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLe
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -707,6 +708,12 @@
@@ -701,6 +702,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -472,10 +500,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/LowLe
};
} // namespace CPyCppyy
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx 2020-03-13 16:47:15.032777670 +0100
@@ -515,7 +515,8 @@
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TemplateProxy.cxx 2020-03-15 19:43:20.952684635 +0100
@@ -709,7 +709,8 @@
sizeof(TemplateProxy), // tp_basicsize
0, // tp_itemsize
(destructor)tpp_dealloc, // tp_dealloc
@ -485,7 +513,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Templ
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -564,6 +565,12 @@
@@ -758,6 +759,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -498,10 +526,10 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Templ
};
} // namespace CPyCppyy
diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx
--- root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx 2019-09-11 15:36:49.000000000 +0200
+++ root-6.18.04/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx 2020-03-13 16:47:15.032777670 +0100
@@ -79,6 +79,12 @@
diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx
--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx 2020-03-15 16:21:25.000000000 +0100
+++ root-6.20.02/bindings/pyroot_experimental/cppyy/CPyCppyy/src/TupleOfInstances.cxx 2020-03-15 19:43:20.952684635 +0100
@@ -82,6 +82,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif
@ -514,7 +542,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Tuple
};
@@ -152,7 +158,8 @@
@@ -161,7 +167,8 @@
0, // tp_basicsize
0, // tp_itemsize
0, // tp_dealloc
@ -524,7 +552,7 @@ diff -ur root-6.18.04.orig/bindings/pyroot_experimental/cppyy/CPyCppyy/src/Tuple
0, // tp_getattr
0, // tp_setattr
0, // tp_compare
@@ -202,6 +209,12 @@
@@ -211,6 +218,12 @@
#if PY_VERSION_HEX >= 0x03040000
, 0 // tp_finalize
#endif