diff --git a/root-Fix-return-type-in-ORC-readMem-client-interface.patch b/root-Fix-return-type-in-ORC-readMem-client-interface.patch new file mode 100644 index 0000000..2fd426d --- /dev/null +++ b/root-Fix-return-type-in-ORC-readMem-client-interface.patch @@ -0,0 +1,14 @@ +diff -ur root-6.14.00.orig/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h root-6.14.00/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +--- root-6.14.00.orig/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/interpreter/llvm/src/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h 2018-06-27 17:05:07.750663216 +0200 +@@ -713,8 +713,8 @@ + + uint32_t getTrampolineSize() const { return RemoteTrampolineSize; } + +- Expected> readMem(char *Dst, JITTargetAddress Src, +- uint64_t Size) { ++ Expected> readMem(char *Dst, JITTargetAddress Src, ++ uint64_t Size) { + // Check for an 'out-of-band' error, e.g. from an MM destructor. + if (ExistingError) + return std::move(ExistingError); diff --git a/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch new file mode 100644 index 0000000..c5d0b59 --- /dev/null +++ b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch @@ -0,0 +1,24 @@ +diff -ur root-6.14.00.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp root-6.14.00/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp +--- root-6.14.00.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLowering.cpp 2018-06-27 17:06:55.739506085 +0200 +@@ -11861,6 +11861,11 @@ + N->getOperand(1).getValueType() == MVT::i16 || + (Subtarget.hasLDBRX() && Subtarget.isPPC64() && + N->getOperand(1).getValueType() == MVT::i64))) { ++ // STBRX can only handle simple types. ++ EVT mVT = cast(N)->getMemoryVT(); ++ if (mVT.isExtended()) ++ break; ++ + SDValue BSwapOp = N->getOperand(1).getOperand(0); + // Do an any-extend to 32-bits if this is a half-word input. + if (BSwapOp.getValueType() == MVT::i16) +@@ -11868,7 +11873,6 @@ + + // If the type of BSWAP operand is wider than stored memory width + // it need to be shifted to the right side before STBRX. +- EVT mVT = cast(N)->getMemoryVT(); + if (Op1VT.bitsGT(mVT)) { + int Shift = Op1VT.getSizeInBits() - mVT.getSizeInBits(); + BSwapOp = DAG.getNode(ISD::SRL, dl, Op1VT, BSwapOp, +Endast i root-6.14.00/interpreter/llvm/src: test diff --git a/root-crash-fix.patch b/root-crash-fix.patch deleted file mode 100644 index ed64701..0000000 --- a/root-crash-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d055981def808c9c2175a8ca3f362b6ea006ebf3 Mon Sep 17 00:00:00 2001 -From: Bertrand Bellenot -Date: Thu, 8 Feb 2018 10:43:59 +0100 -Subject: [PATCH] Fix another potential crash on Windows - -On Windows, (as the standard says) calling front() on an empty std::vector causes an undefined behaviour. One must check that the container contains something using empty() before calling front() ---- - core/foundation/src/TClassEdit.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/foundation/src/TClassEdit.cxx b/core/foundation/src/TClassEdit.cxx -index 38c8b1a5a2..954e40fcc5 100644 ---- a/core/foundation/src/TClassEdit.cxx -+++ b/core/foundation/src/TClassEdit.cxx -@@ -1900,7 +1900,7 @@ public: - auto argsEnd = v.end(); - auto argsBeginPlusOne = ++v.begin(); - auto argPos = std::find_if(argsBeginPlusOne, argsEnd, -- [](std::string& arg){return arg.front() == ':';}); -+ [](std::string& arg){return (!arg.empty() && arg.front() == ':');}); - if (argPos != argsEnd) { - const int lenght = clName.size(); - int wedgeBalance = 0; --- -2.14.3 - diff --git a/root-dont-link-jvm.patch b/root-dont-link-jvm.patch deleted file mode 100644 index fdc0091..0000000 --- a/root-dont-link-jvm.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -ur root-6.06.02.orig/cmake/modules/RootConfiguration.cmake root-6.06.02/cmake/modules/RootConfiguration.cmake ---- root-6.06.02.orig/cmake/modules/RootConfiguration.cmake 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/cmake/modules/RootConfiguration.cmake 2016-03-20 15:54:25.926191321 +0100 -@@ -263,10 +263,6 @@ - set(hdfslib ${HDFS_LIBRARY}) - set(hdfsincdir ${HDFS_INCLUDE_DIR}) - --set(jniincdir ${Java_INCLUDE_DIRS}) --set(jvmlib ${Java_LIBRARIES}) --set(jvmlibdir ${Java_LIBRARY_DIR}) -- - set(buildalien ${value${alien}}) - set(alienlibdir ${ALIEN_LIBRARY_DIR}) - set(alienlib ${ALIEN_LIBRARY}) -diff -ur root-6.06.02.orig/config/Makefile.in root-6.06.02/config/Makefile.in ---- root-6.06.02.orig/config/Makefile.in 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/config/Makefile.in 2016-03-20 15:54:25.999192031 +0100 -@@ -251,9 +251,6 @@ - HDFSLIBDIR := @hdfslibdir@ - HDFSCLILIB := @hdfslib@ - HDFSINCDIR := $(filter-out /usr/include, @hdfsincdir@) --JNIINCDIR := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux) --JVMCLILIB := @jvmlib@ --JVMLIBDIR := @jvmlibdir@ - - BUILDALIEN := @buildalien@ - ALIENLIBDIR := @alienlibdir@ -diff -ur root-6.06.02.orig/configure root-6.06.02/configure ---- root-6.06.02.orig/configure 2016-03-20 14:37:23.733597759 +0100 -+++ root-6.06.02/configure 2016-03-20 15:54:26.038192410 +0100 -@@ -1822,8 +1822,6 @@ - hdfs-incdir HDFS support, location of hdfs.h - hdfs-libdir HDFS support, location of libhdfs - iosvers iOS SDK version (6.1, 7.0), default will be latest SDK -- jni-incdir HDFS support, location of JNI headers -- jvm-libdir HDFS support, location of JVM library - krb5 Kerberos5 support, location of Kerberos distribution - krb5-incdir Kerberos5 support, location of krb5.h - krb5-libdir Kerberos5 support, location of libkrb5 -@@ -2214,8 +2212,6 @@ - --with-hdfs-incdir=*) hdfsincdir=$optarg ; enable_hdfs="yes" ;; - --with-hdfs-libdir=*) hdfslibdir=$optarg ; enable_hdfs="yes" ;; - --with-iosvers=*) iosvers=$optarg ;; -- --with-jni-incdir=*) jniincdir=$optarg ;; -- --with-jvm-libdir=*) jvmlibdir=$optarg ;; - --with-krb5=*) krb5dir=$optarg ; enable_krb5="yes" ;; - --with-krb5-incdir=*) krb5incdir=$optarg ; enable_krb5="yes" ;; - --with-krb5-libdir=*) krb5libdir=$optarg ; enable_krb5="yes" ;; -@@ -4535,17 +4531,6 @@ - hdfsinc=$found_hdr - hdfsincdir=$found_dir - -- if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then -- JAVA_HOME=`/usr/libexec/java_home` -- fi -- -- keepincdir=$jniincdir -- check_header "jni.h" "$jniincdir" \ -- ${JAVA_HOME:+$JAVA_HOME/include} \ -- /usr/java/default/include /usr/include /usr/local/include -- jniinc=$found_hdr -- jniincdir=$found_dir -- - check_library "libhdfs" "$enable_shared" "$hdfslibdir" \ - $HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \ - $HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \ -@@ -4553,26 +4538,12 @@ - hdfslib=$found_lib - hdfslibdir=$found_dir - -- check_library "libjvm" "$enable_shared" "$jvmlibdir" \ -- ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \ -- ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \ -- ${JAVA_HOME:+$JAVA_HOME/../Libraries} \ -- /usr/java/default/jre/lib/amd64/server \ -- /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib -- jvmlib=$found_lib -- jvmlibdir=$found_dir -- -- if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then -+ if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then - enable_hdfs="no" - else - case $platform in - linux) -- check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect -- if test $link_result -eq 0 ; then -- enable_hdfs="no" -- fi -- -- check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM -+ check_link "$hdfslib" "$hdfslibdir" hdfsConnect - if test $link_result -eq 0 ; then - enable_hdfs="no" - fi -@@ -7641,9 +7612,6 @@ - -e "s|@iosvers@|$iosvers|" \ - -e "s|@iconpath@|$iconpath|" \ - -e "s|@incdir@|$incdir|" \ -- -e "s|@jniincdir@|$jniincdir|g" \ -- -e "s|@jvmlibdir@|$jvmlibdir|g" \ -- -e "s|@jvmlib@|$jvmlib|g" \ - -e "s|@krb5incdir@|$krb5incdir|" \ - -e "s|@krb5lib@|$krb5lib|" \ - -e "s|@krb5libdir@|$krb5libdir|" \ -diff -ur root-6.06.02.orig/io/hdfs/Module.mk root-6.06.02/io/hdfs/Module.mk ---- root-6.06.02.orig/io/hdfs/Module.mk 2016-03-03 10:36:03.000000000 +0100 -+++ root-6.06.02/io/hdfs/Module.mk 2016-03-20 15:54:26.038192410 +0100 -@@ -44,7 +44,7 @@ - $(HDFSLIB): $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \ -- "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)" -+ "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)" - - $(call pcmrule,HDFS) - $(noop) -@@ -72,4 +72,4 @@ - distclean:: distclean-$(MODNAME) - - ##### extra rules ###### --$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%) -+$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) diff --git a/root-doxygen-makefile.patch b/root-doxygen-makefile.patch deleted file mode 100644 index 1468981..0000000 --- a/root-doxygen-makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile -index 4e6b47728d..a886c1b729 100644 ---- a/documentation/doxygen/Makefile -+++ b/documentation/doxygen/Makefile -@@ -8,7 +8,6 @@ export DOXYGEN_ROOT_VERSION := $(shell root -l -b -q -e 'printf("%s\n", gROOT->G - export DOXYGEN_EXAMPLE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/macros - export DOXYGEN_IMAGE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/html - export DOXYGEN_NOTEBOOK_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/notebooks --export DOXYGEN_NOTEBOOK_PATH_PARALLEL := $(DOXYGEN_NOTEBOOK_PATH)/parallel - export DOXYGEN_STRIP_PATH := $(shell cd $(PWD)/../..; pwd) - export DOXYGEN_INCLUDE_PATH := $(shell find $(DOXYGEN_STRIP_PATH) -type d -name dictpch -prune -o -type d -name inc) - -@@ -33,14 +32,11 @@ doxygen: filter - $(call MkDir,$(DOXYGEN_OUTPUT_DIRECTORY)) - $(call MkDir,$(DOXYGEN_EXAMPLE_PATH)) - $(call MkDir,$(DOXYGEN_NOTEBOOK_PATH)) -- $(call MkDir,$(DOXYGEN_NOTEBOOK_PATH_PARALLEL)) -- time python ./parallelNotebooks.py - ./makehtmlfooter.sh > htmlfooter.html - doxygen - ./listlibs.sh - rm -rf files c1* *.ps *.png *.svg *.pdf *.root *.xpm *.out *.dat *.dtd *.dot *.txt listofclass.sh -- rm $(DOXYGEN_NOTEBOOK_PATH)/*.root -- rm $(DOXYGEN_NOTEBOOK_PATH_PARALLEL)/*.root -+ rm -f $(DOXYGEN_NOTEBOOK_PATH)/*.root - - clean: - rm -r $(DOXYGEN_OUTPUT_DIRECTORY) filter htmlfooter.html dataset* diff --git a/root-doxygen-tilde.patch b/root-doxygen-tilde.patch deleted file mode 100644 index bbae6d8..0000000 --- a/root-doxygen-tilde.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 533f64b053c9fa72b456a7e351e17e354b94dcdc Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Thu, 15 Feb 2018 18:30:44 +0100 -Subject: [PATCH] Fix doxygen ~ alignment - ---- - core/meta/src/TStatusBitsChecker.cxx | 2 +- - tree/treeplayer/src/TTreeReader.cxx | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/meta/src/TStatusBitsChecker.cxx b/core/meta/src/TStatusBitsChecker.cxx -index 360d85d0c74..1661bd3646b 100644 ---- a/core/meta/src/TStatusBitsChecker.cxx -+++ b/core/meta/src/TStatusBitsChecker.cxx -@@ -42,7 +42,7 @@ - // used in TStreamerElement - kHasRange = TStreamerElement::kHasRange - }; -- ~~~ {.cpp} -+ ~~~ {.cpp} - - Without the EStatusBitsDupExceptions enum you would see - -diff --git a/tree/treeplayer/src/TTreeReader.cxx b/tree/treeplayer/src/TTreeReader.cxx -index d411fbdd967..e823797e523 100644 ---- a/tree/treeplayer/src/TTreeReader.cxx -+++ b/tree/treeplayer/src/TTreeReader.cxx -@@ -235,7 +235,7 @@ void TTreeReader::Initialize() - /// If end <= begin, `end` is ignored (set to `-1`) and only `begin` is used. - /// Example: - /// --/// ~~~ {.cpp} -+/// ~~~ {.cpp} - /// reader.SetEntriesRange(3, 5); - /// while (reader.Next()) { - /// // Will load entries 3 and 4. diff --git a/root-fontconfig.patch b/root-fontconfig.patch index 22284c2..4016fbc 100644 --- a/root-fontconfig.patch +++ b/root-fontconfig.patch @@ -1,7 +1,7 @@ -diff -ur root-6.12.04.orig/core/base/src/TApplication.cxx root-6.12.04/core/base/src/TApplication.cxx ---- root-6.12.04.orig/core/base/src/TApplication.cxx 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/core/base/src/TApplication.cxx 2018-01-07 22:17:25.173658049 +0100 -@@ -275,18 +275,11 @@ +diff -ur root-6.14.00.orig/core/base/src/TApplication.cxx root-6.14.00/core/base/src/TApplication.cxx +--- root-6.14.00.orig/core/base/src/TApplication.cxx 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/core/base/src/TApplication.cxx 2018-06-14 10:28:26.052618314 +0200 +@@ -277,18 +277,11 @@ LoadGraphicsLibs(); // Try to load TrueType font renderer. Only try to load if not in batch @@ -22,7 +22,7 @@ diff -ur root-6.12.04.orig/core/base/src/TApplication.cxx root-6.12.04/core/base if (gClassTable->GetDict("TGX11TTF")) { // in principle we should not have linked anything against libGX11TTF // but with ACLiC this can happen, initialize TGX11TTF by hand -@@ -300,7 +293,6 @@ +@@ -302,7 +295,6 @@ } } #endif @@ -30,33 +30,21 @@ diff -ur root-6.12.04.orig/core/base/src/TApplication.cxx root-6.12.04/core/base // Create WM dependent application environment if (fAppImp) -diff -ur root-6.12.04.orig/graf2d/asimage/CMakeLists.txt root-6.12.04/graf2d/asimage/CMakeLists.txt ---- root-6.12.04.orig/graf2d/asimage/CMakeLists.txt 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/asimage/CMakeLists.txt 2018-01-07 22:20:58.769272293 +0100 +diff -ur root-6.14.00.orig/graf2d/asimage/CMakeLists.txt root-6.14.00/graf2d/asimage/CMakeLists.txt +--- root-6.14.00.orig/graf2d/asimage/CMakeLists.txt 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf2d/asimage/CMakeLists.txt 2018-06-14 10:32:01.365570910 +0200 @@ -15,7 +15,7 @@ HEADERS TASImage.h TASImagePlugin.h TASPluginGS.h SOURCES TASImage.cxx TASPluginGS.cxx DICTIONARY_OPTIONS "-writeEmptyRootPCM" -- LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ${ZLIB_LIBRARIES} -+ LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ${ZLIB_LIBRARIES} +- LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ZLIB::ZLIB ++ LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} fontconfig ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES} ZLIB::ZLIB DEPENDENCIES Graf BUILTINS AFTERIMAGE) -diff -ur root-6.12.04.orig/graf2d/asimage/Module.mk root-6.12.04/graf2d/asimage/Module.mk ---- root-6.12.04.orig/graf2d/asimage/Module.mk 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/asimage/Module.mk 2018-01-07 22:17:25.174658038 +0100 -@@ -236,7 +236,7 @@ - "$(SOFLAGS)" libASImage.$(SOEXT) $@ \ - "$(ASIMAGEO) $(ASIMAGEDO)" \ - "$(ASIMAGELIBEXTRA) $(ASTEPLIB) \ -- $(FREETYPELDFLAGS) $(FREETYPELIB) \ -+ $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig \ - $(ASEXTRALIBDIR) $(ASEXTRALIB) $(ASNEEDX11LIBS)" - - $(call pcmrule,ASIMAGE) -diff -ur root-6.12.04.orig/graf2d/asimage/src/TASImage.cxx root-6.12.04/graf2d/asimage/src/TASImage.cxx ---- root-6.12.04.orig/graf2d/asimage/src/TASImage.cxx 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/asimage/src/TASImage.cxx 2018-01-07 22:17:25.176658016 +0100 +diff -ur root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx root-6.14.00/graf2d/asimage/src/TASImage.cxx +--- root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf2d/asimage/src/TASImage.cxx 2018-06-14 10:28:26.054618292 +0200 @@ -110,6 +110,8 @@ # include } @@ -212,20 +200,20 @@ diff -ur root-6.12.04.orig/graf2d/asimage/src/TASImage.cxx root-6.12.04/graf2d/a } get_text_size(text, font, (ASText3DType)type, &width, &height); -diff -ur root-6.12.04.orig/graf2d/graf/CMakeLists.txt root-6.12.04/graf2d/graf/CMakeLists.txt ---- root-6.12.04.orig/graf2d/graf/CMakeLists.txt 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/graf/CMakeLists.txt 2018-01-07 22:23:16.766731136 +0100 +diff -ur root-6.14.00.orig/graf2d/graf/CMakeLists.txt root-6.14.00/graf2d/graf/CMakeLists.txt +--- root-6.14.00.orig/graf2d/graf/CMakeLists.txt 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf2d/graf/CMakeLists.txt 2018-06-14 10:36:18.869871880 +0200 @@ -7,6 +7,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf DICTIONARY_OPTIONS "-writeEmptyRootPCM" -- LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext -+ LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES} mathtext fontconfig +- LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext ++ LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext fontconfig DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE) -diff -ur root-6.12.04.orig/graf2d/graf/inc/TTF.h root-6.12.04/graf2d/graf/inc/TTF.h ---- root-6.12.04.orig/graf2d/graf/inc/TTF.h 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/graf/inc/TTF.h 2018-01-07 22:17:25.177658004 +0100 +diff -ur root-6.14.00.orig/graf2d/graf/inc/TTF.h root-6.14.00/graf2d/graf/inc/TTF.h +--- root-6.14.00.orig/graf2d/graf/inc/TTF.h 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf2d/graf/inc/TTF.h 2018-06-14 10:28:26.055618281 +0200 @@ -76,9 +76,8 @@ static FT_BBox fgCBox; ///< string control box static FT_CharMap fgCharMap[kTTMaxFonts]; ///< font character map @@ -237,21 +225,9 @@ diff -ur root-6.12.04.orig/graf2d/graf/inc/TTF.h root-6.12.04/graf2d/graf/inc/TT static FT_Face fgFace[kTTMaxFonts]; ///< font face static TTF::TTGlyph fgGlyphs[kMaxGlyphs]; ///< glyphs static Bool_t fgHinting; ///< use hinting (true by default) -diff -ur root-6.12.04.orig/graf2d/graf/Module.mk root-6.12.04/graf2d/graf/Module.mk ---- root-6.12.04.orig/graf2d/graf/Module.mk 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/graf/Module.mk 2018-01-07 22:17:25.177658004 +0100 -@@ -58,7 +58,7 @@ - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libGraf.$(SOEXT) $@ \ - "$(GRAFO) $(GRAFDO)" \ -- "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)" -+ "$(GRAFLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig" - - $(call pcmrule,GRAF) - $(noop) -diff -ur root-6.12.04.orig/graf2d/graf/src/TTF.cxx root-6.12.04/graf2d/graf/src/TTF.cxx ---- root-6.12.04.orig/graf2d/graf/src/TTF.cxx 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/graf/src/TTF.cxx 2018-01-07 22:17:25.177658004 +0100 +diff -ur root-6.14.00.orig/graf2d/graf/src/TTF.cxx root-6.14.00/graf2d/graf/src/TTF.cxx +--- root-6.14.00.orig/graf2d/graf/src/TTF.cxx 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf2d/graf/src/TTF.cxx 2018-06-14 10:28:26.055618281 +0200 @@ -25,6 +25,8 @@ #include "TMath.h" #include "TError.h" @@ -812,31 +788,19 @@ diff -ur root-6.12.04.orig/graf2d/graf/src/TTF.cxx root-6.12.04/graf2d/graf/src/ } //////////////////////////////////////////////////////////////////////////////// -diff -ur root-6.12.04.orig/graf2d/postscript/CMakeLists.txt root-6.12.04/graf2d/postscript/CMakeLists.txt ---- root-6.12.04.orig/graf2d/postscript/CMakeLists.txt 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/postscript/CMakeLists.txt 2018-01-07 22:22:12.902444262 +0100 +diff -ur root-6.14.00.orig/graf2d/postscript/CMakeLists.txt root-6.14.00/graf2d/postscript/CMakeLists.txt +--- root-6.14.00.orig/graf2d/postscript/CMakeLists.txt 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf2d/postscript/CMakeLists.txt 2018-06-14 10:35:47.829194226 +0200 @@ -5,5 +5,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Postscript DICTIONARY_OPTIONS "-writeEmptyRootPCM" -- LIBRARIES ${ZLIB_LIBRARIES} mathtext -+ LIBRARIES ${ZLIB_LIBRARIES} mathtext fontconfig +- LIBRARIES ZLIB::ZLIB mathtext ++ LIBRARIES ZLIB::ZLIB mathtext fontconfig DEPENDENCIES Graf) -diff -ur root-6.12.04.orig/graf2d/postscript/Module.mk root-6.12.04/graf2d/postscript/Module.mk ---- root-6.12.04.orig/graf2d/postscript/Module.mk 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/postscript/Module.mk 2018-01-07 22:17:25.178657993 +0100 -@@ -59,7 +59,7 @@ - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \ - "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \ -- "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB)" -+ "$(POSTSCRIPTLIBEXTRA) $(MATHTEXTLIB) $(FREETYPELDFLAGS) $(FREETYPELIB) -lfontconfig" - - $(call pcmrule,POSTSCRIPT) - $(noop) -diff -ur root-6.12.04.orig/graf2d/postscript/src/TPostScript.cxx root-6.12.04/graf2d/postscript/src/TPostScript.cxx ---- root-6.12.04.orig/graf2d/postscript/src/TPostScript.cxx 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf2d/postscript/src/TPostScript.cxx 2018-01-07 22:17:25.179657982 +0100 +diff -ur root-6.14.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.14.00/graf2d/postscript/src/TPostScript.cxx +--- root-6.14.00.orig/graf2d/postscript/src/TPostScript.cxx 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf2d/postscript/src/TPostScript.cxx 2018-06-14 10:28:26.057618259 +0200 @@ -229,6 +229,7 @@ #include #include @@ -1096,9 +1060,9 @@ diff -ur root-6.12.04.orig/graf2d/postscript/src/TPostScript.cxx root-6.12.04/gr { "Root.PSFont.STIXGen", "/STIXGeneral" }, { "Root.PSFont.STIXGenIt", "/STIXGeneral-Italic" }, { "Root.PSFont.STIXGenBd", "/STIXGeneral-Bold" }, -diff -ur root-6.12.04.orig/graf3d/gl/CMakeLists.txt root-6.12.04/graf3d/gl/CMakeLists.txt ---- root-6.12.04.orig/graf3d/gl/CMakeLists.txt 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf3d/gl/CMakeLists.txt 2018-01-07 22:19:37.820176454 +0100 +diff -ur root-6.14.00.orig/graf3d/gl/CMakeLists.txt root-6.14.00/graf3d/gl/CMakeLists.txt +--- root-6.14.00.orig/graf3d/gl/CMakeLists.txt 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf3d/gl/CMakeLists.txt 2018-06-14 10:28:26.057618259 +0200 @@ -41,6 +41,6 @@ HEADERS ${headers} SOURCES ${sources} @@ -1107,21 +1071,9 @@ diff -ur root-6.12.04.orig/graf3d/gl/CMakeLists.txt root-6.12.04/graf3d/gl/CMake + LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged INSTALL_OPTIONS ${installoptions}) -diff -ur root-6.12.04.orig/graf3d/gl/Module.mk root-6.12.04/graf3d/gl/Module.mk ---- root-6.12.04.orig/graf3d/gl/Module.mk 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf3d/gl/Module.mk 2018-01-07 22:17:25.180657971 +0100 -@@ -95,7 +95,7 @@ - "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \ - "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \ - $(GL2PSLIBDIR) $(GL2PSLIB) \ -- $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)" -+ $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig" - - $(call pcmrule,GL) - $(noop) -diff -ur root-6.12.04.orig/graf3d/gl/src/TGLFontManager.cxx root-6.12.04/graf3d/gl/src/TGLFontManager.cxx ---- root-6.12.04.orig/graf3d/gl/src/TGLFontManager.cxx 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf3d/gl/src/TGLFontManager.cxx 2018-01-07 22:17:25.180657971 +0100 +diff -ur root-6.14.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.14.00/graf3d/gl/src/TGLFontManager.cxx +--- root-6.14.00.orig/graf3d/gl/src/TGLFontManager.cxx 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf3d/gl/src/TGLFontManager.cxx 2018-06-14 10:28:26.058618248 +0200 @@ -37,6 +37,7 @@ # include "FTGLBitmapFont.h" #endif @@ -1377,9 +1329,9 @@ diff -ur root-6.12.04.orig/graf3d/gl/src/TGLFontManager.cxx root-6.12.04/graf3d/ fgFontFileArray.Add(new TObjString("STIXGeneral.otf")); // 200 fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf")); // 210 fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf")); // 220 -diff -ur root-6.12.04.orig/graf3d/gl/src/TGLText.cxx root-6.12.04/graf3d/gl/src/TGLText.cxx ---- root-6.12.04.orig/graf3d/gl/src/TGLText.cxx 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/graf3d/gl/src/TGLText.cxx 2018-01-07 22:17:25.181657960 +0100 +diff -ur root-6.14.00.orig/graf3d/gl/src/TGLText.cxx root-6.14.00/graf3d/gl/src/TGLText.cxx +--- root-6.14.00.orig/graf3d/gl/src/TGLText.cxx 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/graf3d/gl/src/TGLText.cxx 2018-06-14 10:28:26.058618248 +0200 @@ -34,6 +34,8 @@ # include "FTGLBitmapFont.h" #endif @@ -1514,9 +1466,9 @@ diff -ur root-6.12.04.orig/graf3d/gl/src/TGLText.cxx root-6.12.04/graf3d/gl/src/ Error("SetGLTextFont","Cannot set FTGL::FaceSize"); - delete [] ttfont; } -diff -ur root-6.12.04.orig/gui/gui/src/TGApplication.cxx root-6.12.04/gui/gui/src/TGApplication.cxx ---- root-6.12.04.orig/gui/gui/src/TGApplication.cxx 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/gui/gui/src/TGApplication.cxx 2018-01-07 22:17:25.181657960 +0100 +diff -ur root-6.14.00.orig/gui/gui/src/TGApplication.cxx root-6.14.00/gui/gui/src/TGApplication.cxx +--- root-6.14.00.orig/gui/gui/src/TGApplication.cxx 2018-06-13 12:10:40.000000000 +0200 ++++ root-6.14.00/gui/gui/src/TGApplication.cxx 2018-06-14 10:28:26.058618248 +0200 @@ -83,20 +83,12 @@ gROOT->SetBatch(kFALSE); diff --git a/root-ix32-geom-opt.patch b/root-ix32-geom-opt.patch new file mode 100644 index 0000000..153629b --- /dev/null +++ b/root-ix32-geom-opt.patch @@ -0,0 +1,14 @@ +diff --git a/geom/geom/CMakeLists.txt b/geom/geom/CMakeLists.txt +index 520be8b5d5..d197cc3db3 100644 +--- a/geom/geom/CMakeLists.txt ++++ b/geom/geom/CMakeLists.txt +@@ -24,7 +24,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Geom + HEADERS ${headers1} ${headers2} + DEPENDENCIES Thread RIO MathCore) + +-# GCC 4.x has bugs with -O3 or -Ofast that break Geom +-if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5) ++# 32 bit ix86 has bugs with -O3 or -Ofast that break Geom ++if(CMAKE_COMPILER_IS_GNUCXX AND ROOT_ARCHITECTURE STREQUAL "linux") + target_compile_options(Geom PRIVATE -O2) + endif() diff --git a/root-memory-usage.patch b/root-memory-usage.patch index 777603c..193a9bf 100644 --- a/root-memory-usage.patch +++ b/root-memory-usage.patch @@ -22,23 +22,6 @@ rootcling and libCling. core/metacling/src/CMakeLists.txt | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) -diff --git a/core/metacling/Module.mk b/core/metacling/Module.mk -index 4788eca393..7f520e41b6 100644 ---- a/core/metacling/Module.mk -+++ b/core/metacling/Module.mk -@@ -46,7 +46,11 @@ endif - CLINGLIB := $(LPATH)/libCling.$(SOEXT) - CLINGMAP := $(CLINGLIB:.$(SOEXT)=.rootmap) - --$(CLINGLIB): $(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) -+# The dependency on $(ROOTCLING1EXE) was added to prevent $(CLINGLIB) and -+# $(ROOTCLING1EXE) from being linked in parallel. -+# This avoids doing two memory consuming operations in parallel. -+$(CLINGLIB): $(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) \ -+ $(ROOTCLING1EXE) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS) $(LIBCLINGLDFLAGS)" \ - "$(SOFLAGS)" libCling.$(SOEXT) $@ \ - "$(CLINGUTILSO) $(DICTGENO) $(METACLINGO) $(CLINGO) \ diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt index e820d144eb..3a1f1ca446 100644 --- a/core/metacling/src/CMakeLists.txt @@ -46,7 +29,7 @@ index e820d144eb..3a1f1ca446 100644 @@ -37,6 +37,10 @@ ROOT_LINKER_LIBRARY(Cling $ $ - LIBRARIES ${CLING_LIBRARIES}) + LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS}) +# The dependency on rootcling_stage1 was added to prevent Cling (libCling) and +# rootcling_stage1 from being linked in parallel. +# This avoids doing two memory consuming operations in parallel. diff --git a/root-missing-header.patch b/root-missing-header.patch new file mode 100644 index 0000000..c98116d --- /dev/null +++ b/root-missing-header.patch @@ -0,0 +1,21 @@ +From f33ac48317fc1a144d6a7f0a7028e898b664e3a2 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Thu, 28 Jun 2018 23:02:46 +0200 +Subject: [PATCH] Add missing include for std::shuffle + +--- + tmva/tmva/test/TestRandomGenerator.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tmva/tmva/test/TestRandomGenerator.cxx b/tmva/tmva/test/TestRandomGenerator.cxx +index c8f0f50ee5f..02f941d7f26 100644 +--- a/tmva/tmva/test/TestRandomGenerator.cxx ++++ b/tmva/tmva/test/TestRandomGenerator.cxx +@@ -10,6 +10,7 @@ + #include "TMVA/Tools.h" + + // Stdlib ++#include + #include + + // External diff --git a/root-noinst.patch b/root-noinst.patch deleted file mode 100644 index 88bdb67..0000000 --- a/root-noinst.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 778e01575f6b75bed9843023baeb50b23aea5355 Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Fri, 16 Feb 2018 19:06:14 +0100 -Subject: [PATCH 1/2] Don't install intermediate static libs (mathtext and - minicern) - ---- - graf2d/mathtext/CMakeLists.txt | 2 +- - misc/minicern/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/graf2d/mathtext/CMakeLists.txt b/graf2d/mathtext/CMakeLists.txt -index 5af6a282a34..e6cba7bcd35 100644 ---- a/graf2d/mathtext/CMakeLists.txt -+++ b/graf2d/mathtext/CMakeLists.txt -@@ -1,2 +1,2 @@ --ROOT_LINKER_LIBRARY(mathtext *.cxx TYPE STATIC) -+ROOT_LINKER_LIBRARY(mathtext *.cxx TYPE STATIC NOINSTALL) - -diff --git a/misc/minicern/CMakeLists.txt b/misc/minicern/CMakeLists.txt -index 2758edb08e1..d98ac3b6331 100644 ---- a/misc/minicern/CMakeLists.txt -+++ b/misc/minicern/CMakeLists.txt -@@ -3,7 +3,7 @@ - ############################################################################ - - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC") --ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC) -+ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC NOINSTALL) - target_link_libraries(minicern ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}) - - # Disable optimization since it some cases was causing crashes. - -From 9bd8d4e52fae5467867cbcf1810bc58a63b55a62 Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Fri, 16 Feb 2018 19:07:04 +0100 -Subject: [PATCH 2/2] Don't add JupyROOT python extension to cmake exports - ---- - bindings/pyroot/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bindings/pyroot/CMakeLists.txt b/bindings/pyroot/CMakeLists.txt -index 4dab1dfd2ab..5f621af9a2d 100644 ---- a/bindings/pyroot/CMakeLists.txt -+++ b/bindings/pyroot/CMakeLists.txt -@@ -18,7 +18,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(PyROOT - DICTIONARY_OPTIONS "-writeEmptyRootPCM" - LIBRARIES Core Net Tree MathCore Rint ${PYTHON_LIBRARIES} - DEPENDENCIES Core MathCore Net Tree Rint) --ROOT_LINKER_LIBRARY(JupyROOT ../JupyROOT/src/*.cxx DEPENDENCIES Core) -+ROOT_LINKER_LIBRARY(JupyROOT ../JupyROOT/src/*.cxx DEPENDENCIES Core CMAKENOEXPORT) - - if(MSVC) - add_custom_command(TARGET PyROOT POST_BUILD diff --git a/root-out-of-bounds.patch b/root-out-of-bounds.patch deleted file mode 100644 index 094139f..0000000 --- a/root-out-of-bounds.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a770f03056e374fa7c1dbdc06aaff22107fc27a0 Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Thu, 15 Feb 2018 18:29:00 +0100 -Subject: [PATCH] Protect against out-of-bounds access - ---- - graf2d/gpad/src/TRatioPlot.cxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/graf2d/gpad/src/TRatioPlot.cxx b/graf2d/gpad/src/TRatioPlot.cxx -index 107c0c90806..bf3415d7927 100644 ---- a/graf2d/gpad/src/TRatioPlot.cxx -+++ b/graf2d/gpad/src/TRatioPlot.cxx -@@ -1074,9 +1074,9 @@ Int_t TRatioPlot::BuildLowerPlot() - ((TGraphAsymmErrors*)fRatioGraph)->SetPointError(ipoint, fH1->GetBinWidth(i)/2., fH1->GetBinWidth(i)/2., 0.5, 0.5); - - fConfidenceInterval1->SetPoint(ipoint, x, 0); -- fConfidenceInterval1->SetPointError(ipoint, x, ci1[i] / error); -+ fConfidenceInterval1->SetPointError(ipoint, x, i < ci1.size() ? ci1[i] / error : 0); - fConfidenceInterval2->SetPoint(ipoint, x, 0); -- fConfidenceInterval2->SetPointError(ipoint, x, ci2[i] / error); -+ fConfidenceInterval2->SetPointError(ipoint, x, i < ci2.size() ? ci2[i] / error : 0); - - ++ipoint; - diff --git a/root-set-cache-file-dir.patch b/root-set-cache-file-dir.patch new file mode 100644 index 0000000..5ea37d7 --- /dev/null +++ b/root-set-cache-file-dir.patch @@ -0,0 +1,38 @@ +From e8778178329efc8e04ea35643259cfc6ec2f9b51 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Tue, 26 Jun 2018 11:11:48 +0200 +Subject: [PATCH] Set cache file dir when using CACHEREAD option Remove + unnecessary CACHEREAD for local file + +--- + tmva/tmva/test/DNN/CNN/TestMethodDL.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/tmva/tmva/test/DNN/CNN/TestMethodDL.h b/tmva/tmva/test/DNN/CNN/TestMethodDL.h +index 1cac008458e..904fb54cd97 100644 +--- a/tmva/tmva/test/DNN/CNN/TestMethodDL.h ++++ b/tmva/tmva/test/DNN/CNN/TestMethodDL.h +@@ -49,14 +49,12 @@ void testMethodDL_CNN(TString architectureStr) + // Load the input data + + TString fname = "imagesData.root"; +- TString fopt = "CACHEREAD"; +- //auto input = TFile::Open(fname,fopt); + + // generate the files + // 1000 for testing 1000 for training + makeImages(2000); + +- auto input = TFile::Open(fname,fopt); ++ auto input = TFile::Open(fname); + + R__ASSERT(input); + +@@ -174,6 +172,7 @@ void testMethodDL_DNN(TString architectureStr) + // TString fname = "/Users/vladimirilievski/Desktop/Vladimir/GSoC/ROOT-CI/common-version/root/tmva/tmva/test/DNN/CNN/" + // "dataset/tmva_class_example.root"; + TString fname = "http://root.cern.ch/files/tmva_class_example.root"; ++ TFile::SetCacheFileDir("."); + TString fopt = "CACHEREAD"; + input = TFile::Open(fname,fopt); + diff --git a/root-stressgraphics-ref.patch b/root-stressgraphics-ref.patch index ad91815..4ba858c 100644 --- a/root-stressgraphics-ref.patch +++ b/root-stressgraphics-ref.patch @@ -1,15 +1,22 @@ +From 034dd2ec5ab656551b84bcec7cc1e7f7e23b663c Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Thu, 31 May 2018 10:18:58 +0200 +Subject: [PATCH] Adjust reference for Aarch64 + +--- + test/stressGraphics.ref | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref -index 4341c21c79..0089951936 100644 +index 00e034737b8..00899519366 100644 --- a/test/stressGraphics.ref +++ b/test/stressGraphics.ref -@@ -29,16 +29,16 @@ Test# PS1Ref# PS1Err# PDFRef# PDFErr# GIFRef# GIFErr# JPGRef# JP - 28 9110 500 16737 200 9738 4200 21346 21600 10645 7000 8869 500 +@@ -30,15 +30,15 @@ Test# PS1Ref# PS1Err# PDFRef# PDFErr# GIFRef# GIFErr# JPGRef# JP 29 7419 500 15112 200 8113 4200 18872 21600 7928 7000 7296 500 30 17016 5500 18198 100 13764 3400 32434 17400 22157 5000 20823 5500 -- 31 30615 8200 27494 100 29010 5900 50520 18200 35724 5400 36690 8200 + 31 30615 8200 27494 150 29010 5900 50520 18200 35724 5400 36690 8200 - 32 3304592 100 712308 100 155478 32000 62688 19000 123056 7000 0 0 - 33 321963 5500 434394 1000 34942 8300 65532 27800 37314 12000 331505 5500 -+ 31 30615 8200 27494 150 29010 5900 50520 18200 35724 5400 36690 8200 + 32 3304592 100 712308 500 155478 32000 62688 19000 123056 7000 0 0 + 33 321963 5500 434394 1100 34942 8300 65532 27800 37314 12000 331505 5500 34 36514 300 16815 200 25333 2200 47408 12700 33739 3700 36399 300 diff --git a/root-system-pythia.patch b/root-system-pythia.patch deleted file mode 100644 index 60e1382..0000000 --- a/root-system-pythia.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur root-6.12.04.orig/tutorials/pythia/pythia8.C root-6.12.04/tutorials/pythia/pythia8.C ---- root-6.12.04.orig/tutorials/pythia/pythia8.C 2017-12-13 08:27:42.000000000 +0100 -+++ root-6.12.04/tutorials/pythia/pythia8.C 2018-01-10 07:01:23.215029332 +0100 -@@ -8,11 +8,6 @@ - /// root > .x pythia8.C - /// ~~~ - /// --/// Note that before executing this script, --/// --/// - the env variable PYTHIA8 must point to the pythia8100 (or newer) directory --/// - the env variable PYTHIA8DATA must be defined and it must point to $PYTHIA8/xmldoc --/// - /// \macro_code - /// - /// \author Andreas Morsch -@@ -27,26 +22,6 @@ - - void pythia8(Int_t nev = 100, Int_t ndeb = 1) - { -- const char *p8dataenv = gSystem->Getenv("PYTHIA8DATA"); -- if (!p8dataenv) { -- const char *p8env = gSystem->Getenv("PYTHIA8"); -- if (!p8env) { -- Error("pythia8.C", -- "Environment variable PYTHIA8 must contain path to pythia directory!"); -- return; -- } -- TString p8d = p8env; -- p8d += "/xmldoc"; -- gSystem->Setenv("PYTHIA8DATA", p8d); -- } -- -- const char* path = gSystem->ExpandPathName("$PYTHIA8DATA"); -- if (gSystem->AccessPathName(path)) { -- Error("pythia8.C", -- "Environment variable PYTHIA8DATA must contain path to $PYTHIA8/xmldoc directory !"); -- return; -- } -- - // Load libraries - gSystem->Load("libEG"); - gSystem->Load("libEGPythia8"); diff --git a/root-test-compilatiom-epel7.patch b/root-test-compilatiom-epel7.patch new file mode 100644 index 0000000..97e31ff --- /dev/null +++ b/root-test-compilatiom-epel7.patch @@ -0,0 +1,27 @@ +From cefdf878609deb650b1e548d84efab2ab5c775ce Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Thu, 28 Jun 2018 07:38:07 +0200 +Subject: [PATCH] Fix test compilation on RHEL 7 + +--- + tree/dataframe/test/dataframe_resptr.cxx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tree/dataframe/test/dataframe_resptr.cxx b/tree/dataframe/test/dataframe_resptr.cxx +index 9fef6e54fcf..7c45f016d0c 100644 +--- a/tree/dataframe/test/dataframe_resptr.cxx ++++ b/tree/dataframe/test/dataframe_resptr.cxx +@@ -45,11 +45,11 @@ TEST(RResultPtr, ImplConv) + return (int)1; + }).Histo1D("i"); + +- EXPECT_TRUE(m); ++ EXPECT_TRUE(m != nullptr); + EXPECT_FALSE(hasRun); + + *m; + +- EXPECT_TRUE(m); ++ EXPECT_TRUE(m != nullptr); + EXPECT_TRUE(hasRun); + } diff --git a/root-test-fixes.patch b/root-test-fixes.patch deleted file mode 100644 index f351525..0000000 --- a/root-test-fixes.patch +++ /dev/null @@ -1,337 +0,0 @@ -From 092d06fd403331bf082dd0d2d56718a9ee31efec Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Thu, 15 Feb 2018 18:12:41 +0100 -Subject: [PATCH 1/4] Don't call front() on empty containers - ---- - math/mathcore/inc/Fit/FitData.h | 4 ++-- - math/mathcore/inc/Math/WrappedParamFunction.h | 10 +++++----- - math/mathcore/src/BinData.cxx | 24 ++++++++++++------------ - math/mathcore/src/FitData.cxx | 2 +- - 4 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/math/mathcore/inc/Fit/FitData.h b/math/mathcore/inc/Fit/FitData.h -index cb8fa2f0be3..9579bde92bf 100644 ---- a/math/mathcore/inc/Fit/FitData.h -+++ b/math/mathcore/inc/Fit/FitData.h -@@ -185,7 +185,7 @@ namespace ROOT { - - for (unsigned int i = 0; i < fDim; i++) { - fCoords[i].resize(fMaxPoints + VectorPadding(fMaxPoints)); -- fCoordsPtr[i] = &fCoords[i].front(); -+ fCoordsPtr[i] = fCoords[i].empty() ? NULL : &fCoords[i].front(); - } - - if (fpTmpCoordVector) { -@@ -354,7 +354,7 @@ namespace ROOT { - unsigned padding = VectorPadding(fNPoints); - fCoords[i].resize(fNPoints + padding); - std::copy(fCoordsPtr[i], fCoordsPtr[i] + fNPoints + padding, fCoords[i].begin()); -- fCoordsPtr[i] = &fCoords[i].front(); -+ fCoordsPtr[i] = fCoords[i].empty() ? NULL : &fCoords[i].front(); - } - - fWrapped = false; -diff --git a/math/mathcore/inc/Math/WrappedParamFunction.h b/math/mathcore/inc/Math/WrappedParamFunction.h -index 38b9af7639f..0c860672f9e 100644 ---- a/math/mathcore/inc/Math/WrappedParamFunction.h -+++ b/math/mathcore/inc/Math/WrappedParamFunction.h -@@ -95,7 +95,7 @@ class WrappedParamFunction : public IParamMultiFunction { - } - - const double * Parameters() const { -- return &(fParams.front()); -+ return fParams.empty() ? NULL : &fParams.front(); - } - - void SetParameters(const double * p) { -@@ -172,7 +172,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction { - - /// clone the function - IMultiGenFunction * Clone() const { -- return new WrappedParamFunctionGen(fFunc, fDim, fParams.size() , &fParams.front(), &fParIndices.front()); -+ return new WrappedParamFunctionGen(fFunc, fDim, fParams.size(), fParams.empty() ? NULL : &fParams.front(), fParIndices.empty() ? NULL : &fParIndices.front()); - } - - private: -@@ -183,7 +183,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction { - public: - - const double * Parameters() const { -- return &(fParams.front()); -+ return fParams.empty() ? NULL : &fParams.front(); - } - - void SetParameters(const double * p) { -@@ -227,7 +227,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction { - // std::copy(fX.begin(), fX.end(), oi); - // std::cout << std::endl; - -- return (*fFunc)( &fX.front() ); -+ return (*fFunc)( fX.empty() ? NULL : &fX.front() ); - } - - -@@ -264,7 +264,7 @@ class WrappedParamFunctionGen : public IParamMultiFunction { - // std::cout << this << std::endl; - - // set parameter values in fX -- SetParValues(npar, &fParams.front() ); -+ SetParValues(npar, fParams.empty() ? NULL : &fParams.front()); - for (unsigned int i = 0; i < npar; ++i) { - unsigned int j = fParIndices[i]; - assert ( j < npar + fDim); -diff --git a/math/mathcore/src/BinData.cxx b/math/mathcore/src/BinData.cxx -index 16c9e375634..50a47169272 100644 ---- a/math/mathcore/src/BinData.cxx -+++ b/math/mathcore/src/BinData.cxx -@@ -284,7 +284,7 @@ namespace ROOT { - - for ( unsigned int i=0; i -Date: Thu, 15 Feb 2018 18:18:35 +0100 -Subject: [PATCH 2/4] Call resize() when the size should be changed, reserve() - does not change the size - ---- - math/mathcore/src/TKDTreeBinning.cxx | 2 +- - tree/tree/test/TBasket.cxx | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/math/mathcore/src/TKDTreeBinning.cxx b/math/mathcore/src/TKDTreeBinning.cxx -index 09647958dc7..d0b06e1a99f 100644 ---- a/math/mathcore/src/TKDTreeBinning.cxx -+++ b/math/mathcore/src/TKDTreeBinning.cxx -@@ -241,7 +241,7 @@ void TKDTreeBinning::SetTreeData() { - - void TKDTreeBinning::SetBinsContent() { - // Sets the bins' content -- fBinsContent.reserve(fNBins); -+ fBinsContent.resize(fNBins); - for (UInt_t i = 0; i < fNBins; ++i) - fBinsContent[i] = fDataBins->GetBucketSize(); - if ( fDataSize % fNBins != 0 ) -diff --git a/tree/tree/test/TBasket.cxx b/tree/tree/test/TBasket.cxx -index fba69bd68d0..90eb330f7ee 100644 ---- a/tree/tree/test/TBasket.cxx -+++ b/tree/tree/test/TBasket.cxx -@@ -102,7 +102,7 @@ TEST(TBasket, CreateAndDestroy) - f->Close(); - - Long64_t maxsize = f->GetSize(); -- memBuffer.reserve(maxsize); -+ memBuffer.resize(maxsize); - f->CopyTo(&memBuffer[0], maxsize); - - delete f; -@@ -182,7 +182,7 @@ TEST(TBasket, TestUnsupportedIO) - - std::vector memBuffer; - Long64_t maxsize = f->GetSize(); -- memBuffer.reserve(maxsize); -+ memBuffer.resize(maxsize); - f->CopyTo(&memBuffer[0], maxsize); - - TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ"); -@@ -230,7 +230,7 @@ TEST(TBasket, TestVarLengthArrays) - f->Close(); - std::vector memBuffer; - Long64_t maxsize = f->GetSize(); -- memBuffer.reserve(maxsize); -+ memBuffer.resize(maxsize); - f->CopyTo(&memBuffer[0], maxsize); - - TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ"); -@@ -334,7 +334,7 @@ TEST(TBasket, TestSettingIOBits) - f->Close(); - std::vector memBuffer; - Long64_t maxsize = f->GetSize(); -- memBuffer.reserve(maxsize); -+ memBuffer.resize(maxsize); - f->CopyTo(&memBuffer[0], maxsize); - - TMemFile f2("tbasket_test.root", &memBuffer[0], maxsize, "READ"); - -From 8dfcb54ca0457c2e8ae6102bb4a60ac60bd49004 Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Thu, 15 Feb 2018 18:25:39 +0100 -Subject: [PATCH 3/4] operator[] with an argument that is out of range causes - undefined behavior - ---- - math/mathcore/test/binarySearchTime.cxx | 5 ++--- - math/mathmore/test/testPermute.cxx | 4 ++-- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/math/mathcore/test/binarySearchTime.cxx b/math/mathcore/test/binarySearchTime.cxx -index c98017a0c55..0a611486489 100644 ---- a/math/mathcore/test/binarySearchTime.cxx -+++ b/math/mathcore/test/binarySearchTime.cxx -@@ -58,9 +58,8 @@ template bool testBinarySearch(const int n, double* tTMath, double* - t.Start(); - for (int j = 0; j < npass; ++j) { - for ( T elem = 0; elem < maxint; ++elem ) { -- T* pind; -- pind = std::lower_bound(&k[0], &k[n], elem); -- Long_t index2 = (((pind != &(k[n])) && (*pind == elem)) ? (pind - &k[0]): ( pind - &k[0] - 1)); -+ auto pind = std::lower_bound(k.begin(), k.end(), elem); -+ Long_t index2 = (((pind != k.end()) && (*pind == elem)) ? (pind - k.begin()) : (pind - k.begin() - 1)); - s2+= index2; - } - } -diff --git a/math/mathmore/test/testPermute.cxx b/math/mathmore/test/testPermute.cxx -index b75609b9958..f2a49da2e4d 100644 ---- a/math/mathmore/test/testPermute.cxx -+++ b/math/mathmore/test/testPermute.cxx -@@ -64,7 +64,7 @@ bool checkPermute() - //cout << original << vM << vS << endl; - - while ( TMath::Permute(n, &vM[0]) ) { -- std::next_permutation(&vS[0], &vS[n]); -+ std::next_permutation(vS.begin(), vS.end()); - //cout << vM << vS << endl; - equals &= equal(vM.begin(), vM.end(), vS.begin()); - } -@@ -99,7 +99,7 @@ void permuteTime(const int n, double* tTMath, double* tStd) - t.Start(); - for (int j = 0; j < npass; ++j) { - copy(original.begin(), original.end(), v.begin()); -- while ( std::next_permutation(&v[0], &v[n]) ) {} -+ while ( std::next_permutation(v.begin(), v.end()) ) {} - } - t.Stop(); - *tStd = t.RealTime(); - -From 80ba399340167f62368685e0bf03f9cb9a595954 Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Thu, 15 Feb 2018 18:27:23 +0100 -Subject: [PATCH 4/4] cut-and-paste errors, I guess... - ---- - math/mathcore/test/testkdTreeBinning.cxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/math/mathcore/test/testkdTreeBinning.cxx b/math/mathcore/test/testkdTreeBinning.cxx -index 233b083ee5f..193ff1bb3e2 100644 ---- a/math/mathcore/test/testkdTreeBinning.cxx -+++ b/math/mathcore/test/testkdTreeBinning.cxx -@@ -82,9 +82,9 @@ void testkdTreeBinning() { - int ibinMax = kdBins->GetBinMaxDensity(); - - std::cout << "Bin with minimum density: " << ibinMin << " density = " << kdBins->GetBinDensity(ibinMin) << " content = " << kdBins->GetBinContent(ibinMin) << std::endl; -- std::cout << "Bin with maximum density: " << ibinMax << " density = " << kdBins->GetBinDensity(ibinMax) << " content = " << kdBins->GetBinContent(ibinMin) << std::endl; -+ std::cout << "Bin with maximum density: " << ibinMax << " density = " << kdBins->GetBinDensity(ibinMax) << " content = " << kdBins->GetBinContent(ibinMax) << std::endl; - -- if (kdBins->GetBinDensity(ibinMax) != DATASZ/NBINS) -+ if (kdBins->GetBinContent(ibinMax) != DATASZ/NBINS) - Error("testkdTreeBinning","Wrong bin content"); - - // order bins by density diff --git a/root-test-stress-32bit.patch b/root-test-stress-32bit.patch deleted file mode 100644 index ce2d370..0000000 --- a/root-test-stress-32bit.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/stress.cxx b/test/stress.cxx -index 0f759ad7c2..7c3c9e1b04 100644 ---- a/test/stress.cxx -+++ b/test/stress.cxx -@@ -385,7 +385,7 @@ void stress3() - Long64_t last = f.GetEND(); - Float_t comp = f.GetCompressionFactor(); - Bool_t OK = kTRUE; -- constexpr Long64_t lastgood = 51651; -+ constexpr Long64_t lastgood = 51851; - constexpr Long64_t tolerance = 150; - if (last lastgood+tolerance || comp <1.8 || comp > 2.4) OK = kFALSE; - if (OK) printf("OK\n"); diff --git a/root-test-subdirs.patch b/root-test-subdirs.patch index af59a8b..67a22c2 100644 --- a/root-test-subdirs.patch +++ b/root-test-subdirs.patch @@ -1,244 +1,36 @@ -From eb7d389e582fd11cf00879a3daf161fa7e1b0f40 Mon Sep 17 00:00:00 2001 +From 41e33db9d17e4d295bf12958398fc3758d3e3a5b Mon Sep 17 00:00:00 2001 From: Mattias Ellert -Date: Tue, 16 Jan 2018 06:11:30 +0100 -Subject: [PATCH] Always use ROOT_ADD_TEST_SUBDIRECTORY when adding test - directories +Date: Tue, 19 Jun 2018 09:20:21 +0200 +Subject: [PATCH] Include test directory using ROOT_ADD_TEST_SUBDIRECTORY --- - cmake/modules/RootNewMacros.cmake | 1 - - core/base/CMakeLists.txt | 4 +--- - core/cont/CMakeLists.txt | 4 +--- - core/foundation/CMakeLists.txt | 5 +---- - core/imt/CMakeLists.txt | 4 ++-- - core/meta/CMakeLists.txt | 4 +--- - core/metacling/CMakeLists.txt | 4 +--- - core/thread/CMakeLists.txt | 4 +--- - graf2d/gpad/CMakeLists.txt | 8 +++----- - hist/hist/CMakeLists.txt | 6 ++---- - hist/histdraw/CMakeLists.txt | 4 +--- - io/io/CMakeLists.txt | 4 +--- - tmva/CMakeLists.txt | 3 --- - tmva/tmva/test/CMakeLists.txt | 9 --------- - tree/tree/CMakeLists.txt | 4 +--- - tree/treeplayer/CMakeLists.txt | 4 +--- - 16 files changed, 17 insertions(+), 55 deletions(-) - delete mode 100644 tmva/tmva/test/CMakeLists.txt + graf2d/gpadv7/CMakeLists.txt | 5 +---- + graf2d/primitives/CMakeLists.txt | 5 ++--- + 2 files changed, 3 insertions(+), 7 deletions(-) -diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake -index 340d5c9951..77b784e4ea 100644 ---- a/cmake/modules/RootNewMacros.cmake -+++ b/cmake/modules/RootNewMacros.cmake -@@ -1304,7 +1304,6 @@ function(ROOT_ADD_GTEST test_suite) - # against. For example, tests in Core should link only against libCore. This could be tricky - # to implement because some ROOT components create more than one library. - ROOT_EXECUTABLE(${test_suite} ${source_files} LIBRARIES ${ARG_LIBRARIES}) -- set_property(TARGET ${test_suite} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - target_link_libraries(${test_suite} gtest gtest_main gmock gmock_main) - - ROOT_PATH_TO_STRING(mangled_name ${test_suite} PATH_SEPARATOR_REPLACEMENT "-") -diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt -index f3738e76a8..0fabc03e4e 100644 ---- a/core/base/CMakeLists.txt -+++ b/core/base/CMakeLists.txt -@@ -2,9 +2,7 @@ - # CMakeLists.txt file for building ROOT core/base package - ############################################################################ - --if(testing) -- add_subdirectory(test) --endif() -+ROOT_ADD_TEST_SUBDIRECTORY(test) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res) - -diff --git a/core/cont/CMakeLists.txt b/core/cont/CMakeLists.txt -index 2d5363d3d8..bb5a82e133 100644 ---- a/core/cont/CMakeLists.txt -+++ b/core/cont/CMakeLists.txt -@@ -2,9 +2,7 @@ - # CMakeLists.txt file for building ROOT core/cont package - ############################################################################ - --if(testing) -- add_subdirectory(test) --endif() -+ROOT_ADD_TEST_SUBDIRECTORY(test) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/../foundation/res) - -diff --git a/core/foundation/CMakeLists.txt b/core/foundation/CMakeLists.txt -index 9cc29d871e..af594ba98f 100644 ---- a/core/foundation/CMakeLists.txt -+++ b/core/foundation/CMakeLists.txt -@@ -21,7 +21,4 @@ set_target_properties(Foundation_Stage1 PROPERTIES COMPILE_FLAGS "${COMPILE_FLAG - - ROOT_INSTALL_HEADERS() - --if(testing) -- add_subdirectory(test) --endif() -- -+ROOT_ADD_TEST_SUBDIRECTORY(test) -diff --git a/core/imt/CMakeLists.txt b/core/imt/CMakeLists.txt -index 6ef45c7fc2..4b86f58ee2 100644 ---- a/core/imt/CMakeLists.txt -+++ b/core/imt/CMakeLists.txt -@@ -21,6 +21,6 @@ ROOT_LINKER_LIBRARY(Imt ${sources} - - ROOT_INSTALL_HEADERS(${installoptions}) - --if(imt AND testing) -- add_subdirectory(test) -+if(imt) -+ ROOT_ADD_TEST_SUBDIRECTORY(test) - endif() -diff --git a/core/meta/CMakeLists.txt b/core/meta/CMakeLists.txt -index df84a83948..4843b06cf0 100644 ---- a/core/meta/CMakeLists.txt -+++ b/core/meta/CMakeLists.txt -@@ -12,6 +12,4 @@ ROOT_OBJECT_LIBRARY(Meta ${sources}) - - ROOT_INSTALL_HEADERS() - --if(testing) -- add_subdirectory(test) --endif() -+ROOT_ADD_TEST_SUBDIRECTORY(test) -diff --git a/core/metacling/CMakeLists.txt b/core/metacling/CMakeLists.txt -index 0fec8de3e8..5468064771 100644 ---- a/core/metacling/CMakeLists.txt -+++ b/core/metacling/CMakeLists.txt -@@ -4,6 +4,4 @@ - - add_subdirectory(src) - --if(testing) -- add_subdirectory(test) --endif() -+ROOT_ADD_TEST_SUBDIRECTORY(test) -diff --git a/core/thread/CMakeLists.txt b/core/thread/CMakeLists.txt -index 0ec5857e50..2149ff5d47 100644 ---- a/core/thread/CMakeLists.txt -+++ b/core/thread/CMakeLists.txt -@@ -36,6 +36,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Thread - LIBRARIES ${CMAKE_THREAD_LIBS_INIT} - INSTALL_OPTIONS ${installoptions}) - --if(testing) -- add_subdirectory(test) --endif() -+ROOT_ADD_TEST_SUBDIRECTORY(test) -diff --git a/graf2d/gpad/CMakeLists.txt b/graf2d/gpad/CMakeLists.txt -index 51da1c2320..06e508981f 100644 ---- a/graf2d/gpad/CMakeLists.txt -+++ b/graf2d/gpad/CMakeLists.txt -@@ -14,8 +14,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gpad +diff --git a/graf2d/gpadv7/CMakeLists.txt b/graf2d/gpadv7/CMakeLists.txt +index 525ce415451..9d6870231f3 100644 +--- a/graf2d/gpadv7/CMakeLists.txt ++++ b/graf2d/gpadv7/CMakeLists.txt +@@ -11,7 +11,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGpadv7 DICTIONARY_OPTIONS "-writeEmptyRootPCM" - DEPENDENCIES Graf Hist) + DEPENDENCIES ROOTGraphicsPrimitives) +- -if(testing) -- if(root7) -- add_subdirectory(v7/test) -- endif() +- ROOT_ADD_TEST_SUBDIRECTORY(v7/test) -endif() -\ No newline at end of file -+if(root7) -+ ROOT_ADD_TEST_SUBDIRECTORY(v7/test) -+endif() -diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt -index 88396c4924..3ac1898ccd 100644 ---- a/hist/hist/CMakeLists.txt -+++ b/hist/hist/CMakeLists.txt -@@ -15,10 +15,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hist ++ROOT_ADD_TEST_SUBDIRECTORY(v7/test) +diff --git a/graf2d/primitives/CMakeLists.txt b/graf2d/primitives/CMakeLists.txt +index f491eb70a90..d33597805d8 100644 +--- a/graf2d/primitives/CMakeLists.txt ++++ b/graf2d/primitives/CMakeLists.txt +@@ -11,6 +11,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGraphicsPrimitives + SOURCES ${src} DICTIONARY_OPTIONS "-writeEmptyRootPCM" - DEPENDENCIES Matrix MathCore RIO) - + DEPENDENCIES RIO Core) -if(testing) -- add_subdirectory(test) -+ROOT_ADD_TEST_SUBDIRECTORY(test) - - if(root7) - add_subdirectory(v7/test) -- endif() -+ ROOT_ADD_TEST_SUBDIRECTORY(v7/test) - endif() -diff --git a/hist/histdraw/CMakeLists.txt b/hist/histdraw/CMakeLists.txt -index 51721f2d0e..9f3232ae5f 100644 ---- a/hist/histdraw/CMakeLists.txt -+++ b/hist/histdraw/CMakeLists.txt -@@ -12,7 +12,5 @@ if(root7) - DICTIONARY_OPTIONS "-writeEmptyRootPCM" - DEPENDENCIES Gpad Hist) - -- if(testing) -- add_subdirectory(v7/test) -- endif() -+ ROOT_ADD_TEST_SUBDIRECTORY(v7/test) - endif() -diff --git a/io/io/CMakeLists.txt b/io/io/CMakeLists.txt -index 7ca1104287..78e94786da 100644 ---- a/io/io/CMakeLists.txt -+++ b/io/io/CMakeLists.txt -@@ -18,8 +18,6 @@ ROOT_LINKER_LIBRARY(${libname} $ $= 24 # libhdfs is available for all architectures for Fedora 24 and later. @@ -23,6 +16,13 @@ %global root7 0 %endif +%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8 +# Multi-threading support requires TBB version >= 4.3. +%global tbb 1 +%else +%global tbb 0 +%endif + # Do not create .orig files when patching source %global _default_patch_flags --no-backup-if-mismatch @@ -31,18 +31,18 @@ %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$ Name: root -Version: 6.12.06 +Version: 6.14.00 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 5%{?dist} +Release: 1%{?dist} Summary: Numerical data analysis framework License: LGPLv2+ -URL: https://root.cern.ch/ +URL: https://root.cern/ # The upstream source is modified to exclude proprietary fonts: -# wget -N https://root.cern.ch/download/root_v%{version}.source.tar.gz -# tar -z -x -f root_v%{version}.source.tar.gz -# find root-%{version}/fonts -type f -a '!' '(' -name 'STIX*' -o -name DroidSansFallback.ttf ')' -exec rm {} ';' -# tar -J -c --group root --owner root -f root-%{version}.tar.xz root-%{version} +# wget -N https://root.cern/download/root_v%%{version}.source.tar.gz +# tar -z -x -f root_v%%{version}.source.tar.gz +# find root-%%{version}/fonts -type f -a '!' -name 'STIX*' -exec rm {} ';' +# tar -J -c --group root --owner root -f root-%%{version}.tar.xz root-%%{version} Source0: %{name}-%{version}.tar.xz # Input data for the tests Source1: %{name}-testfiles.tar.xz @@ -53,72 +53,56 @@ Source3: rootd.service Source4: proofd.service # Use system fonts Patch0: %{name}-fontconfig.patch -# Don't link to libjvm (handled properly inside libhdfs) -Patch1: %{name}-dont-link-jvm.patch # Don't create documentation notebooks -Patch2: %{name}-doc-no-notebooks.patch +Patch1: %{name}-doc-no-notebooks.patch # Don't run gui macros -Patch3: %{name}-avoid-gui-crash.patch +Patch2: %{name}-avoid-gui-crash.patch # Unbundle gtest -Patch4: %{name}-unbundle-gtest.patch -# Horrible hack for broken charmaps in StandardSymbolsPS.otf -# Hopefully temporary... -# https://bugzilla.redhat.com/show_bug.cgi?id=1534206 -Patch5: %{name}-urw-otf-hack.patch +Patch3: %{name}-unbundle-gtest.patch # Use local static script and style files for JupyROOT -Patch6: %{name}-jupyroot-static.patch +Patch4: %{name}-jupyroot-static.patch +# Fedora's llvm patches +Patch5: %{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch +Patch6: %{name}-Fix-return-type-in-ORC-readMem-client-interface.patch +Patch7: %{name}-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch # Fix some javascript syntax choking yuicompressor # Adapt d3 path to updated jsroot # https://github.com/root-project/root/pull/1520 -Patch7: %{name}-js-syntax.patch -# Fix missing -f flag to rm in Makefile -# Backport from upstream git -Patch8: %{name}-doxygen-makefile.patch +Patch8: %{name}-js-syntax.patch # Always use ROOT_ADD_TEST_SUBDIRECTORY when adding test dirs -# https://github.com/root-project/root/pull/1515 +# https://github.com/root-project/root/pull/2247 Patch9: %{name}-test-subdirs.patch -# No need to use environment variables for system pythia -Patch10: %{name}-system-pythia.patch # Reduce memory usage of build # https://github.com/root-project/root/pull/1516 -Patch11: %{name}-memory-usage.patch -# Fedora's llvm patch -Patch12: %{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch +Patch10: %{name}-memory-usage.patch # Reduce memory usage during linking on ARM and x86 by generating # smaller debuginfo for the llmv libraries. # Fedora builders run out of memory with the default setting. -Patch13: %{name}-memory-arm-x86.patch +Patch11: %{name}-memory-arm-x86.patch # Don't run tutorials that crash on ppc64 during doc generation. # Ensures content of doc package is the same on all architecture # so that koji accepts it as a noarch package. -Patch14: %{name}-ppc64-doc.patch -# Check string is not empty before calling front() -# Backport from upstream git -Patch15: %{name}-crash-fix.patch -# Adjust expected file size for ix32 -# Backport from upstream git -Patch16: %{name}-test-stress-32bit.patch -# Fixes for failing tests due to new compiler flags -# https://github.com/root-project/root/pull/1638 -Patch17: %{name}-test-fixes.patch -# https://github.com/root-project/root/pull/1639 -Patch18: %{name}-out-of-bounds.patch -# Fix ~ alignment in doxygen markup -# https://github.com/root-project/root/pull/1640 -Patch19: %{name}-doxygen-tilde.patch -# Don't install intermediate static libs (mathtext and minicern) -# Don't add JupyROOT python extension to cmake exports -# https://github.com/root-project/root/pull/1643 -Patch20: %{name}-noinst.patch +Patch12: %{name}-ppc64-doc.patch # Adjust allowed deviation for PDF file sizes (aarch64) # https://github.com/root-project/root/pull/2120 -Patch21: %{name}-stressgraphics-ref.patch +Patch13: %{name}-stressgraphics-ref.patch # Adjust Vavilov test for Fedora 29 ix86 # https://github.com/root-project/root/pull/2273 -Patch22: %{name}-adjust-allowed-test-difference-for-32-bit-ix86.patch +Patch14: %{name}-adjust-allowed-test-difference-for-32-bit-ix86.patch # Adapt to python 3.7 # https://github.com/root-project/root/pull/2276 -Patch23: %{name}-python-3.7.patch +Patch15: %{name}-python-3.7.patch +# Set Cache File Dir +# https://github.com/root-project/root/pull/2246 +Patch16: %{name}-set-cache-file-dir.patch +# Fix test compilation on EPEL 7 +# https://github.com/root-project/root/pull/2263 +Patch17: %{name}-test-compilatiom-epel7.patch +# Missing include for std::shuffle +# https://github.com/root-project/root/pull/2267 +Patch18: %{name}-missing-header.patch +# Optimization issue in Geom library +Patch19: %{name}-ix32-geom-opt.patch # s390x suffers from endian issues resulting in failing tests # and broken documentation generation @@ -167,16 +151,18 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: postgresql-devel BuildRequires: python-devel -%if %{?fedora}%{!?fedora:0} >= 15 +%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 8 BuildRequires: python3-devel %endif %if %{?rhel}%{!?rhel:0} == 7 BuildRequires: python34-devel %endif BuildRequires: qt4-devel -%if %{ruby} -BuildRequires: ruby -BuildRequires: ruby-devel +%if %{root7} +%ifarch %{qt5_qtwebengine_arches} +BuildRequires: qt5-devel +BuildRequires: qt5-qtwebengine-devel +%endif %endif BuildRequires: openssl-devel BuildRequires: globus-gss-assist-devel @@ -186,10 +172,8 @@ BuildRequires: libtool-ltdl-devel BuildRequires: desktop-file-utils BuildRequires: dcap-devel BuildRequires: dpm-devel -%if %{xrootd} BuildRequires: xrootd-client-devel >= 1:3.3.5 BuildRequires: xrootd-private-devel >= 1:3.3.5 -%endif BuildRequires: cfitsio-devel BuildRequires: davix-devel >= 0.2.8 BuildRequires: gfal2-devel @@ -197,13 +181,11 @@ BuildRequires: srm-ifce-devel %if %{hadoop} BuildRequires: hadoop-devel %endif -%if %{oce} BuildRequires: OCE-devel -%endif BuildRequires: R-Rcpp-devel BuildRequires: R-RInside-devel BuildRequires: readline-devel -%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8 +%if %{tbb} BuildRequires: tbb-devel >= 4.3 %endif BuildRequires: emacs @@ -212,9 +194,7 @@ BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: graphviz-devel BuildRequires: expat-devel -%if %{pythia8} BuildRequires: pythia8-devel >= 8.1.80 -%endif BuildRequires: blas-devel BuildRequires: numpy BuildRequires: doxygen @@ -230,16 +210,14 @@ BuildRequires: redhat-lsb-core BuildRequires: font(freesans) BuildRequires: font(freeserif) BuildRequires: font(freemono) -# Provides "symbol", "dingbats" and "chancery" %if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8 -BuildRequires: urw-base35-fonts +BuildRequires: font(standardsymbolsps) +BuildRequires: font(d050000l) +BuildRequires: font(z003) %else BuildRequires: urw-fonts %endif -# The root-fonts package provides Droid Sans Fallback for EPEL -%if %{?fedora}%{!?fedora:0} >= 11 BuildRequires: font(droidsansfallback) -%endif # With gdb installed test failures will show backtraces BuildRequires: gdb Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -306,9 +284,6 @@ Requires: %{name}-core = %{version}-%{release} %description fonts This package contains fonts used by ROOT that are not available in Fedora. In particular it contains STIX version 0.9 that is used by TMathText. -%if %{?rhel}%{!?rhel:0} -For EPEL it also provides the Google Droid Sans Fallback font. -%endif %package doc Summary: Documentation for the ROOT system @@ -358,19 +333,15 @@ Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: font(freesans) Requires: font(freeserif) Requires: font(freemono) -# Provides "symbol", "dingbats" and "chancery" %if %{?fedora}%{!?fedora:0} >= 27 || %{?rhel}%{!?rhel:0} >= 8 -Requires: urw-base35-fonts +Requires: font(standardsymbolsps) +Requires: font(d050000l) +Requires: font(z003) %else Requires: urw-fonts %endif -# The root-fonts package provides Droid Sans Fallback for EPEL -%if %{?fedora}%{!?fedora:0} >= 11 Requires: font(droidsansfallback) -%endif -%if %{ruby} == 0 Obsoletes: %{name}-ruby < 6.00.00 -%endif Obsoletes: %{name}-vdt < 6.10.00 %description core @@ -443,9 +414,6 @@ transparent interface. %package -n python2-%{name} Summary: Python extension for ROOT -%{?py2_dist: -Provides: %{py2_dist %{name}} = %{version} -} Provides: root-python = %{version}-%{release} Obsoletes: root-python < 6.08.00 Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -458,9 +426,6 @@ provide a Python interface to ROOT, and a ROOT interface to Python. %package -n python%{python3_pkgversion}-%{name} Summary: Python extension for ROOT -%{?py3_dist: -Provides: %{py3_dist %{name}} = %{version} -} Provides: root-python%{python3_pkgversion} = %{version}-%{release} Obsoletes: root-python%{python3_pkgversion} < 6.08.00 Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -473,20 +438,18 @@ provide a Python interface to ROOT, and a ROOT interface to Python. %package -n python2-jupyroot Summary: ROOT Jupyter kernel -%{?py2_dist: -Provides: %{py2_dist jupyroot} = %{version} -} Requires: python2-%{name}%{?_isa} = %{version}-%{release} Requires: python2-jsmva = %{version}-%{release} Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-notebook = %{version}-%{release} %if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8 -Requires: python2-ipython -Requires: python2-metakernel -%else -Requires: python-ipython-console # python-metakernel for python2 not available in # Fedora <= 25 or RHEL/EPEL - some functionality missing +Requires: python2-ipython +Requires: python2-metakernel +%endif +%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8 +Requires: python-jupyter-filesystem %endif Obsoletes: %{name}-rootaas < 6.08.00 @@ -495,23 +458,18 @@ The Jupyter kernel for the ROOT notebook. %package -n python%{python3_pkgversion}-jupyroot Summary: ROOT Jupyter kernel -%{?py3_dist: -Provides: %{py3_dist jupyroot} = %{version} -} Requires: python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release} Requires: python%{python3_pkgversion}-jsmva = %{version}-%{release} Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-notebook = %{version}-%{release} %if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8 +# python-metakernel for python3 not available in +# Fedora <= 25 or RHEL/EPEL - some functionality missing Requires: python%{python3_pkgversion}-ipython Requires: python%{python3_pkgversion}-metakernel -%else -%if %{?fedora}%{!?fedora:0} -# ipython for python3 not available in RHEL/EPEL -Requires: python%{python3_pkgversion}-ipython-console %endif -# python-metakernel for python3 not available in -# Fedora <= 25 or RHEL/EPEL - some functionality missing +%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8 +Requires: python-jupyter-filesystem %endif %description -n python%{python3_pkgversion}-jupyroot @@ -520,9 +478,6 @@ The Jupyter kernel for the ROOT notebook. %package -n python2-jsmva Summary: TMVA interface used by JupyROOT BuildArch: noarch -%{?py2_dist: -Provides: %{py2_dist jsmva} = %{version} -} Requires: %{name}-tmva = %{version}-%{release} %description -n python2-jsmva @@ -531,28 +486,11 @@ TMVA interface used by JupyROOT. %package -n python%{python3_pkgversion}-jsmva Summary: TMVA interface used by JupyROOT BuildArch: noarch -%{?py3_dist: -Provides: %{py3_dist jsmva} = %{version} -} Requires: %{name}-tmva = %{version}-%{release} %description -n python%{python3_pkgversion}-jsmva TMVA interface used by JupyROOT. -%if %{ruby} -%package ruby -Summary: Ruby extension for ROOT -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-hist%{?_isa} = %{version}-%{release} -Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} -Provides: ruby(libRuby) = %{version} - -%description ruby -This package contains the Ruby extension for ROOT. The interface -goes both ways - that is, you can call ROOT functions from Ruby, and -invoke the Ruby interpreter from ROOT. -%endif - %package r Summary: R interface for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -612,7 +550,6 @@ Requires: %{name}-io-xml%{?_isa} = %{version}-%{release} %description gdml This package contains an import/export module for ROOT geometries. -%if %{oce} %package geocad Summary: OpenCascade import/export for ROOT geometries Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -620,7 +557,6 @@ Requires: %{name}-geom%{?_isa} = %{version}-%{release} %description geocad This package contains an import/export module for ROOT geometries. -%endif %package graf Summary: 2D graphics library for ROOT @@ -663,7 +599,6 @@ Summary: Canvas and pad library for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-graf%{?_isa} = %{version}-%{release} Requires: %{name}-hist%{?_isa} = %{version}-%{release} -Requires: %{name}-io%{?_isa} = %{version}-%{release} Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} # Dynamic dependency Requires: %{name}-graf-postscript%{?_isa} = %{version}-%{release} @@ -789,25 +724,33 @@ Requires: %{name}-graf%{?_isa} = %{version}-%{release} Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} Requires: %{name}-io%{?_isa} = %{version}-%{release} Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} -Requires: %{name}-net%{?_isa} = %{version}-%{release} # Dynamic dependencies Requires: %{name}-graf-x11%{?_isa} = %{version}-%{release} Requires: %{name}-gui-ged%{?_isa} = %{version}-%{release} +# Package split (gui-html from gui) +Obsoletes: %{name}-gui < 6.14.00 %description gui This package contains a library for defining graphical user interfaces. +%package gui-html +Summary: HTML GUI library for ROOT +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-graf%{?_isa} = %{version}-%{release} +Requires: %{name}-gui%{?_isa} = %{version}-%{release} +Requires: %{name}-net%{?_isa} = %{version}-%{release} +# Package split (gui-html from gui) +Obsoletes: %{name}-gui < 6.14.00 + +%description gui-html +This package contains a library for defining HTML graphical user interfaces. + %package gui-fitpanel Summary: GUI element for fits in ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} Requires: %{name}-gui%{?_isa} = %{version}-%{release} Requires: %{name}-hist%{?_isa} = %{version}-%{release} -%if %{root7} -Requires: %{name}-hist-draw%{?_isa} = %{version}-%{release} -Requires: %{name}-gui-webdisplay%{?_isa} = %{version}-%{release} -%endif -Requires: %{name}-io%{?_isa} = %{version}-%{release} Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} Requires: %{name}-tree%{?_isa} = %{version}-%{release} @@ -830,26 +773,42 @@ Requires: %{name}-tree-player%{?_isa} = %{version}-%{release} This package contains a library to show a pop-up window for editing various ROOT objects. -%package guibuilder +%package gui-builder Summary: GUI editor library for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-graf%{?_isa} = %{version}-%{release} Requires: %{name}-gui%{?_isa} = %{version}-%{release} Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} +# Package renamed +Provides: %{name}-guibuilder = %{version}-%{release} +Provides: %{name}-guibuilder%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-guibuilder < 6.14.00 -%description guibuilder +%description gui-builder This package contains a library for editing graphical user interfaces in ROOT. %package gui-qt -Summary: Qt GUI for ROOT +Summary: Qt GUI for ROOT (BNL) Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} Requires: %{name}-graf-qt%{?_isa} = %{version}-%{release} Requires: %{name}-gui%{?_isa} = %{version}-%{release} +# Package split (gui-qtgsi from gui-qt) +Obsoletes: %{name}-qt < 6.14.00 %description gui-qt -This package contains the Qt GUI for ROOT. +This package contains the BNL Qt GUI for ROOT. + +%package gui-qtgsi +Summary: Qt GUI for ROOT (GSI) +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} +Requires: %{name}-gui%{?_isa} = %{version}-%{release} +# Package split (gui-qtgsi from gui-qt) +Obsoletes: %{name}-qt < 6.14.00 + +%description gui-qtgsi +This package contains the GSI Qt GUI for ROOT. %package gui-recorder Summary: Interface for recording and replaying events in ROOT @@ -866,28 +825,6 @@ Recorded events are: All the recorded events from one session are stored in one TFile and can be replayed again anytime. -%if %{root7} -%package gui-canvaspainter -Summary: Canvas painter (ROOT 7) -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-graf%{?_isa} = %{version}-%{release} -Requires: %{name}-io%{?_isa} = %{version}-%{release} -Requires: %{name}-gui-webdisplay%{?_isa} = %{version}-%{release} - -%description gui-canvaspainter -This package contains a canvas painter extension for ROOT 7 - -%package gui-webdisplay -Summary: Web display (ROOT 7) -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-io%{?_isa} = %{version}-%{release} -Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} -Requires: %{name}-net-http%{?_isa} = %{version}-%{release} - -%description gui-webdisplay -This package contains a web display extension for ROOT 7 -%endif - %package hbook Summary: Hbook library for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -911,17 +848,6 @@ Requires: %{name}-hist-painter%{?_isa} = %{version}-%{release} %description hist This package contains a library for histogramming in ROOT. -%if %{root7} -%package hist-draw -Summary: Histogram drawing (ROOT 7) -Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} -Requires: %{name}-hist%{?_isa} = %{version}-%{release} - -%description hist-draw -This package contains an histogram drawing extension for ROOT 7. -%endif - %package hist-painter Summary: Histogram painter plugin for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -961,7 +887,7 @@ Requires: %{name}-graf%{?_isa} = %{version}-%{release} Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} Requires: %{name}-hist%{?_isa} = %{version}-%{release} Requires: %{name}-io%{?_isa} = %{version}-%{release} -Requires: %{name}-io-xml%{?_isa} = %{version}-%{release} +Requires: %{name}-io-xmlparser%{?_isa} = %{version}-%{release} Requires: %{name}-matrix%{?_isa} = %{version}-%{release} Requires: %{name}-roofit%{?_isa} = %{version}-%{release} Requires: %{name}-tree%{?_isa} = %{version}-%{release} @@ -1035,10 +961,21 @@ TFile interface. Summary: XML reader library for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-io%{?_isa} = %{version}-%{release} +# Package split (io-xmlparser from io-xml) +Obsoletes: %{name}-io-xml < 6.14.00 %description io-xml This package contains the XML reader library for ROOT. +%package io-xmlparser +Summary: XML parser library for ROOT +Requires: %{name}-core%{?_isa} = %{version}-%{release} +# Package split (io-xmlparser from io-xml) +Obsoletes: %{name}-io-xml < 6.14.00 + +%description io-xmlparser +This package contains the XML parser library for ROOT. + %package foam Summary: A Compact Version of the Cellular Event Generator Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -1229,6 +1166,15 @@ init-program computes all tables and constants necessary for the random variate generation. The sample program can then generate variates from the desired distribution. +%package vecops +Summary: Vector operation extension for ROOT +Requires: %{name}-core%{?_isa} = %{version}-%{release} +# Library split (tree-dataframe and vecops from tree-player) +Obsoletes: %{name}-tree-player < 6.14.00 + +%description vecops +This package contains a vector operation extension for ROOT. + %package memstat Summary: Memory statistics tool for use with ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -1264,7 +1210,6 @@ Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} %description montecarlo-eg This package contains an event generator library for ROOT. -%if %{pythia8} %package montecarlo-pythia8 Summary: Pythia version 8 plugin for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -1275,7 +1220,6 @@ This package contains the Pythia version 8 plug-in for ROOT. This package provide the ROOT user with transparent interface to the Pythia (version 8) event generators for hadronic interactions. If the term "hadronic" does not ring any bells, this package is not for you. -%endif %package montecarlo-vmc Summary: Virtual Monte-Carlo (simulation) library for ROOT @@ -1361,19 +1305,31 @@ access to LDAP directories via ROOT. %package net-http Summary: HTTP server extension for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-io%{?_isa} = %{version}-%{release} +Requires: js-jsroot +# Library split (net-httpsniff from net-http) +Obsoletes: %{name}-net-http < 6.14.00 + +%description net-http +This package contains the HTTP server extension for ROOT. It provides +an http interface to arbitrary ROOT applications. + +%package net-httpsniff +Summary: HTTP sniffer extension for ROOT +Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-graf%{?_isa} = %{version}-%{release} Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} Requires: %{name}-hist%{?_isa} = %{version}-%{release} Requires: %{name}-io%{?_isa} = %{version}-%{release} Requires: %{name}-io-xml%{?_isa} = %{version}-%{release} +Requires: %{name}-net-http%{?_isa} = %{version}-%{release} Requires: %{name}-tree%{?_isa} = %{version}-%{release} -Requires: js-jsroot +# Library split (net-httpsniff from net-http) +Obsoletes: %{name}-net-http < 6.14.00 -%description net-http -This package contains the HTTP server extension for ROOT. It provides -an http interface to arbitrary ROOT applications. +%description net-httpsniff +This package contains the HTTP sniffer extension for ROOT. -%if %{xrootd} %package netx Summary: NetX extension for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -1384,21 +1340,18 @@ Requires: %{name}-net%{?_isa} = %{version}-%{release} This package contains the NetX extension for ROOT, i.e. a client for the xrootd server. Both the old (NetX) and the new (NetXNG) version are provided. -%endif %package proof Summary: PROOF extension for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} -Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} -Requires: %{name}-graf3d%{?_isa} = %{version}-%{release} -Requires: %{name}-hist%{?_isa} = %{version}-%{release} Requires: %{name}-io%{?_isa} = %{version}-%{release} Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} Requires: %{name}-net%{?_isa} = %{version}-%{release} Requires: %{name}-tree%{?_isa} = %{version}-%{release} -Requires: %{name}-tree-player%{?_isa} = %{version}-%{release} Obsoletes: %{name}-clarens < 5.34.01 Obsoletes: %{name}-peac < 5.34.01 +# Package split (proof-player from proof) +Obsoletes: %{name}-proof < 6.14.00 %description proof This package contains the proof extension for ROOT. This provides a @@ -1412,11 +1365,29 @@ Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} Requires: %{name}-hist%{?_isa} = %{version}-%{release} Requires: %{name}-io%{?_isa} = %{version}-%{release} Requires: %{name}-proof%{?_isa} = %{version}-%{release} +Requires: %{name}-proof-player%{?_isa} = %{version}-%{release} Requires: %{name}-tree%{?_isa} = %{version}-%{release} %description proof-bench This package contains the steering class for PROOF benchmarks. +%package proof-player +Summary: PROOF player extension for ROOT +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release} +Requires: %{name}-graf3d%{?_isa} = %{version}-%{release} +Requires: %{name}-hist%{?_isa} = %{version}-%{release} +Requires: %{name}-io%{?_isa} = %{version}-%{release} +Requires: %{name}-net%{?_isa} = %{version}-%{release} +Requires: %{name}-proof%{?_isa} = %{version}-%{release} +Requires: %{name}-tree%{?_isa} = %{version}-%{release} +Requires: %{name}-tree-player%{?_isa} = %{version}-%{release} +# Package split (proof-player from proof) +Obsoletes: %{name}-proof < 6.14.00 + +%description proof-player +This package contains the proof player extension for ROOT. + %package proof-pq2 Summary: PROOF Quick Query (pq2) Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -1443,7 +1414,6 @@ Requires: %{name}-tree%{?_isa} = %{version}-%{release} This package contains a library for browsing an interactive PROOF session in ROOT. -%if %{xrootd} %package xproof Summary: XPROOF extension for ROOT Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -1457,7 +1427,6 @@ Requires: xrootd-server%{?_isa} %description xproof This package contains the xproof extension for ROOT. This provides a client to be used in a PROOF environment. -%endif %package roofit Summary: ROOT extension for modeling expected distributions @@ -1613,6 +1582,18 @@ Requires: %{name}-net%{?_isa} = %{version}-%{release} %description tree This package contains the Tree library for ROOT. +%package tree-dataframe +Summary: A high level interfae to ROOT trees +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-hist%{?_isa} = %{version}-%{release} +Requires: %{name}-tree%{?_isa} = %{version}-%{release} +Requires: %{name}-tree-player%{?_isa} = %{version}-%{release} +# Library split (tree-dataframe and vecops from tree-player) +Obsoletes: %{name}-tree-player < 6.14.00 + +%description tree-dataframe +This package contains a high level interfae to ROOT trees. + %package tree-player Summary: Library to loop over a ROOT tree Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -1625,6 +1606,8 @@ Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} Requires: %{name}-multiproc%{?_isa} = %{version}-%{release} Requires: %{name}-net%{?_isa} = %{version}-%{release} Requires: %{name}-tree%{?_isa} = %{version}-%{release} +# Library split (tree-dataframe and vecops from tree-player) +Obsoletes: %{name}-tree-player < 6.14.00 %description tree-player This package contains a plugin to loop over a ROOT tree. @@ -1649,7 +1632,7 @@ This package contains a plugin for browsing a ROOT tree in ROOT. Summary: Distribution unfolding Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-hist%{?_isa} = %{version}-%{release} -Requires: %{name}-io-xml%{?_isa} = %{version}-%{release} +Requires: %{name}-io-xmlparser%{?_isa} = %{version}-%{release} Requires: %{name}-matrix%{?_isa} = %{version}-%{release} %description unfold @@ -1673,6 +1656,74 @@ Requires: js-jsroot %description notebook Javascript and style files for the Jupyter ROOT Notebook. +%if %{root7} +%package graf-gpadv7 +Summary: Canvas and pad library for ROOT (ROOT 7) +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-graf-primitives%{?_isa} = %{version}-%{release} +Requires: %{name}-io%{?_isa} = %{version}-%{release} + +%description graf-gpadv7 +This package contains a library for canvas and pad manipulations. + +%package graf-primitives +Summary: Graphics primitives (ROOT 7) +Requires: %{name}-core%{?_isa} = %{version}-%{release} + +%description graf-primitives +This package contains graphics primitives for ROOT 7 + +%package gui-canvaspainter +Summary: Canvas painter (ROOT 7) +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-graf-gpadv7%{?_isa} = %{version}-%{release} +Requires: %{name}-gui-webdisplay%{?_isa} = %{version}-%{release} +Requires: %{name}-io%{?_isa} = %{version}-%{release} + +%description gui-canvaspainter +This package contains a canvas painter extension for ROOT 7 + +%package gui-fitpanelv7 +Summary: GUI element for fits in ROOT (ROOT 7) +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-graf-gpadv7%{?_isa} = %{version}-%{release} +Requires: %{name}-graf-primitives%{?_isa} = %{version}-%{release} +Requires: %{name}-gui-webdisplay%{?_isa} = %{version}-%{release} +Requires: %{name}-hist-draw%{?_isa} = %{version}-%{release} +Requires: %{name}-io%{?_isa} = %{version}-%{release} + +%description gui-fitpanelv7 +This package contains a library to show a pop-up dialog when fitting +various kinds of data. + +%ifarch %{qt5_qtwebengine_arches} +%package gui-qt5webdisplay +Summary: Qt5 Web display (ROOT 7) +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-net-http%{?_isa} = %{version}-%{release} + +%description gui-qt5webdisplay +This package contains a Qt5 web display extension for ROOT 7 +%endif + +%package gui-webdisplay +Summary: Web display (ROOT 7) +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-mathcore%{?_isa} = %{version}-%{release} +Requires: %{name}-net-http%{?_isa} = %{version}-%{release} + +%description gui-webdisplay +This package contains a web display extension for ROOT 7 + +%package hist-draw +Summary: Histogram drawing (ROOT 7) +Requires: %{name}-core%{?_isa} = %{version}-%{release} +Requires: %{name}-graf-primitives%{?_isa} = %{version}-%{release} + +%description hist-draw +This package contains an histogram drawing extension for ROOT 7. +%endif + %prep %setup -q -a 1 @@ -1696,10 +1747,6 @@ Javascript and style files for the Jupyter ROOT Notebook. %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 # Remove bundled sources in order to be sure they are not used # * afterimage @@ -1709,11 +1756,11 @@ rm -rf graf3d/ftgl/src graf3d/ftgl/inc # * freetype rm -rf graf2d/freetype/src # * glew -rm -rf graf3d/glew/src graf3d/glew/inc +rm -rf graf3d/glew/src graf3d/glew/inc graf3d/glew/isystem # * pcre rm -rf core/pcre/src -# * zlib -rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]* +# * zlib, lz4, xxhash +rm -rf builtins # * lzma rm -rf core/lzma/src/*.tar.gz # * gl2ps @@ -1731,16 +1778,14 @@ sed 's!\(MATHJAX_RELPATH\s*=\).*!\1 file:///usr/share/javascript/mathjax!' \ -i documentation/doxygen/Doxyfile %if %{root7} # * string_view ( requires c++-14) -rm core/foundation/inc/libcpp_string_view.h \ - core/foundation/inc/RWrap_libcpp_string_view.h +rm core/foundation/inc/ROOT/libcpp_string_view.h \ + core/foundation/inc/ROOT/RWrap_libcpp_string_view.h %endif # * jsroot rm -rf etc/http/* -# Remove bundled fonts provided by the OS distributions -%if %{?fedora}%{!?fedora:0} >= 11 -rm fonts/DroidSansFallback.ttf -%endif +# Fix file permissions +chmod -x interpreter/llvm/src/lib/Target/X86/X86EvexToVex.cpp # Remove unsupported man page macros sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/* @@ -1795,6 +1840,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dgnuinstall:BOOL=ON \ -Dbuiltin_afterimage:BOOL=OFF \ -Dbuiltin_cfitsio:BOOL=OFF \ + -Dbuiltin_clang:BOOL=ON \ -Dbuiltin_davix:BOOL=OFF \ -Dbuiltin_fftw3:BOOL=OFF \ -Dbuiltin_freetype:BOOL=OFF \ @@ -1813,15 +1859,18 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dbuiltin_vdt:BOOL=OFF \ -Dbuiltin_veccore:BOOL=OFF \ -Dbuiltin_xrootd:BOOL=OFF \ + -Dbuiltin_xxhash:BOOL=OFF \ -Dbuiltin_zlib:BOOL=OFF \ -Dafdsmgrd:BOOL=OFF \ -Dafs:BOOL=OFF \ -Dalien:BOOL=OFF \ + -Darrow:BOOL=OFF \ -Dasimage:BOOL=ON \ -Dastiff:BOOL=ON \ -Dbonjour:BOOL=ON \ -Dcastor:BOOL=OFF \ -Dccache:BOOL=OFF \ + -Dcefweb:BOOL=OFF \ -Dchirp:BOOL=OFF \ -Dcling:BOOL=ON \ -Dcocoa:BOOL=OFF \ @@ -1844,11 +1893,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dfortran:BOOL=ON \ -Dgdml:BOOL=ON \ -Dgenvector:BOOL=ON \ -%if %{oce} -Dgeocad:BOOL=ON \ -%else - -Dgeocad:BOOL=OFF \ -%endif -Dgfal:BOOL=ON \ -Dglite:BOOL=OFF \ -Dglobus:BOOL=ON \ @@ -1860,7 +1905,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dhdfs:BOOL=OFF \ %endif -Dhttp:BOOL=ON \ -%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 8 +%if %{tbb} -Dimt:BOOL=ON \ %else -Dimt:BOOL=OFF \ @@ -1881,24 +1926,21 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dpch:BOOL=ON \ -Dpgsql:BOOL=ON \ -Dpythia6:BOOL=OFF \ -%if %{pythia8} -Dpythia8:BOOL=ON \ -%else - -Dpythia8:BOOL=OFF \ -%endif -Dpython:BOOL=ON \ - -Dpython3:BOOL=OFF \ + -DPYTHON_EXECUTABLE:PATH=%{__python2} \ -Dqt:BOOL=ON \ -Dqtgsi:BOOL=ON \ +%ifarch %{qt5_qtwebengine_arches} + -Dqt5web:BOOL=ON \ +%else + -Dqt5web:BOOL=OFF \ +%endif -Dr:BOOL=ON \ -Drfio:BOOL=ON \ -Droofit:BOOL=ON \ -Drpath:BOOL=OFF \ -%if %{ruby} - -Druby:BOOL=ON \ -%else -Druby:BOOL=OFF \ -%endif -Druntime_cxxmodules:BOOL=OFF \ -Dsapdb:BOOL=OFF \ -Dshadowpw:BOOL=ON \ @@ -1911,6 +1953,12 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dtcmalloc:BOOL=OFF \ -Dthread:BOOL=ON \ -Dtmva:BOOL=ON \ +%if %{tbb} + -Dtmva-cpu:BOOL=ON \ +%else + -Dtmva-cpu:BOOL=OFF \ +%endif + -Dtmva-gpu:BOOL=OFF \ -Dunuran:BOOL=ON \ -Dvc:BOOL=OFF \ -Dvdt:BOOL=OFF \ @@ -1919,11 +1967,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dx11:BOOL=ON \ -Dxft:BOOL=ON \ -Dxml:BOOL=ON \ -%if %{xrootd} -Dxrootd:BOOL=ON \ -%else - -Dxrootd:BOOL=OFF \ -%endif -Dfail-on-missing:BOOL=ON \ -Dtesting:BOOL=ON \ -Dclingtest:BOOL=OFF \ @@ -1947,7 +1991,7 @@ py2l=`pkg-config --libs-only-l python2 | sed -e 's/-l//' -e 's/\s*$//'` py3i=`pkg-config --cflags-only-I python3 | sed -e 's/-I//' -e 's/\s*$//'` py3l=`pkg-config --libs-only-l python3 | sed -e 's/-l//' -e 's/\s*$//'` sed -e "s,${py2i},${py3i},g" -e "s,-l${py2l},-l${py3l},g" \ - -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python},%{__python3},g' \ + -e "s,lib${py2l},lib${py3l},g" -e 's,%{__python2},%{__python3},g' \ -e 's,lib/libPyROOT,python/libPyROOT,g' \ -e 's,lib/libJupyROOT,python/libJupyROOT,g' \ -e 's!bindings/pyroot!bindings/python!g' -i `find bindings/python -type f` @@ -2032,7 +2076,7 @@ DESTDIR=$tmpdir cmake3 -P builddir/bindings/python/cmake_install.cmake mkdir -p %{buildroot}%{python3_sitearch} mv $tmpdir%{_libdir}/%{name}/libPyROOT.so.%{version} \ - %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so + %{buildroot}%{python3_sitearch}/libPyROOT.%{py3soabi}.so mv $tmpdir%{_libdir}/%{name}/libJupyROOT.so.%{version} \ %{buildroot}%{python3_sitearch}/libJupyROOT.so mv $tmpdir%{_libdir}/%{name}/*.py %{buildroot}%{python3_sitearch} @@ -2048,26 +2092,26 @@ mv $tmpdir%{_libdir}/%{name}/JsMVA %{buildroot}%{python3_sitelib} rm -rf $tmpdir -%if %{ruby} -# The Ruby interface library must be in two places -mkdir -p %{buildroot}%{ruby_vendorarchdir} -mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version} \ - %{buildroot}%{ruby_vendorarchdir}/libRuby.so -ln -s ..`sed 's!%{_libdir}!!' <<< %{ruby_vendorarchdir}`/libRuby.so \ - %{buildroot}%{_libdir}/%{name}/libRuby.so.%{version} -%endif +# Create empty .dist-info files so that rpm auto-generates provides +touch %{buildroot}%{python2_sitearch}/ROOT-%{version}.dist-info +touch %{buildroot}%{python2_sitearch}/JupyROOT-%{version}.dist-info +touch %{buildroot}%{python2_sitelib}/JsMVA-%{version}.dist-info + +touch %{buildroot}%{python3_sitearch}/ROOT-%{version}.dist-info +touch %{buildroot}%{python3_sitearch}/JupyROOT-%{version}.dist-info +touch %{buildroot}%{python3_sitelib}/JsMVA-%{version}.dist-info # Put jupyter stuff in the right places mkdir -p %{buildroot}%{_datadir}/jupyter/kernels cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \ %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot -sed -e 's/ROOT C++/& (Python 2)/' -e 's!python!/usr/bin/python2!' \ +sed -e 's/ROOT C++/& (Python 2)/' -e 's!python!%{__python2}!' \ -i %{buildroot}%{_datadir}/jupyter/kernels/python2-jupyroot/kernel.json cp -pr %{buildroot}%{_datadir}/%{name}/notebook/kernels/root \ %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot -sed -e 's/ROOT C++/& (Python 3)/' -e 's!python!/usr/bin/python3!' \ +sed -e 's/ROOT C++/& (Python 3)/' -e 's!python!%{__python3}!' \ -i %{buildroot}%{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot/kernel.json rm -rf %{buildroot}%{_datadir}/%{name}/notebook/custom @@ -2087,7 +2131,6 @@ if [ -z "\$(type jupyter-notebook 2>/dev/null)" ] ; then echo jupyter-notebook not found in path. Exiting. exit 1 fi -rm -rf ~/.rootnb jupyter notebook EOF @@ -2096,7 +2139,7 @@ mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir} # Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location) sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config -sed -e 's!/usr/bin/env python!/usr/bin/python!' \ +sed -e 's!/usr/bin/env python2!%{__python2}!' \ -e '/import sys/d' \ -e '/import cmdLineUtils/iimport sys' \ -e '/import cmdLineUtils/isys.path.insert(0, "%{_datadir}/%{name}/cli")' \ @@ -2109,13 +2152,14 @@ sed -e 's!/usr/bin/env python!/usr/bin/python!' \ %{buildroot}%{_bindir}/rootprint \ %{buildroot}%{_bindir}/rootrm \ %{buildroot}%{_bindir}/rootslimtree +sed -e 's!/usr/bin/env python2!%{__python2}!' \ + -i %{buildroot}%{_bindir}/rootdrawtree sed -e '/^\#!/d' \ -i %{buildroot}%{_datadir}/%{name}/cli/cmdLineUtils.py \ %{buildroot}%{python2_sitearch}/JupyROOT/kernel/rootkernel.py \ %{buildroot}%{python3_sitearch}/JupyROOT/kernel/rootkernel.py -sed -e 's!/usr/bin/env python!/usr/bin/python!' \ - -i %{buildroot}%{_bindir}/rootdrawtree \ - %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \ +sed -e 's!/usr/bin/env python!%{__python2}!' \ + -i %{buildroot}%{_datadir}/%{name}/dictpch/makepch.py \ %{buildroot}%{_pkgdocdir}/tutorials/histfactory/example.py \ %{buildroot}%{_pkgdocdir}/tutorials/histfactory/makeQuickModel.py \ %{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/ApplicationClassificationKeras.py \ @@ -2143,9 +2187,6 @@ rm %{buildroot}%{_mandir}/man1/genmap.1 rm %{buildroot}%{_mandir}/man1/proofserva.1 rm %{buildroot}%{_mandir}/man1/roota.1 rm %{buildroot}%{_mandir}/man1/setup-pq2.1 -%if %{xrootd} == 0 -rm %{buildroot}%{_mandir}/man1/xproofd.1 -%endif rm %{buildroot}%{_includedir}/%{name}/*.cw rm %{buildroot}%{_includedir}/%{name}/*.pri rm %{buildroot}%{_pkgdocdir}/INSTALL @@ -2183,14 +2224,6 @@ rm TVirtualGLImp/P020_TGWin32GL.C rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C rm TVirtualX/P030_TGWin32.C rm TVirtualX/P050_TGQuartz.C -%if %{xrootd} == 0 -rm TFile/P100_TXNetFile.C -rm TFileStager/P010_TXNetFileStager.C -rm TProofMgr/P010_TXProofMgr.C -rm TProofServ/P010_TXProofServ.C -rm TSlave/P010_TXSlave.C -rm TSystem/P040_TXNetSystem.C -%endif rmdir TAFS rmdir TDataProgressDialog rmdir TGrid @@ -2220,7 +2253,7 @@ ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \ ROOTSYS=${PWD}/../../builddir \ LD_LIBRARY_PATH=${PWD}/../../builddir/lib \ PYTHONPATH=${PWD}/../../builddir/lib \ - python ../../tutorials/pyroot/hsimple.py + %{__python2} ../../tutorials/pyroot/hsimple.py ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \ ROOTSYS=${PWD}/../../builddir \ LD_LIBRARY_PATH=${PWD}/../../builddir/lib \ @@ -2248,11 +2281,7 @@ done cat includelist-core-{[^mw],m[^au]}* > includelist-core cat includelist-geom-geom* > includelist-geom cat includelist-roofit-roo* > includelist-roofit -cat includelist-gui-qt* > includelist-gui-qt cat includelist-graf2d-x11ttf >> includelist-graf2d-x11 -cat includelist-gui-guihtml >> includelist-gui-gui -cat includelist-io-xmlparser >> includelist-io-xml -cat includelist-proof-proofplayer >> includelist-proof-proof cat includelist-net-netx* > includelist-netx %check @@ -2262,14 +2291,20 @@ ln -s ../../files files popd pushd runtutorials ln -s ../../files files -ln -sf ../../files/tutorials/tdf014_CsvDataSource_MuRun2010B.csv +ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv +popd +pushd tmva/tmva/test/DNN/CNN +ln -s ../../../../../../files files +popd +pushd tmva/tmva/test/envelope +ln -s ../../../../../files files popd # Exclude some tests that can not be run # # - test-stressIOPlugins-* # requires network access (by design since they test the remote file IO) # -# - tutorial-dataframe-tdf101_h1Analysis +# - tutorial-dataframe-df101_h1Analysis # - tutorial-tree-run_h1analysis # - tutorial-multicore-imt001_parBranchProcessing # - tutorial-multicore-mp103_processSelector @@ -2282,26 +2317,16 @@ popd # # - tutorial-pythia-pythia8 # sometimes times out -excluded="test-stressIOPlugins-.*|tutorial-dataframe-tdf101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|tutorial-pythia-pythia8" +excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|tutorial-pythia-pythia8" %ifarch %{arm} -# Tests failing on arm -# https://sft.its.cern.ch/jira/browse/ROOT-8500 -# - gtest-tree-treeplayer-test-dataframe-snapshot -# - mathcore-testMinim -# - minuit2-testMinimizer -# - test-minexam -# - test-stressfit (but -interpreted works) # Tests failing on arm on Fedora <= 27 +# https://sft.its.cern.ch/jira/browse/ROOT-8500 # - test-stressiterators-interpreted # - tutorial-hist-sparsehist -# - tutorial-multicore-mt303_AsyncSimple -# - tutorial-multicore-mt304_AsyncNested -# - tutorial-multicore-mt305_TFuture # - tutorial-r-* -excluded="${excluded}|gtest-tree-treeplayer-test-dataframe-snapshot|mathcore-testMinim|minuit2-testMinimizer|test-minexam|test-stressfit" %if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7 -excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-multicore-mt303_AsyncSimple|tutorial-multicore-mt304_AsyncNested|tutorial-multicore-mt305_TFuture|tutorial-r-.*" +excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*" %endif %endif @@ -2314,24 +2339,8 @@ excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist| # - tutorial-roofit-rf511_wsfactory_basic # - tutorial-roostats-rs102_hypotestwithshapes (work on EPEL 7) # - tutorial-roostats-rs701_BayesianCalculator -# - tutorial-dataframe-tdf006_ranges-py -excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator|tutorial-dataframe-tdf006_ranges-py" -%endif - -%ifarch ppc64le -# Tests failing on ppc64le -# - test-stresshistogram[-interpreted] -excluded="${excluded}|test-stresshistogram" -%endif - -# Test failing on 32 bit on Fedora <= 27 -# https://sft.its.cern.ch/jira/browse/ROOT-9236 -# https://sft.its.cern.ch/jira/browse/ROOT-9265 -# - gtest-tree-treeplayer-test-dataframe-snapshot -%ifarch %{ix86} %{arm} -%if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7 -excluded="${excluded}|gtest-tree-treeplayer-test-dataframe-snapshot" -%endif +# - tutorial-dataframe-df006_ranges-py +excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator|tutorial-dataframe-df006_ranges-py" %endif make test ARGS="%{?_smp_mflags} --output-on-failure -E \"${excluded}\"" @@ -2421,20 +2430,20 @@ if [ -r /var/lib/alternatives/libPyROOT.so ] ; then sed 's!\(%{_libdir}/%{name}/libPyROOT\.so\.\).*!\1%{version}!' \ -i /var/lib/alternatives/libPyROOT.so for alt in `grep python3 /var/lib/alternatives/libPyROOT.so` ; do - if [ "$alt" != "%{python3_sitearch}/libPyROOT%{py3soabi}.so" ] ; then + if [ "$alt" != "%{python3_sitearch}/libPyROOT.%{py3soabi}.so" ] ; then %{_sbindir}/update-alternatives --remove libPyROOT.so $alt fi done fi %{_sbindir}/update-alternatives --install \ %{_libdir}/%{name}/libPyROOT.so.%{version} \ - libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10 + libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so 10 /sbin/ldconfig %preun -n python%{python3_pkgversion}-%{name} if [ $1 = 0 ]; then %{_sbindir}/update-alternatives --remove \ - libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so + libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so fi %postun -n python%{python3_pkgversion}-%{name} -p /sbin/ldconfig @@ -2444,7 +2453,7 @@ fi # for python%{python3_pkgversion}-%{name} - put them back in this triggerpostun script %{_sbindir}/update-alternatives --install \ %{_libdir}/%{name}/libPyROOT.so.%{version} \ - libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10 + libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3soabi}.so 10 /sbin/ldconfig %post notebook @@ -2475,10 +2484,6 @@ fi %postun multiproc -p /sbin/ldconfig %post cling -p /sbin/ldconfig %postun cling -p /sbin/ldconfig -%if %{ruby} -%post ruby -p /sbin/ldconfig -%postun ruby -p /sbin/ldconfig -%endif %post r -p /sbin/ldconfig %postun r -p /sbin/ldconfig %post r-tools -p /sbin/ldconfig @@ -2489,10 +2494,8 @@ fi %postun geom -p /sbin/ldconfig %post gdml -p /sbin/ldconfig %postun gdml -p /sbin/ldconfig -%if %{oce} %post geocad -p /sbin/ldconfig %postun geocad -p /sbin/ldconfig -%endif %post graf -p /sbin/ldconfig %postun graf -p /sbin/ldconfig %post graf-asimage -p /sbin/ldconfig @@ -2521,30 +2524,24 @@ fi %postun graf3d-x3d -p /sbin/ldconfig %post gui -p /sbin/ldconfig %postun gui -p /sbin/ldconfig +%post gui-html -p /sbin/ldconfig +%postun gui-html -p /sbin/ldconfig %post gui-fitpanel -p /sbin/ldconfig %postun gui-fitpanel -p /sbin/ldconfig %post gui-ged -p /sbin/ldconfig %postun gui-ged -p /sbin/ldconfig -%post guibuilder -p /sbin/ldconfig -%postun guibuilder -p /sbin/ldconfig +%post gui-builder -p /sbin/ldconfig +%postun gui-builder -p /sbin/ldconfig %post gui-qt -p /sbin/ldconfig %postun gui-qt -p /sbin/ldconfig +%post gui-qtgsi -p /sbin/ldconfig +%postun gui-qtgsi -p /sbin/ldconfig %post gui-recorder -p /sbin/ldconfig %postun gui-recorder -p /sbin/ldconfig -%if %{root7} -%post gui-canvaspainter -p /sbin/ldconfig -%postun gui-canvaspainter -p /sbin/ldconfig -%post gui-webdisplay -p /sbin/ldconfig -%postun gui-webdisplay -p /sbin/ldconfig -%endif %post hbook -p /sbin/ldconfig %postun hbook -p /sbin/ldconfig %post hist -p /sbin/ldconfig %postun hist -p /sbin/ldconfig -%if %{root7} -%post hist-draw -p /sbin/ldconfig -%postun hist-draw -p /sbin/ldconfig -%endif %post hist-painter -p /sbin/ldconfig %postun hist-painter -p /sbin/ldconfig %post spectrum -p /sbin/ldconfig @@ -2571,6 +2568,8 @@ fi %postun io-sql -p /sbin/ldconfig %post io-xml -p /sbin/ldconfig %postun io-xml -p /sbin/ldconfig +%post io-xmlparser -p /sbin/ldconfig +%postun io-xmlparser -p /sbin/ldconfig %post foam -p /sbin/ldconfig %postun foam -p /sbin/ldconfig %post fftw -p /sbin/ldconfig @@ -2601,16 +2600,16 @@ fi %postun splot -p /sbin/ldconfig %post unuran -p /sbin/ldconfig %postun unuran -p /sbin/ldconfig +%post vecops -p /sbin/ldconfig +%postun vecops -p /sbin/ldconfig %post memstat -p /sbin/ldconfig %postun memstat -p /sbin/ldconfig %post table -p /sbin/ldconfig %postun table -p /sbin/ldconfig %post montecarlo-eg -p /sbin/ldconfig %postun montecarlo-eg -p /sbin/ldconfig -%if %{pythia8} %post montecarlo-pythia8 -p /sbin/ldconfig %postun montecarlo-pythia8 -p /sbin/ldconfig -%endif %post montecarlo-vmc -p /sbin/ldconfig %postun montecarlo-vmc -p /sbin/ldconfig %post net -p /sbin/ldconfig @@ -2639,18 +2638,20 @@ if st and st.type == "directory" then os.execute("rm -rf " .. path) end -%if %{xrootd} +%post net-httpsniff -p /sbin/ldconfig +%postun net-httpsniff -p /sbin/ldconfig %post netx -p /sbin/ldconfig %postun netx -p /sbin/ldconfig -%endif %post proof -p /sbin/ldconfig %postun proof -p /sbin/ldconfig +%post proof-bench -p /sbin/ldconfig +%postun proof-bench -p /sbin/ldconfig +%post proof-player -p /sbin/ldconfig +%postun proof-player -p /sbin/ldconfig %post proof-sessionviewer -p /sbin/ldconfig %postun proof-sessionviewer -p /sbin/ldconfig -%if %{xrootd} %post xproof -p /sbin/ldconfig %postun xproof -p /sbin/ldconfig -%endif %post roofit -p /sbin/ldconfig %postun roofit -p /sbin/ldconfig %post sql-mysql -p /sbin/ldconfig @@ -2671,12 +2672,32 @@ end %postun tmva-gui -p /sbin/ldconfig %post tree -p /sbin/ldconfig %postun tree -p /sbin/ldconfig +%post tree-dataframe -p /sbin/ldconfig +%postun tree-dataframe -p /sbin/ldconfig %post tree-player -p /sbin/ldconfig %postun tree-player -p /sbin/ldconfig %post tree-viewer -p /sbin/ldconfig %postun tree-viewer -p /sbin/ldconfig %post unfold -p /sbin/ldconfig %postun unfold -p /sbin/ldconfig +%if %{root7} +%post graf-gpadv7 -p /sbin/ldconfig +%postun graf-gpadv7 -p /sbin/ldconfig +%post graf-primitives -p /sbin/ldconfig +%postun graf-primitives -p /sbin/ldconfig +%post gui-canvaspainter -p /sbin/ldconfig +%postun gui-canvaspainter -p /sbin/ldconfig +%post gui-fitpanelv7 -p /sbin/ldconfig +%postun gui-fitpanelv7 -p /sbin/ldconfig +%ifarch %{qt5_qtwebengine_arches} +%post gui-qt5webdisplay -p /sbin/ldconfig +%postun gui-qt5webdisplay -p /sbin/ldconfig +%endif +%post gui-webdisplay -p /sbin/ldconfig +%postun gui-webdisplay -p /sbin/ldconfig +%post hist-draw -p /sbin/ldconfig +%postun hist-draw -p /sbin/ldconfig +%endif %files %{_bindir}/hadd @@ -2747,7 +2768,10 @@ end %{_includedir}/%{name}/RConfigure.h %{_includedir}/%{name}/RGitCommit.h %{_includedir}/%{name}/compiledata.h +%{_includedir}/%{name}/libc.modulemap %{_includedir}/%{name}/module.modulemap +%{_includedir}/%{name}/stl.modulemap +%{_includedir}/%{name}/modulemap.overlay.yaml %dir %{_includedir}/%{name}/Math %dir %{_includedir}/%{name}/ROOT %{_datadir}/aclocal/root.m4 @@ -2809,6 +2833,7 @@ end %{_libdir}/%{name}/libPyROOT_rdict.pcm %{python2_sitearch}/libPyROOT.so %{python2_sitearch}/ROOT.py* +%{python2_sitearch}/ROOT-*.dist-info %{python2_sitearch}/cppyy.py* %{python2_sitearch}/_pythonization.py* @@ -2818,36 +2843,34 @@ end %{_libdir}/%{name}/libPyROOT.so.%{libversion} %ghost %{_libdir}/%{name}/libPyROOT.so.%{version} %{_libdir}/%{name}/libPyROOT_rdict.pcm -%{python3_sitearch}/libPyROOT%{py3soabi}.so +%{python3_sitearch}/libPyROOT.%{py3soabi}.so %{python3_sitearch}/ROOT.py +%{python3_sitearch}/ROOT-*.dist-info %{python3_sitearch}/cppyy.py %{python3_sitearch}/_pythonization.py %{python3_sitearch}/__pycache__ %files -n python2-jupyroot %{python2_sitearch}/JupyROOT +%{python2_sitearch}/JupyROOT-*.dist-info %{python2_sitearch}/libJupyROOT.so %{_datadir}/jupyter/kernels/python2-jupyroot %doc bindings/pyroot/JupyROOT/README.md %files -n python%{python3_pkgversion}-jupyroot %{python3_sitearch}/JupyROOT +%{python3_sitearch}/JupyROOT-*.dist-info %{python3_sitearch}/libJupyROOT.so %{_datadir}/jupyter/kernels/python%{python3_pkgversion}-jupyroot %doc bindings/pyroot/JupyROOT/README.md %files -n python2-jsmva %{python2_sitelib}/JsMVA +%{python2_sitelib}/JsMVA-*.dist-info %files -n python%{python3_pkgversion}-jsmva %{python3_sitelib}/JsMVA - -%if %{ruby} -%files ruby -f includelist-bindings-ruby -%{_libdir}/%{name}/libRuby.* -%{_libdir}/%{name}/libRuby_rdict.pcm -%{ruby_vendorarchdir}/libRuby.* -%endif +%{python3_sitelib}/JsMVA-*.dist-info %files r -f includelist-bindings-r %{_libdir}/%{name}/libRInterface.* @@ -2879,11 +2902,9 @@ end %{_libdir}/%{name}/libGdml.* %{_libdir}/%{name}/libGdml_rdict.pcm -%if %{oce} %files geocad -f includelist-geom-geocad %{_libdir}/%{name}/libGeoCad.* %{_libdir}/%{name}/libGeoCad_rdict.pcm -%endif %files graf -f includelist-graf2d-graf %{_libdir}/%{name}/libGraf.* @@ -2965,13 +2986,15 @@ end %files gui -f includelist-gui-gui %{_libdir}/%{name}/libGui.* %{_libdir}/%{name}/libGui_rdict.pcm -%{_libdir}/%{name}/libGuiHtml.* -%{_libdir}/%{name}/libGuiHtml_rdict.pcm %{_datadir}/%{name}/plugins/TBrowserImp/P010_TRootBrowser.C %{_datadir}/%{name}/plugins/TBrowserImp/P020_TRootBrowserLite.C %{_datadir}/%{name}/plugins/TGPasswdDialog/P010_TGPasswdDialog.C %{_datadir}/%{name}/plugins/TGuiFactory/P010_TRootGuiFactory.C +%files gui-html -f includelist-gui-guihtml +%{_libdir}/%{name}/libGuiHtml.* +%{_libdir}/%{name}/libGuiHtml_rdict.pcm + %files gui-fitpanel -f includelist-gui-fitpanel %{_libdir}/%{name}/libFitPanel.* %{_libdir}/%{name}/libFitPanel_rdict.pcm @@ -2982,32 +3005,25 @@ end %{_libdir}/%{name}/libGed_rdict.pcm %{_datadir}/%{name}/plugins/TVirtualPadEditor/P010_TGedEditor.C -%files guibuilder -f includelist-gui-guibuilder +%files gui-builder -f includelist-gui-guibuilder %{_libdir}/%{name}/libGuiBld.* %{_libdir}/%{name}/libGuiBld_rdict.pcm %{_datadir}/%{name}/plugins/TGuiBuilder/P010_TRootGuiBuilder.C %{_datadir}/%{name}/plugins/TVirtualDragManager/P010_TGuiBldDragManager.C -%files gui-qt -f includelist-gui-qt +%files gui-qt -f includelist-gui-qtroot %{_libdir}/%{name}/libQtRoot.* %{_libdir}/%{name}/libQtRoot_rdict.pcm +%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C + +%files gui-qtgsi -f includelist-gui-qtgsi %{_libdir}/%{name}/libQtGSI.* %{_libdir}/%{name}/libQtGSI_rdict.pcm -%{_datadir}/%{name}/plugins/TGuiFactory/P020_TQtRootGuiFactory.C %files gui-recorder -f includelist-gui-recorder %{_libdir}/%{name}/libRecorder.* %{_libdir}/%{name}/libRecorder_rdict.pcm -%if %{root7} -%files gui-canvaspainter -%{_libdir}/%{name}/libROOTCanvasPainter.* - -%files gui-webdisplay -f includelist-gui-webdisplay -%{_libdir}/%{name}/libROOTWebDisplay.* -%{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm -%endif - %files hbook -f includelist-hist-hbook %{_bindir}/g2root %{_bindir}/h2root @@ -3021,12 +3037,6 @@ end %{_libdir}/%{name}/libHist_rdict.pcm %dir %{_includedir}/%{name}/v5 -%if %{root7} -%files hist-draw -f includelist-hist-histdraw -%{_libdir}/%{name}/libROOTHistDraw.* -%{_libdir}/%{name}/libROOTHistDraw_rdict.pcm -%endif - %files hist-painter -f includelist-hist-histpainter %{_libdir}/%{name}/libHistPainter.* %{_libdir}/%{name}/libHistPainter_rdict.pcm @@ -3095,9 +3105,11 @@ end %files io-xml -f includelist-io-xml %{_libdir}/%{name}/libXMLIO.* %{_libdir}/%{name}/libXMLIO_rdict.pcm +%{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C + +%files io-xmlparser -f includelist-io-xmlparser %{_libdir}/%{name}/libXMLParser.* %{_libdir}/%{name}/libXMLParser_rdict.pcm -%{_datadir}/%{name}/plugins/TFile/P080_TXMLFile.C %files foam -f includelist-math-foam %{_libdir}/%{name}/libFoam.* @@ -3191,6 +3203,10 @@ end %{_libdir}/%{name}/libUnuran_rdict.pcm %{_datadir}/%{name}/plugins/ROOT@@Math@@DistSampler/P010_TUnuranSampler.C +%files vecops -f includelist-math-vecops +%{_libdir}/%{name}/libROOTVecOps.* +%{_libdir}/%{name}/libROOTVecOps_rdict.pcm + %files memstat -f includelist-misc-memstat %{_libdir}/%{name}/libMemStat.* %{_libdir}/%{name}/libMemStat_rdict.pcm @@ -3205,11 +3221,9 @@ end %{_datadir}/%{name}/pdg_table.txt %doc %{_pkgdocdir}/cfortran.doc -%if %{pythia8} %files montecarlo-pythia8 -f includelist-montecarlo-pythia8 %{_libdir}/%{name}/libEGPythia8.* %{_libdir}/%{name}/libEGPythia8_rdict.pcm -%endif %files montecarlo-vmc -f includelist-montecarlo-vmc %{_libdir}/%{name}/libVMC.* @@ -3266,7 +3280,10 @@ end %{_datadir}/%{name}/http %doc net/http/README.txt net/http/civetweb/*.md -%if %{xrootd} +%files net-httpsniff -f includelist-net-httpsniff +%{_libdir}/%{name}/libRHTTPSniff.* +%{_libdir}/%{name}/libRHTTPSniff_rdict.pcm + %files netx -f includelist-netx %{_libdir}/%{name}/libNetx.* %{_libdir}/%{name}/libNetx_rdict.pcm @@ -3275,21 +3292,24 @@ end %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C %{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C -%endif %files proof -f includelist-proof-proof %{_libdir}/%{name}/libProof.* %{_libdir}/%{name}/libProof_rdict.pcm -%{_libdir}/%{name}/libProofDraw.* -%{_libdir}/%{name}/libProofDraw_rdict.pcm -%{_libdir}/%{name}/libProofPlayer.* -%{_libdir}/%{name}/libProofPlayer_rdict.pcm %{_datadir}/%{name}/plugins/TChain/P010_TProofChain.C %{_datadir}/%{name}/plugins/TDataSetManager/P010_TDataSetManagerFile.C %{_datadir}/%{name}/plugins/TProof/P010_TProofCondor.C %{_datadir}/%{name}/plugins/TProof/P020_TProofSuperMaster.C %{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C %{_datadir}/%{name}/plugins/TProof/P040_TProof.C +%{_datadir}/%{name}/valgrind-root.supp +%doc %{_pkgdocdir}/README.PROOF + +%files proof-player -f includelist-proof-proofplayer +%{_libdir}/%{name}/libProofDraw.* +%{_libdir}/%{name}/libProofDraw_rdict.pcm +%{_libdir}/%{name}/libProofPlayer.* +%{_libdir}/%{name}/libProofPlayer_rdict.pcm %{_datadir}/%{name}/plugins/TProofMonSender/P010_TProofMonSenderML.C %{_datadir}/%{name}/plugins/TProofMonSender/P020_TProofMonSenderSQL.C %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P010_TProofPlayer.C @@ -3298,8 +3318,6 @@ end %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P040_TProofPlayerSlave.C %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C %{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C -%{_datadir}/%{name}/valgrind-root.supp -%doc %{_pkgdocdir}/README.PROOF %files proof-bench -f includelist-proof-proofbench %{_libdir}/%{name}/libProofBench.* @@ -3317,7 +3335,6 @@ end %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C -%if %{xrootd} %files xproof -f includelist-proof-proofx %{_bindir}/proofexecv %{_bindir}/xproofd @@ -3328,7 +3345,6 @@ end %{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C %{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C %{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C -%endif %files roofit -f includelist-roofit %{_libdir}/%{name}/libRooFit.* @@ -3363,6 +3379,12 @@ end %{_libdir}/%{name}/libTMVA.* %{_libdir}/%{name}/libTMVA_rdict.pcm %dir %{_includedir}/%{name}/TMVA +%dir %{_includedir}/%{name}/TMVA/DNN +%dir %{_includedir}/%{name}/TMVA/DNN/Architectures +%if %{tbb} +%dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Cpu +%endif +%dir %{_includedir}/%{name}/TMVA/DNN/Architectures/Reference %license tmva/doc/LICENSE %files tmva-python -f includelist-tmva-pymva @@ -3382,6 +3404,10 @@ end %{_libdir}/%{name}/libTree_rdict.pcm %doc %{_pkgdocdir}/README.SELECTOR +%files tree-dataframe -f includelist-tree-dataframe +%{_libdir}/%{name}/libROOTDataFrame.* +%{_libdir}/%{name}/libROOTDataFrame_rdict.pcm + %files tree-player -f includelist-tree-treeplayer %{_libdir}/%{name}/libTreePlayer.* %{_libdir}/%{name}/libTreePlayer_rdict.pcm @@ -3414,7 +3440,76 @@ end %{_bindir}/rootnb.exe %{_datadir}/%{name}/notebook +%if %{root7} +%files graf-gpadv7 -f includelist-graf2d-gpadv7 +%{_libdir}/%{name}/libROOTGpadv7.* +%{_libdir}/%{name}/libROOTGpadv7_rdict.pcm + +%files graf-primitives -f includelist-graf2d-primitives +%{_libdir}/%{name}/libROOTGraphicsPrimitives.* +%{_libdir}/%{name}/libROOTGraphicsPrimitives_rdict.pcm + +%files gui-canvaspainter +%{_libdir}/%{name}/libROOTCanvasPainter.* + +%files gui-fitpanelv7 -f includelist-gui-fitpanelv7 +%{_libdir}/%{name}/libROOTFitPanelv7.* +%{_libdir}/%{name}/libROOTFitPanelv7_rdict.pcm + +%ifarch %{qt5_qtwebengine_arches} +%files gui-qt5webdisplay +%{_libdir}/%{name}/libROOTQt5WebDisplay.* +%endif + +%files gui-webdisplay -f includelist-gui-webdisplay +%{_libdir}/%{name}/libROOTWebDisplay.* +%{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm + +%files hist-draw -f includelist-hist-histdraw +%{_libdir}/%{name}/libROOTHistDraw.* +%{_libdir}/%{name}/libROOTHistDraw_rdict.pcm +%endif + %changelog +* Sun Jul 01 2018 Mattias Ellert - 6.14.00-1 +- Update to 6.14.00 +- Drop patches previously backported: + - root-doxygen-makefile.patch + - root-crash-fix.patch + - root-test-stress-32bit.patch +- Drop patches accepted upstream: + - root-test-subdirs.patch + - root-test-fixes.patch + - root-out-of-bounds.patch + - root-doxygen-tilde.patch + - root-noinst.patch +- Drop patches for issues fixed upstream: + - root-dont-link-jvm.patch + - root-system-pythia.patch +- Drop patch root-urw-otf-hack.patch - broken font file no longer present +- Drop Google Droid Sans Fallback font from EPEL 7 root-fonts package + (the font is now available in EPEL 7) +- Use two more patches from Fedora's llvm5.0 package +- New root-test-subdirs.patch patch for more instances of the same issue +- Fix a test not setting cache file directory so that it works offline +- Fix a compatibility issue with the EPEL 7 gtest version +- Fix a missing include +- Workaround optimization problems in the Geom library +- New subpackages due to library splits + - root-tree-dataframe and root-vecops from root-tree-player + - root-net-httpsniff from root-net-http +- New subpackages due to package splits + - root-gui-html from root-gui + - root-gui-qtgsi from root-gui-qt + - root-io-xmlparser from root-io-xml + - root-proof-player from root-proof +- New ROOT 7 subpackages + - graf-gpadv7 + - graf-primitives + - gui-fitpanelv7 + - gui-qt5webdisplay +- Rename root-guibuilder package to root-gui-builder + * Sat Jun 30 2018 Mattias Ellert - 6.12.06-5 - Adjust Vavilov test for Fedora 29 ix86 - Adapt to python 3.7 diff --git a/sources b/sources index da8883b..54bccd9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (root-6.12.06.tar.xz) = 607644b5cd06fdab5e0899172156cbed92911de9d1eef2695cc79c5f41621a2d1167a6d14791c5b97c8d15dcb7d4d45952b3dcf4ffb096dc51bdeb3233b5467f -SHA512 (root-testfiles.tar.xz) = f697afb666c1081f98cfe66fe21998c4eab86c25a3671ff71a4ac98610d70f70081d70b40029a0b788b39d87c542b5aa4e31d71f7be494f4774323ed20e9bccb +SHA512 (root-6.14.00.tar.xz) = 0e4ed5a2a2e4c9455ffc8e44cdb1ca29876a223e8119d29cbd82abdc4b923d55b82285a941f78b82b9d0a89d972e5d56ceb3b7d61fd2efd8308c64c3e2bfd5d9 +SHA512 (root-testfiles.tar.xz) = 22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2