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

Retire packages without systemd support, See FESCo ticket 1605

Browse source
This commit is contained in:
Parag Nemade 2016-07-30 15:07:31 +05:30
commit f23b63a03f
48 changed files with 1 additions and 17566 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,3 +0,0 @@
/*.tar.gz
/*.tar.xz
/usa.root

1
dead.package Normal file
View file

@ -0,0 +1 @@
Retire packages without systemd support, See FESCo ticket 1605

78
root-32bit.patch
View file

@ -1,78 +0,0 @@
diff -ur root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx root-6.06.02/math/mathmore/test/testSpecFunc.cxx
--- root-6.06.02.orig/math/mathmore/test/testSpecFunc.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/test/testSpecFunc.cxx 2016-04-09 20:03:06.376713840 +0200
@@ -179,7 +179,7 @@
iret |= compare("hyperg(8, -8, 1, 0.5) ", hyperg(8, -8, 1, 0.5), 0.13671875);
- iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250); // need to find more precise value
+ iret |= compare("laguerre(4, 1.) ", laguerre(4, 1.), -0.6250, 4); // need to find more precise value
iret |= compare("legendre(10, -0.5) ", legendre(10, -0.5), -0.1882286071777345);
diff -ur root-6.06.02.orig/test/stressMathCore.cxx root-6.06.02/test/stressMathCore.cxx
--- root-6.06.02.orig/test/stressMathCore.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/test/stressMathCore.cxx 2016-04-09 20:03:06.395714018 +0200
@@ -1121,7 +1121,7 @@
if (Dim==4 && VecType<V2>::name() == "PtEtaPhiMVector") scale *= 10;
#if defined (R__LINUX) && !defined(R__B64)
// problem of precision on linux 32
- if (Dim ==4) scale = 1000000000;
+ if (Dim ==4) scale = 5000000000;
#endif
// for problem with PtEtaPhiE
if (Dim==4 && VecType<V2>::name() == "PtEtaPhiEVector") scale = 0.01/(std::numeric_limits<double>::epsilon());
diff -ur root-6.06.02.orig/test/TFormulaParsingTests.h root-6.06.02/test/TFormulaParsingTests.h
--- root-6.06.02.orig/test/TFormulaParsingTests.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/test/TFormulaParsingTests.h 2016-04-09 20:03:06.395714018 +0200
@@ -312,7 +312,7 @@
ok &= (f1->Eval(1.5,2.5) == f0->Eval(1.5,2.5) );
double par[2] = {3,4};
double xx[2] = {0.8,1.6};
- ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
+ ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
return ok;
}
@@ -326,7 +326,7 @@
ok &= (f1->Eval(1.5,2.5,3.5) == f0->Eval(1.5,2.5,3.5) );
double par[2] = {3,4};
double xx[3] = {0.8,1.6,2.2};
- ok &= (f1->EvalPar(xx,par) == f0->EvalPar(xx,par) );
+ ok &= TMath::AreEqualAbs(f1->EvalPar(xx,par), f0->EvalPar(xx,par), 2e-16);
return ok;
}
@@ -369,12 +369,12 @@
TF1 f0("f0",[](double *x, double *p){ return p[0]+p[1]*TMath::Gaus(x[0],p[2],p[3]); },-3,3,4 );
f2.SetParameters(10,1,0,1);
f0.SetParameters(f2.GetParameters() );
- ok &= (f2.Eval(1) == f0.Eval(1) );
+ ok &= TMath::AreEqualAbs(f2.Eval(1), f0.Eval(1), 7e-16);
TF1 f3("f3","f1+[0]");
// param order should be the same
f3.SetParameters( f2.GetParameters() );
- ok &= (f2.Eval(1) == f0.Eval(1) );
+ ok &= TMath::AreEqualAbs(f3.Eval(1), f0.Eval(1), 7e-16);
return ok;
}
@@ -465,7 +465,7 @@
auto func = [](double *x, double *p){ return TMath::Sqrt(((TMath::Sign(1,p[0])*TMath::Sq(p[0]/x[0]))+(TMath::Sq(p[1])*(TMath::Power(x[0],(p[3]-1)))))+TMath::Sq(p[2])); };
TF1 f6("f6",func,-10,10,4);
f5.SetParameters(-1,2,3,4); f6.SetParameters(f5.GetParameters());
- ok &= (f5.Eval(2) == f6.Eval(2) );
+ ok &= TMath::AreEqualAbs(f5.Eval(2), f6.Eval(2), 4.e-16);
return ok;
}
@@ -485,7 +485,7 @@
// keep same order in evaluation
TF1 f0("f0",[](double *x, double *p){ return p[1]*sin(x[0]) + p[0]*cos(x[0]);},0.,10.,2);
f0.SetParameters(1.1,2.1);
- ok &= (fsincos.Eval(2) == f0.Eval(2) );
+ ok &= TMath::AreEqualAbs(fsincos.Eval(2), f0.Eval(2), 3e-16);
return ok;
}

1267
root-abitags.patch
View file

File diff suppressed because it is too large Load diff

81
root-arm.patch
View file

@ -1,81 +0,0 @@
diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake 2016-04-06 09:42:10.258085039 +0200
+++ root-6.06.02/cmake/modules/SetUpLinux.cmake 2016-04-06 10:07:33.109883779 +0200
@@ -19,7 +19,7 @@
message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
endif()
elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
- message(STATUS "Found a 64bit system")
+ message(STATUS "Found a 64bit ARM system")
set(SPECIAL_CINT_FLAGS "-DG__64BIT")
if(CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "Found GNU compiler collection")
@@ -42,6 +42,18 @@
else()
message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
endif()
+elseif(${SYSCTL_OUTPUT} MATCHES arm)
+ message(STATUS "Found a 32bit ARM system")
+ set(SPECIAL_CINT_FLAGS "")
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "Found GNU compiler collection")
+ set(ROOT_ARCHITECTURE linuxarm)
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+ message(STATUS "Found CLANG compiler")
+ set(ROOT_ARCHITECTURE linuxarm)
+ else()
+ message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+ endif()
else()
message(STATUS "Found a 32bit system")
set(BIT_ENVIRONMENT "-m32")
diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
--- root-6.06.02.orig/core/pcre/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/pcre/CMakeLists.txt 2016-04-06 09:53:37.247748077 +0200
@@ -52,6 +52,8 @@
set(PCRE_CFLAGS "-m32 -O")
elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
set(PCRE_CFLAGS "-O")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+ set(PCRE_CFLAGS "-O")
elseif(ROOT_ARCHITECTURE MATCHES linux)
set(PCRE_CFLAGS "-m32 -O")
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake 2016-04-06 09:53:37.258748191 +0200
@@ -47,6 +47,8 @@
set(AFTER_CC "${AFTER_CC} -m64")
elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
set(AFTER_CC "${AFTER_CC}")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+ set(AFTER_CC "${AFTER_CC}")
elseif(ROOT_ARCHITECTURE MATCHES linux)
set(AFTER_CC "${AFTER_CC} -m32")
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf2d/freetype/CMakeLists.txt 2016-04-06 09:59:35.237876779 +0200
@@ -52,6 +52,10 @@
set(FREETYPE_CFLAGS "-m64 -O")
elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
set(FREETYPE_CFLAGS "-m64 -O")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
+ set(FREETYPE_CFLAGS "-O")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+ set(FREETYPE_CFLAGS "-O")
elseif(ROOT_ARCHITECTURE MATCHES linux)
set(FREETYPE_CFLAGS "-m32 -O")
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
--- root-6.06.02.orig/interpreter/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/interpreter/CMakeLists.txt 2016-04-06 09:53:37.270748316 +0200
@@ -17,6 +17,8 @@
if(ROOT_ARCHITECTURE MATCHES linuxarm64)
set(ROOT_CLING_TARGET "AArch64")
+elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
+ set(ROOT_CLING_TARGET "ARM")
elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
set(ROOT_CLING_TARGET "PowerPC")
elseif(ROOT_ARCHITECTURE MATCHES linux)

59
root-avoid-gui-crash.patch
View file

@ -1,59 +0,0 @@
diff -ur root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx root-6.06.02/gui/ged/src/TArrowEditor.cxx
--- root-6.06.02.orig/gui/ged/src/TArrowEditor.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/gui/ged/src/TArrowEditor.cxx 2016-03-29 15:00:55.706652094 +0200
@@ -30,7 +30,7 @@
shape, size, angle.</h2></center>
The picture below shows this interface.
End_Html
-Begin_Macro(GUI)
+~~~
{
gROOT->ProcessLine(".x $ROOTSYS/tutorials/graphics/arrow.C");
TCanvas *c1 = (TCanvas *)gROOT->GetListOfCanvases()->FindObject("c1");
@@ -41,7 +41,8 @@
r->SetWindowSize(700,500);
return r->GetMainFrame();
}
-End_Macro */
+~~~
+*/
////////////////////////////////////////////////////////////////////////////////
diff -ur root-6.06.02.orig/gui/gui/src/TGTable.cxx root-6.06.02/gui/gui/src/TGTable.cxx
--- root-6.06.02.orig/gui/gui/src/TGTable.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/gui/gui/src/TGTable.cxx 2016-03-29 15:05:17.952862862 +0200
@@ -72,7 +72,7 @@
<br><br>
A simple macro to use a TGTable with a TGSimpleTableInterface:
End_Html
-Begin_Macro(source, gui)
+~~~
{
Int_t i = 0, j = 0;
UInt_t nrows = 6, ncolumns = 5;
@@ -111,13 +111,13 @@
return mainframe;
}
-End_Macro
+~~~
Begin_Html
It is also possible to visualise data from a tree. A simple macro
showing the use of a TTreeTableInterface follows.
End_Html
-Begin_Macro(source, gui)
+~~~
{
// Open a root file.
TFile *file = new TFile("$ROOTSYS/tutorials/hsimple.root");
@@ -153,7 +153,7 @@
return mainframe;
}
-End_Macro
+~~~
*/
// const TGGC *TGTable::fgDefaultSelectGC = 0;

42
root-avoid-std-bind-lambda.patch
View file

@ -1,42 +0,0 @@
diff -ur root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C root-6.06.02/tutorials/multicore/mp101_fillNtuples.C
--- root-6.06.02.orig/tutorials/multicore/mp101_fillNtuples.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/multicore/mp101_fillNtuples.C 2016-03-21 19:56:55.414726427 +0100
@@ -33,6 +33,9 @@
// Total amount of numbers
const UInt_t nNumbers = 20000000U;
+ // We split the work in equal parts
+ const auto workSize = nNumbers / nWorkers;
+
// A simple function to fill ntuples randomly
auto fillRandom = [](TNtuple & ntuple, TRandom3 & rndm, UInt_t n) {
@@ -57,7 +60,7 @@
// We now go MP! ------------------------------------------------------------
// We define our work item
- auto workItem = [&fillRandom](UInt_t workerID, UInt_t workSize) {
+ auto workItem = [&fillRandom, &workSize](UInt_t workerID) {
// One generator, file and ntuple per worker
TRandom3 workerRndm(workerID); // Change the seed
TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE");
@@ -74,18 +77,10 @@
{
TimerRAII t("Parallel execution");
- // We split the work in equal parts
- const auto workSize = nNumbers / nWorkers;
-
- // The work item requires two arguments, the map infrastructure offer
- // an interface to use only one. A standard solution is to use std::bind
- using namespace std::placeholders;
- auto workItemOneArg = std::bind(workItem, _1, workSize);
-
// Fill the pool with work
std::forward_list<UInt_t> workerIDs(nWorkers);
std::iota(std::begin(workerIDs), std::end(workerIDs), 0);
- workers.Map(workItemOneArg, workerIDs);
+ workers.Map(workItem, workerIDs);
}
return 0;

156
root-broken-cmake-config.patch
View file

@ -1,156 +0,0 @@
diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modules/FindDPM.cmake
--- root-6.06.02.orig/cmake/modules/FindDPM.cmake 1970-01-01 01:00:00.000000000 +0100
+++ root-6.06.02/cmake/modules/FindDPM.cmake 2016-03-20 17:08:52.124461048 +0100
@@ -0,0 +1,23 @@
+# - Locate dpm library
+# Defines:
+#
+# DPM_FOUND
+# DPM_INCLUDE_DIR
+# DPM_INCLUDE_DIRS (not cached)
+# DPM_LIBRARIES
+
+set(DPM_FOUND FALSE)
+
+find_path(DPM_INCLUDE_DIR NAMES dpm_api.h HINTS ${DPM_DIR}/include $ENV{DPM_DIR}/include /usr/include PATH_SUFFIXES dpm)
+find_library(DPM_dpm_LIBRARY NAMES dpm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
+find_library(DPM_lcgdm_LIBRARY NAMES lcgdm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
+
+set(DPM_INCLUDE_DIRS ${DPM_INCLUDE_DIR})
+set(DPM_LIBRARIES ${DPM_dpm_LIBRARY} ${DPM_lcgdm_LIBRARY})
+
+if (DPM_INCLUDE_DIR AND DPM_dpm_LIBRARY AND DPM_lcgdm_LIBRARY)
+ set(DPM_FOUND TRUE)
+ message(STATUS "Found DPM at: ${DPM_LIBRARIES}")
+endif()
+
+mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)
diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake
--- root-6.06.02.orig/cmake/modules/FindGlobus.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/FindGlobus.cmake 2016-03-20 17:08:52.183461633 +0100
@@ -9,7 +9,7 @@
find_path(GLOBUS_INCLUDE_DIR NAMES globus_common.h
HINTS ${GLOBUS_DIR}/include $ENV{GLOBUS_LOCATION}/include
- /opt/globus/include
+ /opt/globus/include /usr/include
PATH_SUFFIXES gcc32 gcc32dbg gcc32pthr gcc32dbgpthr
gcc64 gcc64dbg gcc64pthr gcc64dbgpthr globus)
@@ -24,7 +24,7 @@
openssl gsi_proxy_core callout)
foreach( lib ${libraries})
- find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} HINTS
+ find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} globus_${lib} HINTS
${GLOBUS_DIR}/lib $ENV{GLOBUS_LOCATION}/lib)
if(GLOBUS_${lib}_LIBRARY)
set(GLOBUS_${lib}_FOUND 1)
diff -Nur root-6.06.02.orig/cmake/modules/Findhdfs.cmake root-6.06.02/cmake/modules/Findhdfs.cmake
--- root-6.06.02.orig/cmake/modules/Findhdfs.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/Findhdfs.cmake 2016-03-20 17:08:52.185461652 +0100
@@ -6,7 +6,7 @@
# HDFS_INCLUDE_DIRS (not cached)
# HDFS_LIBRARIES
-find_path(HDFS_INCLUDE_DIR NAMES hdfs.h HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include)
+find_path(HDFS_INCLUDE_DIR NAMES hdfs.h HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include /usr/include/hadoop)
find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})
diff -Nur root-6.06.02.orig/cmake/modules/FindPCRE.cmake root-6.06.02/cmake/modules/FindPCRE.cmake
--- root-6.06.02.orig/cmake/modules/FindPCRE.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/FindPCRE.cmake 2016-03-20 17:08:52.184461642 +0100
@@ -2,8 +2,8 @@
#
# This module defines
# PCRE_INCLUDE_DIR, where to locate PCRE header files
-# PCRE_LIBRARIES, the libraries to link against to use Pythia6
-# PCRE_FOUND. If false, you cannot build anything that requires Pythia6.
+# PCRE_LIBRARIES, the libraries to link against to use PCRE
+# PCRE_FOUND. If false, you cannot build anything that requires PCRE.
if(PCRE_CONFIG_EXECUTABLE)
set(PCRE_FIND_QUIETLY 1)
diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake 2016-03-20 17:08:52.186461662 +0100
@@ -446,15 +446,29 @@
endif()
#---Check for Castor-------------------------------------------------------------------
-if(castor OR rfio)
+if(castor)
message(STATUS "Looking for Castor")
find_package(Castor)
if(NOT CASTOR_FOUND)
if(fail-on-missing)
message(FATAL_ERROR "Castor libraries not found and they are required (castor option enabled)")
else()
- message(STATUS "Castor not found. Switching off castor/rfio option")
+ message(STATUS "Castor not found. Switching off castor option")
set(castor OFF CACHE BOOL "" FORCE)
+ endif()
+ endif()
+endif()
+
+#---Check for RFIO-------------------------------------------------------------------
+if(rfio)
+ message(STATUS "Looking for RFIO")
+ find_package(Castor)
+ find_package(DPM)
+ if(NOT CASTOR_FOUND AND NOT DPM_FOUND)
+ if(fail-on-missing)
+ message(FATAL_ERROR "Castor or DPM libraries not found and one of them is required (rfio option enabled)")
+ else()
+ message(STATUS "Castor or DPM not found. Switching off rfio option")
set(rfio OFF CACHE BOOL "" FORCE)
endif()
endif()
diff -Nur root-6.06.02.orig/io/hdfs/CMakeLists.txt root-6.06.02/io/hdfs/CMakeLists.txt
--- root-6.06.02.orig/io/hdfs/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ root-6.06.02/io/hdfs/CMakeLists.txt 2016-03-20 17:08:52.186461662 +0100
@@ -0,0 +1,10 @@
+############################################################################
+# CMakeLists.txt file for building ROOT io/hdfs package
+############################################################################
+
+include_directories(${HDFS_INCLUDE_DIRS})
+
+ROOT_GENERATE_DICTIONARY(G__HDFS *.h MODULE HDFS LINKDEF LinkDef.h)
+
+ROOT_LINKER_LIBRARY(HDFS *.cxx G__HDFS.cxx LIBRARIES Core ${HDFS_LIBRARIES} DEPENDENCIES Net RIO)
+ROOT_INSTALL_HEADERS()
diff -Nur root-6.06.02.orig/io/rfio/CMakeLists.txt root-6.06.02/io/rfio/CMakeLists.txt
--- root-6.06.02.orig/io/rfio/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/io/rfio/CMakeLists.txt 2016-03-20 17:08:52.186461662 +0100
@@ -2,10 +2,16 @@
# CMakeLists.txt file for building ROOT io/rfio package
############################################################################
-include_directories(${CASTOR_INCLUDE_DIR})
-
ROOT_GENERATE_DICTIONARY(G__RFIO *.h MODULE RFIO LINKDEF LinkDef.h)
+if(CASTOR_FOUND)
+include_directories(${CASTOR_INCLUDE_DIR})
ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${CASTOR_LIBRARIES}
${CASTOR_rfio_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY} DEPENDENCIES Net RIO)
+else()
+include_directories(${DPM_INCLUDE_DIR})
+ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${DPM_LIBRARIES}
+ DEPENDENCIES Net RIO)
+endif()
+
ROOT_INSTALL_HEADERS()
diff -Nur root-6.06.02.orig/net/globusauth/CMakeLists.txt root-6.06.02/net/globusauth/CMakeLists.txt
--- root-6.06.02.orig/net/globusauth/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/net/globusauth/CMakeLists.txt 2016-03-20 17:08:52.207461871 +0100
@@ -8,7 +8,6 @@
endif()
ROOT_LINKER_LIBRARY(GlobusAuth *.cxx LIBRARIES Core ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} DEPENDENCIES RootAuth Net)
-ROOT_INSTALL_HEADERS()
if(builtin_openssl)
ROOT_ADD_BUILTIN_DEPENDENCIES(GlobusAuth OPENSSL)

284
root-cache-test.patch
View file

@ -1,284 +0,0 @@
diff -ur root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx root-6.06.02/hist/histpainter/src/THistPainter.cxx
--- root-6.06.02.orig/hist/histpainter/src/THistPainter.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/histpainter/src/THistPainter.cxx 2016-03-31 20:09:00.566638573 +0200
@@ -1907,8 +1907,8 @@
Double_t lat2 = 50;
TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- TFile *f;
- f = TFile::Open("http://root.cern.ch/files/usa.root");
+ TFile::SetCacheFileDir(".");
+ TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
TMultiGraph *mg;
TKey *key;
diff -ur root-6.06.02.orig/test/stressGraphics.cxx root-6.06.02/test/stressGraphics.cxx
--- root-6.06.02.orig/test/stressGraphics.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/test/stressGraphics.cxx 2016-03-31 20:09:57.680125335 +0200
@@ -1956,7 +1956,8 @@
Double_t lat2 = 50;
TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- TFile *f = TFile::Open("http://root.cern.ch/files/usa.root");
+ TFile::SetCacheFileDir(".");
+ TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
if (!f) {
printf("Cannot access usa.root. Is internet working ?\n");
diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHistogram.cxx
--- root-6.06.02.orig/test/stressHistogram.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/test/stressHistogram.cxx 2016-03-30 05:39:17.309313821 +0200
@@ -10164,7 +10164,8 @@
refFile = TFile::Open(refFileName, "RECREATE");
}
else {
- refFile = TFile::Open(refFileName);
+ TFile::SetCacheFileDir(".");
+ refFile = TFile::Open(refFileName, "CACHEREAD");
}
if ( refFile != 0 ) {
diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx
--- root-6.06.02.orig/test/stressRooFit.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/test/stressRooFit.cxx 2016-03-30 05:39:17.330313983 +0200
@@ -78,9 +78,10 @@
cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ;
return 1;
}
- fref = new TWebFile(refFile) ;
+ TFile::SetCacheFileDir(".");
+ fref = TFile::Open(refFile,"CACHEREAD") ;
} else {
- fref = new TFile(refFile,writeRef?"RECREATE":"") ;
+ fref = TFile::Open(refFile,writeRef?"RECREATE":"") ;
}
if (fref->IsZombie()) {
cout << "stressRooFit ERROR: cannot open reference file " << refFile << endl ;
diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx
--- root-6.06.02.orig/test/stressTMVA.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/test/stressTMVA.cxx 2016-03-30 06:11:11.630058265 +0200
@@ -2011,21 +2011,15 @@
factory->AddVariable( _VariableNames->at(3), "Variable 4", "units", 'F' );
TFile* input(0);
-
FileStat_t stat;
- TString fname = "../tmva/test/data/toy_sigbkg.root"; //tmva_example.root";
- const char *fcname = gSystem->ExpandPathName("$ROOTSYS/tmva/test/data/toy_sigbkg.root");
+ TString fname = "./tmva_class_example.root";
if(!gSystem->GetPathInfo(fname,stat)) {
input = TFile::Open( fname );
- } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
- input = TFile::Open( "../"+fname );
- } else if(fcname && !gSystem->GetPathInfo(fcname,stat)) {
- input = TFile::Open( fcname );
} else {
- input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" );
+ TFile::SetCacheFileDir(".");
+ input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
}
- delete [] fcname;
if (input == NULL) {
cerr << "broken/inaccessible input file" << endl;
}
@@ -2440,14 +2434,12 @@
TFile* input(0);
FileStat_t stat;
- // FIXME:: give the filename of the sample somewhere else?
- TString fname = "../tmva/test/tmva_reg_example.root";
+ TString fname = "./tmva_reg_example.root";
if(!gSystem->GetPathInfo(fname,stat)) {
input = TFile::Open( fname );
- } else if(!gSystem->GetPathInfo("../"+fname,stat)) {
- input = TFile::Open( "../"+fname );
} else {
- input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" );
+ TFile::SetCacheFileDir(".");
+ input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD");
}
if (input == NULL) {
cerr << "broken/inaccessible input file" << endl;
diff -ur root-6.06.02.orig/tmva/pymva/test/Classification.C root-6.06.02/tmva/pymva/test/Classification.C
--- root-6.06.02.orig/tmva/pymva/test/Classification.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tmva/pymva/test/Classification.C 2016-04-01 18:09:27.283029169 +0200
@@ -27,23 +27,26 @@
TMVA::Factory *factory = new TMVA::Factory("TMVAClassification", outputFile,
"!V:!Silent:Color:DrawProgressBar:Transformations=I;D;P;G,D:AnalysisType=Classification");
-
factory->AddVariable("myvar1 := var1+var2", 'F');
factory->AddVariable("myvar2 := var1-var2", "Expression 2", "", 'F');
factory->AddVariable("var3", "Variable 3", "units", 'F');
factory->AddVariable("var4", "Variable 4", "units", 'F');
-
-
factory->AddSpectator("spec1 := var1*2", "Spectator 1", "units", 'F');
factory->AddSpectator("spec2 := var1*3", "Spectator 2", "units", 'F');
-
+ TFile *input(0);
TString fname = "./tmva_class_example.root";
-
- if (gSystem->AccessPathName(fname)) // file does not exist in local directory
- gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
-
- TFile *input = TFile::Open(fname);
+ if (!gSystem->AccessPathName( fname )) {
+ input = TFile::Open( fname ); // check if file in local directory exists
+ }
+ else {
+ TFile::SetCacheFileDir(".");
+ input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
+ }
+ if (!input) {
+ std::cout << "ERROR: could not open data file" << std::endl;
+ exit(1);
+ }
std::cout << "--- TMVAClassification : Using input file: " << input->GetName() << std::endl;
diff -ur root-6.06.02.orig/tmva/rmva/test/Classification.C root-6.06.02/tmva/rmva/test/Classification.C
--- root-6.06.02.orig/tmva/rmva/test/Classification.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tmva/rmva/test/Classification.C 2016-04-01 18:09:50.932225431 +0200
@@ -36,12 +36,19 @@
factory->AddSpectator("spec1 := var1*2", "Spectator 1", "units", 'F');
factory->AddSpectator("spec2 := var1*3", "Spectator 2", "units", 'F');
+ TFile *input(0);
TString fname = "./tmva_class_example.root";
-
- if (gSystem->AccessPathName(fname)) // file does not exist in local directory
- gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
-
- TFile *input = TFile::Open(fname);
+ if (!gSystem->AccessPathName( fname )) {
+ input = TFile::Open( fname ); // check if file in local directory exists
+ }
+ else {
+ TFile::SetCacheFileDir(".");
+ input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
+ }
+ if (!input) {
+ std::cout << "ERROR: could not open data file" << std::endl;
+ exit(1);
+ }
std::cout << "--- TMVAClassification : Using input file: " << input->GetName() << std::endl;
diff -ur root-6.06.02.orig/tutorials/hist/th2polyUSA.C root-6.06.02/tutorials/hist/th2polyUSA.C
--- root-6.06.02.orig/tutorials/hist/th2polyUSA.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/hist/th2polyUSA.C 2016-03-31 20:10:42.970511332 +0200
@@ -44,8 +44,8 @@
Double_t lat2 = 50;
TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
- TFile *f;
- f = TFile::Open("http://root.cern.ch/files/usa.root");
+ TFile::SetCacheFileDir(".");
+ TFile *f = TFile::Open("http://root.cern.ch/files/usa.root", "CACHEREAD");
if (!f) {
printf("Cannot access usa.root. Is internet working ?\n");
diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C
--- root-6.06.02.orig/tutorials/tmva/TMVAClassificationApplication.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/tmva/TMVAClassificationApplication.C 2016-04-01 18:06:14.522429453 +0200
@@ -221,14 +221,16 @@
// Prepare input tree (this must be replaced by your data source)
// in this example, there is a toy tree with signal and one with background events
// we'll later on use only the "signal" events for the test in this example.
- //
+ //
TFile *input(0);
- TString fname = "./tmva_example.root";
- if (!gSystem->AccessPathName( fname ))
+ TString fname = "./tmva_class_example.root";
+ if (!gSystem->AccessPathName( fname )) {
input = TFile::Open( fname ); // check if file in local directory exists
- else
- input = TFile::Open( "http://root.cern.ch/files/tmva_class_example.root" ); // if not: download from ROOT server
-
+ }
+ else {
+ TFile::SetCacheFileDir(".");
+ input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD"); // if not: download from ROOT server
+ }
if (!input) {
std::cout << "ERROR: could not open data file" << std::endl;
exit(1);
diff -ur root-6.06.02.orig/tutorials/tmva/TMVAClassification.C root-6.06.02/tutorials/tmva/TMVAClassification.C
--- root-6.06.02.orig/tutorials/tmva/TMVAClassification.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/tmva/TMVAClassification.C 2016-04-01 18:05:40.808149659 +0200
@@ -201,13 +201,19 @@
// Read training and test data
// (it is also possible to use ASCII format as input -> see TMVA Users Guide)
+ TFile *input(0);
TString fname = "./tmva_class_example.root";
-
- if (gSystem->AccessPathName( fname )) // file does not exist in local directory
- gSystem->Exec("curl -O http://root.cern.ch/files/tmva_class_example.root");
-
- TFile *input = TFile::Open( fname );
-
+ if (!gSystem->AccessPathName( fname )) {
+ input = TFile::Open( fname ); // check if file in local directory exists
+ }
+ else {
+ TFile::SetCacheFileDir(".");
+ input = TFile::Open("http://root.cern.ch/files/tmva_class_example.root", "CACHEREAD");
+ }
+ if (!input) {
+ std::cout << "ERROR: could not open data file" << std::endl;
+ exit(1);
+ }
std::cout << "--- TMVAClassification : Using input file: " << input->GetName() << std::endl;
// --- Register the training and test trees
diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C root-6.06.02/tutorials/tmva/TMVARegressionApplication.C
--- root-6.06.02.orig/tutorials/tmva/TMVARegressionApplication.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/tmva/TMVARegressionApplication.C 2016-04-01 18:07:00.137808013 +0200
@@ -123,16 +123,16 @@
// Prepare input tree (this must be replaced by your data source)
// in this example, there is a toy tree with signal and one with background events
// we'll later on use only the "signal" events for the test in this example.
- //
+ //
TFile *input(0);
TString fname = "./tmva_reg_example.root";
if (!gSystem->AccessPathName( fname )) {
input = TFile::Open( fname ); // check if file in local directory exists
- }
- else {
- input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
}
-
+ else {
+ TFile::SetCacheFileDir(".");
+ input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
+ }
if (!input) {
std::cout << "ERROR: could not open data file" << std::endl;
exit(1);
diff -ur root-6.06.02.orig/tutorials/tmva/TMVARegression.C root-6.06.02/tutorials/tmva/TMVARegression.C
--- root-6.06.02.orig/tutorials/tmva/TMVARegression.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/tmva/TMVARegression.C 2016-03-30 05:58:14.955076174 +0200
@@ -158,11 +158,13 @@
// load the signal and background event samples from ROOT trees
TFile *input(0);
TString fname = "./tmva_reg_example.root";
- if (!gSystem->AccessPathName( fname ))
+ if (!gSystem->AccessPathName( fname )) {
input = TFile::Open( fname ); // check if file in local directory exists
- else
- input = TFile::Open( "http://root.cern.ch/files/tmva_reg_example.root" ); // if not: download from ROOT server
-
+ }
+ else {
+ TFile::SetCacheFileDir(".");
+ input = TFile::Open("http://root.cern.ch/files/tmva_reg_example.root", "CACHEREAD"); // if not: download from ROOT server
+ }
if (!input) {
std::cout << "ERROR: could not open data file" << std::endl;
exit(1);

1307
root-cernlib-doc.patch
View file

File diff suppressed because it is too large Load diff

12
root-compiledata.patch
View file

@ -1,12 +0,0 @@
diff -ur root-6.06.02.orig/build/unix/compiledata.sh root-6.06.02/build/unix/compiledata.sh
--- root-6.06.02.orig/build/unix/compiledata.sh 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/build/unix/compiledata.sh 2016-03-18 16:27:27.360982151 +0100
@@ -75,7 +75,7 @@
# Remove the flags turning warnings into errors or extending
# the number of warnings.
-CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Wall //g' -e 's/-Wshadow //g' `
+CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Werror=\S* //g' -e 's/-Wall //g' -e 's/-Wshadow //g'`
# Determine the compiler version
BXX="`basename $CXX`"

30
root-deprecated-options.patch
View file

@ -1,30 +0,0 @@
diff -ur root-6.06.02.orig/configure root-6.06.02/configure
--- root-6.06.02.orig/configure 2016-03-20 15:54:26.038192410 +0100
+++ root-6.06.02/configure 2016-03-20 16:48:49.767492974 +0100
@@ -202,7 +202,7 @@
enable_unuran=yes
enable_vc=yes
enable_vdt=yes
- #enable_r=yes
+ enable_r=yes
fi
# Remove old log file
@@ -2288,7 +2288,7 @@
f=`echo $1 | sed -e 's/--//' -e 's/-/_/g' -e 's/++11/xx11/'`
eval prev='$'`echo ${f}`
eval prev_expl='$'`echo ${f}_explicit`
- if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
+ if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
echo "WARNING: option $1 is deprecated and ignored"'!'
else
if test "${prev}:${prev_expl}" = "yes:"; then
@@ -2318,7 +2318,7 @@
f=`echo $1 | sed -e 's/--disable/enable/' -e 's/-/_/g' -e 's/++11/xx11/'`
eval prev='$'`echo ${f}`
eval prev_expl='$'`echo ${f}_explicit`
- if test ! "x`echo ${deprecated_options} | grep ${f}`" = "x"; then
+ if test ! "x`echo ${deprecated_options}' ' | grep ${f}' '`" = "x"; then
echo "WARNING: option $1 is deprecated and ignored"'!'
else
if test "${prev}:${prev_expl}" = "xno:"; then

123
root-dont-link-jvm.patch
View file

@ -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%)

86
root-dox-filter.patch
View file

@ -1,86 +0,0 @@
diff -ur root-6.06.02.orig/documentation/doxygen/filter.cxx root-6.06.02/documentation/doxygen/filter.cxx
--- root-6.06.02.orig/documentation/doxygen/filter.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/documentation/doxygen/filter.cxx 2016-03-20 18:25:55.319293945 +0100
@@ -98,6 +98,7 @@
// Source file.
if (gSource) {
+ size_t spos = 0;
while (fgets(gLine,255,f)) {
gLineString = gLine;
@@ -106,10 +107,11 @@
gLineString.find("/** \\class") != string::npos ||
gLineString.find("///! \\class") != string::npos) gClass = true;
- if (gLineString.find("End_Macro") != string::npos) {
+ if (gInMacro && gLineString.find("End_Macro") != string::npos) {
ReplaceAll(gLineString,"End_Macro","");
gImageSource = false;
gInMacro = 0;
+ spos = 0;
if (m) {
fclose(m);
m = 0;
@@ -122,8 +124,9 @@
}
if (gInMacro) {
+ if (spos) gLineString = gLineString.substr(spos);
if (gInMacro == 1) {
- if (EndsWith(gLineString,".C\n")) {
+ if (EndsWith(gLineString,".C\n") || (gLineString.find(".C(") != string::npos)) {
ExecuteMacro();
gInMacro++;
} else {
@@ -153,14 +156,27 @@
}
}
- if (gLineString.find("Begin_Macro") != string::npos) {
+ if (gLineString.find("Begin_Macro") != string::npos &&
+ gLineString.find("End_Macro") == string::npos) {
+ if (BeginsWith(gLineString, "///")) {
+ spos = gLineString.find_first_not_of(' ', 3);
+ }
if (gLineString.find("source") != string::npos) gImageSource = true;
gImageID++;
gInMacro++;
gLineString = "\n";
}
- printf("%s",gLineString.c_str());
+ size_t l = gLineString.length();
+ size_t b = 0;
+ do {
+ size_t e = gLineString.find('\n', b);
+ if (e != string::npos) e++;
+ if (spos) printf("%-*s%s", (int)spos, "///",
+ gLineString.substr(b, e - b).c_str());
+ else printf("%s", gLineString.substr(b, e - b).c_str());
+ b = e;
+ } while (b < l);
}
fclose(f);
return 0;
@@ -203,7 +219,8 @@
if (gSource) {
while (fgets(gLine,255,f)) {
gLineString = gLine;
- if (gLineString.find("ClassImp") != string::npos) {
+ if (gLineString.find("ClassImp") != string::npos ||
+ gLineString.find("NamespaceImp") != string::npos) {
i1 = gLineString.find("(")+1;
i2 = gLineString.find(")")-1;
gClassName = gLineString.substr(i1,i2-i1+1);
@@ -238,8 +255,8 @@
// Build the ROOT command to be executed.
gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C(\\\""));
- int l = gLineString.length();
- gLineString.replace(l-2,1,StringFormat("C\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
+ size_t l = gLineString.length();
+ gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\")\"", gImageName.c_str(), gOutDir.c_str()));
ExecuteCommand(gLineString);

30
root-doxyfile.patch
View file

@ -1,30 +0,0 @@
diff -ur root-6.06.02.orig/documentation/doxygen/Doxyfile root-6.06.02/documentation/doxygen/Doxyfile
--- root-6.06.02.orig/documentation/doxygen/Doxyfile 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/documentation/doxygen/Doxyfile 2016-04-04 04:40:27.000000000 +0200
@@ -2058,7 +2058,7 @@
# The default value is: NO.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-MACRO_EXPANSION = NO
+MACRO_EXPANSION = YES
# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
# the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -2066,7 +2066,7 @@
# The default value is: NO.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-EXPAND_ONLY_PREDEF = NO
+EXPAND_ONLY_PREDEF = YES
# If the SEARCH_INCLUDES tag is set to YES the includes files in the
# INCLUDE_PATH will be searched if a #include is found.
@@ -2098,7 +2098,7 @@
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-PREDEFINED =
+PREDEFINED = ClassDef(x,y)=// ClassImp(x)=// ClassImpQ(x)=// templateClassImp(x)=// NamespaceImp(x)=//
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The

723
root-doxygen-warnings.patch
View file

@ -1,723 +0,0 @@
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/impl_tuple_apply.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/impl_tuple_apply.h 2016-04-06 15:27:12.238754375 +0200
@@ -1,4 +1,4 @@
-/// \file impl_tuple_apply.h
+/// \file ROOT/impl_tuple_apply.h
/// \ingroup Base StdExt ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-07-09
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/RArrayView.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/RArrayView.h 2016-04-06 15:26:02.228280069 +0200
@@ -1,4 +1,4 @@
-/// \file RArrayView.h
+/// \file ROOT/RArrayView.h
/// \ingroup Base StdExt ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-09-06
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/rhysd_array_view.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/rhysd_array_view.h 2016-04-06 15:27:03.919698016 +0200
@@ -1,4 +1,4 @@
-/// \file rhysd_array_view.h
+/// \file ROOT/rhysd_array_view.h
/// \ingroup Base StdExt ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-09-06
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/RTupleApply.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/RTupleApply.h 2016-04-06 15:26:30.392470876 +0200
@@ -1,4 +1,4 @@
-/// \file RArrayView.h
+/// \file ROOT/RTupleApply.h
/// \ingroup Base StdExt ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-09-06
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/TCoopPtr.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/TCoopPtr.h 2016-04-06 15:22:08.629702559 +0200
@@ -1,4 +1,4 @@
-/// \file TCoopPtr
+/// \file ROOT/TCoopPtr.h
/// \ingroup Base ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-07-31
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/TDirectory.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/TDirectory.h 2016-04-06 15:22:35.960886031 +0200
@@ -1,4 +1,4 @@
-/// \file TDirectory.h
+/// \file ROOT/TDirectory.h
/// \ingroup Base ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-07-31
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/TDrawable.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/TDrawable.h 2016-04-06 15:23:28.468238508 +0200
@@ -1,4 +1,4 @@
-/// \file TDirectory.h
+/// \file ROOT/TDrawable.h
/// \ingroup Base ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-08-07
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h root-6.06.02/core/base/v7/inc/ROOT/TKey.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/TKey.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/TKey.h 2016-04-06 15:23:57.359434110 +0200
@@ -1,4 +1,4 @@
-/// \file TKey.h
+/// \file ROOT/TKey.h
/// \ingroup Base ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-07-31
diff -ur root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h root-6.06.02/core/base/v7/inc/ROOT/TLogger.h
--- root-6.06.02.orig/core/base/v7/inc/ROOT/TLogger.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/v7/inc/ROOT/TLogger.h 2016-04-06 15:24:38.710714256 +0200
@@ -1,4 +1,4 @@
-/// \file TDirectory.h
+/// \file ROOT/TLogger.h
/// \ingroup Base ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-03-29
diff -ur root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h root-6.06.02/core/cont/inc/TCollectionProxyInfo.h
--- root-6.06.02.orig/core/cont/inc/TCollectionProxyInfo.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/cont/inc/TCollectionProxyInfo.h 2016-04-07 06:52:03.825926112 +0200
@@ -57,7 +57,7 @@
// Same value as TVirtualCollectionProxy.
static const UInt_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)
- /** @class template TCollectionProxyInfo::IteratorValue
+ /** @class ROOT::Detail::TCollectionProxyInfo::IteratorValue
*
* Small helper to encapsulate whether to return the value
* pointed to by the iterator or its address.
@@ -76,7 +76,7 @@
}
};
- /** @class template TCollectionProxyInfo::Iterators
+ /** @class ROOT::Detail::TCollectionProxyInfo::Iterators
*
* Small helper to implement the function to create,access and destroy
* iterators.
@@ -204,7 +204,7 @@
}
};
- /** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollectionProxyInfo.h
+ /** @class ROOT::Detail::TCollectionProxyInfo::Environ
*
* Small helper to save proxy environment in the event of
* recursive calls.
@@ -276,7 +276,7 @@
static size_t GetContainerSize(const std::forward_list<T,ALLOCATOR>& c) {return std::distance(c.begin(),c.end());}
};
- /** @class TCollectionProxyInfo::Type TCollectionProxyInfo.h TCollectionProxyInfo.h
+ /** @class ROOT::Detail::TCollectionProxyInfo::Type
*
* Small helper to encapsulate basic data accesses for
* all STL continers.
@@ -356,7 +356,7 @@
};
- /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
+ /** @class ROOT::Detail::TCollectionProxyInfo::Pushback
*
* Small helper to encapsulate all necessary data accesses for
* containers like vector, list, deque
@@ -389,7 +389,7 @@
}
};
- /** @class TCollectionProxyInfo::Pushfront TCollectionProxyInfo.h TCollectionProxyInfo.h
+ /** @class ROOT::Detail::TCollectionProxyInfo::Pushfront
*
* Small helper to encapsulate all necessary data accesses for
* containers like forward_list
@@ -425,7 +425,7 @@
}
};
- /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
+ /** @class ROOT::Detail::TCollectionProxyInfo::Insert
*
* Small helper to encapsulate all necessary data accesses for
* containers like set, multiset etc.
@@ -457,7 +457,7 @@
}
};
- /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
+ /** @class ROOT::Detail::TCollectionProxyInfo::MapInsert
*
* Small helper to encapsulate all necessary data accesses for
* containers like set, multiset etc.
diff -ur root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h
--- root-6.06.02.orig/graf2d/gpad/v7/inc/ROOT/TCanvas.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf2d/gpad/v7/inc/ROOT/TCanvas.h 2016-04-06 15:29:40.178756637 +0200
@@ -1,4 +1,4 @@
-/// \file TCanvas.h
+/// \file ROOT/TCanvas.h
/// \ingroup Gpad ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-07-08
diff -ur root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx
--- root-6.06.02.orig/graf3d/gl/src/TGLPolyMarker.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf3d/gl/src/TGLPolyMarker.cxx 2016-04-06 13:52:29.064736441 +0200
@@ -26,7 +26,7 @@
#include "TClass.h"
#include "TError.h"
-/** \class
+/** \class TGLPolyMarker
\ingroup opengl
To draw a 3D polymarker in a GL window.
*/
diff -ur root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx
--- root-6.06.02.orig/graf3d/gl/src/TGLSelectRecord.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf3d/gl/src/TGLSelectRecord.cxx 2016-04-06 13:53:23.837160381 +0200
@@ -14,7 +14,7 @@
#include <string.h>
-/** \class
+/** \class TGLSelectRecordBase
\ingroup opengl TGLSelectRecordBase
Base class for select records.
Supports initialization from a raw GL record (UInt_t*) and
diff -ur root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx
--- root-6.06.02.orig/graf3d/gl/src/TGLVoxelPainter.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf3d/gl/src/TGLVoxelPainter.cxx 2016-04-06 13:54:42.651770407 +0200
@@ -15,7 +15,7 @@
#include "TGLPlotCamera.h"
#include "TGLIncludes.h"
-/** \class
+/** \class TGLVoxelPainter
\ingroup opengl
Paint TH3 histograms as "voxels" - colored boxes, transparent if transfer function was specified.
*/
diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
--- root-6.06.02.orig/hist/hist/src/TH1.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TH1.cxx 2016-04-07 06:55:45.067740071 +0200
@@ -49,11 +49,16 @@
/** \addtogroup Hist
@{
-\class TH1C \brief tomato 1-D histogram with a bype per channel (see TH1 documentation)
-\class TH1S \brief tomato 1-D histogram with a short per channel (see TH1 documentation)
-\class TH1I \brief tomato 1-D histogram with a int per channel (see TH1 documentation)}
-\class TH1F \brief tomato 1-D histogram with a float per channel (see TH1 documentation)}
-\class TH1D \brief tomato 1-D histogram with a double per channel (see TH1 documentation)}
+\class TH1C
+\brief 1-D histogram with a byte per channel (see TH1 documentation)
+\class TH1S
+\brief 1-D histogram with a short per channel (see TH1 documentation)
+\class TH1I
+\brief 1-D histogram with an int per channel (see TH1 documentation)}
+\class TH1F
+\brief 1-D histogram with a float per channel (see TH1 documentation)}
+\class TH1D
+\brief 1-D histogram with a double per channel (see TH1 documentation)}
@}
*/
diff -ur root-6.06.02.orig/hist/hist/src/TH2.cxx root-6.06.02/hist/hist/src/TH2.cxx
--- root-6.06.02.orig/hist/hist/src/TH2.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TH2.cxx 2016-04-07 09:26:40.573880803 +0200
@@ -30,11 +30,16 @@
/** \addtogroup Hist
@{
-\class TH2C \brief tomato 2-D histogram with a bype per channel (see TH1 documentation)
-\class TH2S \brief tomato 2-D histogram with a short per channel (see TH1 documentation)
-\class TH2I \brief tomato 2-D histogram with a int per channel (see TH1 documentation)}
-\class TH2F \brief tomato 2-D histogram with a float per channel (see TH1 documentation)}
-\class TH2D \brief tomato 2-D histogram with a double per channel (see TH1 documentation)}
+\class TH2C
+\brief 2-D histogram with a byte per channel (see TH1 documentation)
+\class TH2S
+\brief 2-D histogram with a short per channel (see TH1 documentation)
+\class TH2I
+\brief 2-D histogram with an int per channel (see TH1 documentation)}
+\class TH2F
+\brief 2-D histogram with a float per channel (see TH1 documentation)}
+\class TH2D
+\brief 2-D histogram with a double per channel (see TH1 documentation)}
@}
*/
diff -ur root-6.06.02.orig/hist/hist/src/TH3.cxx root-6.06.02/hist/hist/src/TH3.cxx
--- root-6.06.02.orig/hist/hist/src/TH3.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TH3.cxx 2016-04-07 09:27:06.173017889 +0200
@@ -28,11 +28,16 @@
/** \addtogroup Hist
@{
-\class TH3C \brief tomato 3-D histogram with a bype per channel (see TH1 documentation)
-\class TH3S \brief tomato 3-D histogram with a short per channel (see TH1 documentation)
-\class TH3I \brief tomato 3-D histogram with a int per channel (see TH1 documentation)}
-\class TH3F \brief tomato 3-D histogram with a float per channel (see TH1 documentation)}
-\class TH3D \brief tomato 3-D histogram with a double per channel (see TH1 documentation)}
+\class TH3C
+\brief 3-D histogram with a byte per channel (see TH1 documentation)
+\class TH3S
+\brief 3-D histogram with a short per channel (see TH1 documentation)
+\class TH3I
+\brief 3-D histogram with an int per channel (see TH1 documentation)}
+\class TH3F
+\brief 3-D histogram with a float per channel (see TH1 documentation)}
+\class TH3D
+\brief 3-D histogram with a double per channel (see TH1 documentation)}
@}
*/
diff -ur root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx root-6.06.02/hist/hist/v7/src/THistDrawable.cxx
--- root-6.06.02.orig/hist/hist/v7/src/THistDrawable.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/v7/src/THistDrawable.cxx 2016-04-06 15:34:29.885719340 +0200
@@ -1,4 +1,4 @@
-/// \file ROOT/THistDrawable.cxx
+/// \file THistDrawable.cxx
/// \ingroup Hist ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-09-11
diff -ur root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx
--- root-6.06.02.orig/hist/histpainter/v7/src/THistPainter.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/histpainter/v7/src/THistPainter.cxx 2016-04-06 15:36:05.225365245 +0200
@@ -1,4 +1,4 @@
-/// \file ROOT/THistPainter.cxx
+/// \file THistPainter.cxx
/// \ingroup HistPainter ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-07-09
diff -ur root-6.06.02.orig/html/src/TDocOutput.cxx root-6.06.02/html/src/TDocOutput.cxx
--- root-6.06.02.orig/html/src/TDocOutput.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/html/src/TDocOutput.cxx 2016-04-06 17:05:08.613380373 +0200
@@ -2463,7 +2463,7 @@
////////////////////////////////////////////////////////////////////////////////
/// Write the first part of the links shown ontop of each doc page;
-/// one <div> has to be closed by caller so additional items can still
+/// one \<div\> has to be closed by caller so additional items can still
/// be added.
void TDocOutput::WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname,
diff -ur root-6.06.02.orig/io/dcache/inc/TDCacheFile.h root-6.06.02/io/dcache/inc/TDCacheFile.h
--- root-6.06.02.orig/io/dcache/inc/TDCacheFile.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/io/dcache/inc/TDCacheFile.h 2016-04-06 17:05:58.695761365 +0200
@@ -63,7 +63,7 @@
const char *location = 0);
static Bool_t CheckFile(const char *path, const char *location = 0);
- /// Note: This must be kept in sync with values #defined in dcap.h
+ /// Note: This must be kept in sync with values \#defined in dcap.h
enum EOnErrorAction {
kOnErrorRetry = 1,
kOnErrorFail = 0,
diff -ur root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h root-6.06.02/io/io/inc/TCollectionProxyFactory.h
--- root-6.06.02.orig/io/io/inc/TCollectionProxyFactory.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/io/io/inc/TCollectionProxyFactory.h 2016-04-06 15:50:50.695248333 +0200
@@ -160,7 +160,7 @@
};
/**
- \class TCollectionClassStreamer TCollectionProxy.h
+ \class TCollectionClassStreamer TCollectionProxyFactory.h
\ingroup IO
Class streamer object to implement TClassStreamer functionality
diff -ur root-6.06.02.orig/io/io/src/TMakeProject.cxx root-6.06.02/io/io/src/TMakeProject.cxx
--- root-6.06.02.orig/io/io/src/TMakeProject.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/io/io/src/TMakeProject.cxx 2016-04-06 17:07:01.370235962 +0200
@@ -434,7 +434,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-/// Add to the header file, the #include needed for the argument of
+/// Add to the header file, the \#include needed for the argument of
/// this template.
UInt_t TMakeProject::GenerateIncludeForTemplate(FILE *fp, const char *clname, char *inclist, Bool_t forward, const TList *extrainfos)
@@ -587,7 +587,7 @@
////////////////////////////////////////////////////////////////////////////////
/// Add to the header file anything that need to appear after the class
-/// declaration (this includes some #pragma link).
+/// declaration (this includes some \#pragma link).
void TMakeProject::GeneratePostDeclaration(FILE *fp, const TVirtualStreamerInfo *info, char *inclist)
{
diff -ur root-6.06.02.orig/io/io/src/TStreamerInfo.cxx root-6.06.02/io/io/src/TStreamerInfo.cxx
--- root-6.06.02.orig/io/io/src/TStreamerInfo.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/io/io/src/TStreamerInfo.cxx 2016-04-06 17:07:43.579564101 +0200
@@ -3645,7 +3645,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-/// Add to the header file, the #include need for this class.
+/// Add to the header file, the \#include need for this class.
UInt_t TStreamerInfo::GenerateIncludes(FILE *fp, char *inclist, const TList *extrainfos)
{
diff -ur root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h root-6.06.02/io/io/v7/inc/ROOT/TFile.h
--- root-6.06.02.orig/io/io/v7/inc/ROOT/TFile.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/io/io/v7/inc/ROOT/TFile.h 2016-04-06 15:37:54.096102821 +0200
@@ -1,4 +1,4 @@
-/// \file TFile.h
+/// \file ROOT/TFile.h
/// \ingroup Base ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-07-31
diff -ur root-6.06.02.orig/math/doc/Math.md root-6.06.02/math/doc/Math.md
--- root-6.06.02.orig/math/doc/Math.md 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/doc/Math.md 2016-04-07 10:27:29.799138394 +0200
@@ -4,7 +4,7 @@
\brief The %ROOT Mathematical Libraries.
-See the \subpage MathPage "Mathematical Libraries" description page.
+See the \ref MathPage "Mathematical Libraries" description page.
\page MathPage The ROOT Mathematical Libraries
@@ -39,7 +39,7 @@
- **Physics Vectors**: Classes for describing vectors in 2, 3 and 4 dimensions (relativistic vectors) and their rotation and transformation algorithms. Two package exist in %ROOT:
- Physics: library with the TVector3 and TLorentzVector classes.
- - GenVector: new library providing generic class templates for modeling the vectors. See the \subpage "GenVector" page.
+ - GenVector: new library providing generic class templates for modeling the vectors. See the \ref Vector "GenVector" page.
- \ref Unuran "UNURAN": Package with universal algorithms for generating non-uniform pseudo-random numbers, from a large classes of continuous or discrete distributions in one or multi-dimensions.
diff -ur root-6.06.02.orig/math/mathcore/inc/Math/Random.h root-6.06.02/math/mathcore/inc/Math/Random.h
--- root-6.06.02.orig/math/mathcore/inc/Math/Random.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/inc/Math/Random.h 2016-04-07 05:35:46.482275553 +0200
@@ -18,9 +18,7 @@
#define ROOT_Math_Random
/**
-@defgroup Random
-
- Interface class for Random number generation
+@defgroup Random Interface class for Random number generation
*/
#include "Math/RandomFunctions.h"
diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
--- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h 2016-04-06 17:10:52.593135769 +0200
@@ -209,7 +209,7 @@
/**
- Calculates the real part of the cosine integral \Re(Ci).
+ Calculates the real part of the cosine integral Re(Ci).
For x<0, the imaginary part is \pi i and has to be added by the user,
for x>0 the imaginary part of Ci(x) is 0.
diff -ur root-6.06.02.orig/math/mathcore/src/TKDTree.cxx root-6.06.02/math/mathcore/src/TKDTree.cxx
--- root-6.06.02.orig/math/mathcore/src/TKDTree.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/src/TKDTree.cxx 2016-04-06 15:52:05.037737876 +0200
@@ -21,7 +21,8 @@
/**
-\class TKDTree class implementing a kd-tree
+\class TKDTree
+\brief Class implementing a kd-tree
diff -ur root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h
--- root-6.06.02.orig/math/mathcore/v7/inc/ROOT/TFit.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/v7/inc/ROOT/TFit.h 2016-04-06 17:54:03.364574676 +0200
@@ -1,4 +1,4 @@
-/// \file TFit.h
+/// \file ROOT/TFit.h
/// \ingroup MathCore ROOT7
/// \author Axel Naumann <axel@cern.ch>
/// \date 2015-09-06
diff -ur root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h
--- root-6.06.02.orig/math/mathmore/inc/Math/GSLMCIntegrator.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/inc/Math/GSLMCIntegrator.h 2016-04-06 15:19:36.635682240 +0200
@@ -83,9 +83,6 @@
It implements also the interface ROOT::Math::VirtualIntegratorMultiDim so it can be
instantiate using the plugin manager (plugin name is "GSLMCIntegrator")
-
- @ingroup MCIntegration
-
*/
diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h
--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccuratePdf.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/inc/Math/VavilovAccuratePdf.h 2016-04-06 15:05:19.713897159 +0200
@@ -51,7 +51,7 @@
and \f[\psi(s) = s \ln \kappa + (s+\beta^2 \kappa)
\cdot \left ( \int \limits_{0}^{1}
\frac{1 - e^{\frac{-st}{\kappa}}}{t} \, dt- \gamma \right )
- - \kappa \, e^{\frac{-s}{\kappa}}\f$.
+ - \kappa \, e^{\frac{-s}{\kappa}}\f].
\f$ \gamma = 0.5772156649\dots\f$ is Euler's constant.
The parameters are:
diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
--- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx 2016-04-07 09:55:57.093992371 +0200
@@ -84,16 +84,17 @@
// [5.2.1.6] (complete) elliptic integral of the third kind
// (26.x.17.2)
/**
+Complete elliptic integral of the third kind.
There are two different definitions used for the elliptic
integral of the third kind:
-
-P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
-
+\f[
+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
+\f]
and
-
-P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
-
+\f[
+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
+\f]
the former is adopted by
- GSL
@@ -220,16 +221,17 @@
// phi in radians
// (26.x.17.1)
/**
+Incomplete elliptic integral of the third kind.
There are two different definitions used for the elliptic
integral of the third kind:
-
-P(\phi,k,n) = \int_0^\phi dt 1/((1 + nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
-
+\f[
+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 + n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
+\f]
and
-
-P(\phi,k,n) = \int_0^\phi dt 1/((1 - nu \sin^2(t))\sqrt(1 - k^2 \sin^2(t)))
-
+\f[
+P(\phi,k,n) = \int_0^\phi \frac{dt}{(1 - n \sin^2{t})\sqrt{1 - k^2 \sin^2{t}}}
+\f]
the former is adopted by
- GSL
diff -ur root-6.06.02.orig/math/unuran/doc/Unuran.md root-6.06.02/math/unuran/doc/Unuran.md
--- root-6.06.02.orig/math/unuran/doc/Unuran.md 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/unuran/doc/Unuran.md 2016-04-06 17:30:53.517632259 +0200
@@ -38,7 +38,7 @@
- The user can optionally provide the
- cdf (cumulative distribution function) via the **TUnuranContDist::SetCdf** function,
- the mode via **TUnuranContDist::SetMode**,
- - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
+ - the domain via **TUnuranContDist::SetDomain** for generating numbers in a restricted region,
- the area below the pdf via **TUnuranContDist::SetPdfArea**.
Some of this information is required depending on the chosen UNURAN generation method.
diff -ur root-6.06.02.orig/net/glite/inc/TGLiteResult.h root-6.06.02/net/glite/inc/TGLiteResult.h
--- root-6.06.02.orig/net/glite/inc/TGLiteResult.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/net/glite/inc/TGLiteResult.h 2016-04-06 15:41:31.962569095 +0200
@@ -10,7 +10,7 @@
*************************************************************************/
/************************************************************************/
-/*! \file TGLiteresult.h
+/*! \file TGLiteResult.h
*//*
version number: $LastChangedRevision: 1678 $
diff -ur root-6.06.02.orig/net/glite/src/TGLiteResult.cxx root-6.06.02/net/glite/src/TGLiteResult.cxx
--- root-6.06.02.orig/net/glite/src/TGLiteResult.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/net/glite/src/TGLiteResult.cxx 2016-04-06 15:41:59.755752113 +0200
@@ -10,7 +10,7 @@
*************************************************************************/
/************************************************************************/
-/*! \file TGLiteresult.cxx
+/*! \file TGLiteResult.cxx
*/ /*
version number: $LastChangedRevision: 1678 $
diff -ur root-6.06.02.orig/net/http/src/THttpCallArg.cxx root-6.06.02/net/http/src/THttpCallArg.cxx
--- root-6.06.02.orig/net/http/src/THttpCallArg.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/net/http/src/THttpCallArg.cxx 2016-04-07 09:18:31.987498647 +0200
@@ -60,8 +60,8 @@
////////////////////////////////////////////////////////////////////////////////
/// method used to get or set http header in the string buffer
/// Header has following format:
-/// field1 : value1\r\n
-/// field2 : value2\r\n
+/// field1 : value1\\r\\n
+/// field2 : value2\\r\\n
/// Such format corresponds to header format in HTTP requests
TString THttpCallArg::AccessHeader(TString& buf, const char* name, const char* value, Bool_t doing_set)
diff -ur root-6.06.02.orig/net/net/src/TWebFile.cxx root-6.06.02/net/net/src/TWebFile.cxx
--- root-6.06.02.orig/net/net/src/TWebFile.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/net/net/src/TWebFile.cxx 2016-04-06 17:18:57.433964872 +0200
@@ -1195,7 +1195,7 @@
////////////////////////////////////////////////////////////////////////////////
/// Determine whether [START, PEEKED + PEEKLEN) contains an HTTP new
-/// line [\r]\n. If so, return the pointer to the position after the line,
+/// line [\\r]\\n. If so, return the pointer to the position after the line,
/// otherwise return 0. This is used as callback to GetHunk(). The data
/// between START and PEEKED has been read and cannot be "unread"; the
/// data after PEEKED has only been peeked.
diff -ur root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h
--- root-6.06.02.orig/roofit/roofitcore/src/BidirMMapPipe.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roofitcore/src/BidirMMapPipe.h 2016-04-06 17:34:02.717120497 +0200
@@ -813,7 +813,7 @@
/** @brief I/O manipulator support
*
- * @param f manipulator
+ * @param manip manipulator
* @returns pipe with manipulator applied
*
* example:
@@ -826,7 +826,7 @@
/** @brief I/O manipulator support
*
- * @param f manipulator
+ * @param manip manipulator
* @returns pipe with manipulator applied
*
* example:
diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx
--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsCollection.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roofitcore/src/RooAbsCollection.cxx 2016-04-06 17:35:25.398770868 +0200
@@ -1002,7 +1002,7 @@
/// FixedPrecision(int n) -- Controls precision, set fixed number of digits
/// AutoPrecision(int n) -- Controls precision. Number of shown digits is calculated from error
/// + n specified additional digits (1 is sensible default)
-/// VerbatimName(Bool_t flag) -- Put variable name in a \verb+ + clause.
+/// VerbatimName(Bool_t flag) -- Put variable name in a \\verb+ + clause.
///
/// Example use: list.printLatex(Columns(2), Format("NEU",AutoPrecision(1),VerbatimName()) ) ;
diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx
--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsData.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roofitcore/src/RooAbsData.cxx 2016-04-06 17:36:08.129106984 +0200
@@ -1264,7 +1264,7 @@
/// FixedPrecision(int n) -- Controls precision, set fixed number of digits
/// AutoPrecision(int n) -- Controls precision. Number of shown digits is calculated from error
/// + n specified additional digits (1 is sensible default)
-/// VerbatimName(Bool_t flag) -- Put variable name in a \verb+ + clause.
+/// VerbatimName(Bool_t flag) -- Put variable name in a \\verb+ + clause.
///
RooPlot* RooAbsData::statOn(RooPlot* frame, const RooCmdArg& arg1, const RooCmdArg& arg2,
diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx
--- root-6.06.02.orig/roofit/roofitcore/src/RooAbsReal.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roofitcore/src/RooAbsReal.cxx 2016-04-06 17:37:51.058916416 +0200
@@ -21,7 +21,7 @@
RooAbsReal is the common abstract base class for objects that represent a
real value and implements functionality common to all real-valued objects
such as the ability to plot them, to construct integrals of them, the
- ability to advertise (partial) analytical integrals etc..
+ ability to advertise (partial) analytical integrals etc.
Implementation of RooAbsReal may be derived, thus no interface
is provided to modify the contents.
diff -ur root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx
--- root-6.06.02.orig/roofit/roofitcore/src/RooRealVar.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roofitcore/src/RooRealVar.cxx 2016-04-06 15:08:46.129315457 +0200
@@ -838,7 +838,7 @@
/// L = TLatex mode
/// X = Latex mode
/// Y = Latex table mode ( '=' replaced by '&' )
-/// V = Make name \verbatim in Latex mode
+/// V = Make name \\verbatim in Latex mode
/// P = use error to control shown precision
/// F = force fixed precision
///
diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h
--- root-6.06.02.orig/roofit/roostats/inc/RooStats/MCMCInterval.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roostats/inc/RooStats/MCMCInterval.h 2016-04-06 15:09:46.205718743 +0200
@@ -55,7 +55,7 @@
confidence level is reached within an acceptable neighborhood as defined by
SetEpsilon(). More specifically: we calculate the following for different
cutoff values C until we reach the target confidence level: \f$\int_{ F >= C } F
- d{normset} \$.
+ d{normset} \f$.
Important note: this is not the default method because of a bug in constructing
the RooNDKeysPdf from a weighted data set. Configure to use this method by
calling SetUseKeys(true), and the data set will be interpreted without weights.
diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h
--- root-6.06.02.orig/roofit/roostats/inc/RooStats/PdfProposal.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roostats/inc/RooStats/PdfProposal.h 2016-04-07 06:17:01.453676714 +0200
@@ -53,7 +53,7 @@
To make Propose(xPrime, x) dependent on x, configure with
PdfProposal::AddMapping(varToUpdate, valueToUse). For example, suppose we have:
-````{.cpp}
+~~~{.cpp}
// our parameter
RooRealVar p("p", "p", 5, 0, 10);
@@ -74,7 +74,7 @@
// number of proposals. If you don't call this function, the default cache size
// is 1, which can be slow.
pdfProposal.SetCacheSize(desiredCacheSize);
-````
+~~~
PdfProposal currently uses a fixed cache size. Adaptive caching methods are in the works
for future versions.
diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
--- root-6.06.02.orig/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h 2016-04-07 07:05:58.067764467 +0200
@@ -40,8 +40,8 @@
By default the calculation is:
\f[
- \log{ \frac{ \lambda( \mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
- { \lambda(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
+ \log{ \frac{ \lambda(\mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
+ { \lambda(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
\f]
where \f$ \lambda \f$ is the profile likeihood ratio, so the
@@ -50,11 +50,11 @@
If ``SetSubtractMLE(false)`` then it calculates:
\f[
+ \log{ \frac{ L(\mu_{alt} , {conditional \: MLE \: for \: alt \: nuisance}) }
+ { L(\mu_{null} , {conditional \: MLE \: for \: null \: nuisance}) } }
+\f]
- \log{ \frac{ L( \mu_alt , {conditional \: MLE \: for \: alt \: nuisance} ) }
- { L(\mu_null , {conditional \: MLE \: for \: null \: nuisance}) } }
-
-where \f$ L\$ is the Likelihood function.
+where \f$ L \f$ is the Likelihood function.
The values of the parameters of interest for the alternative
hypothesis are taken at the time of the construction.
diff -ur root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx
--- root-6.06.02.orig/tree/treeplayer/src/TBranchProxy.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tree/treeplayer/src/TBranchProxy.cxx 2016-04-06 16:16:28.650063487 +0200
@@ -9,7 +9,7 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/
-/** \class Detail::TBranchProxy
+/** \class ROOT::Detail::TBranchProxy
Base class for all the proxy object. It includes the imeplemtation
of the autoloading of branches as well as all the generic setup routine.
*/

78
root-fflags.patch
View file

@ -1,78 +0,0 @@
diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/SetUpLinux.cmake 2016-03-15 18:28:14.350609028 +0100
@@ -70,7 +70,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
- set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
@@ -107,7 +107,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
- set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
@@ -144,7 +144,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -wd1476")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -restrict")
- set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -fPIC")
+ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
diff -ur root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake root-6.06.02/cmake/modules/SetUpMacOS.cmake
--- root-6.06.02.orig/cmake/modules/SetUpMacOS.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/SetUpMacOS.cmake 2016-03-15 18:28:14.348609011 +0100
@@ -37,12 +37,12 @@
SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
+ SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
else(${SYSCTL_OUTPUT} MATCHES 64)
MESSAGE(STATUS "Found a 32bit system")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
+ SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
endif(${SYSCTL_OUTPUT} MATCHES 64)
endif()
@@ -65,7 +65,7 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common")
- SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
+ SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
@@ -101,7 +101,7 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -W -Wall -fsigned-char -fno-common -Qunused-arguments")
- SET(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
+ SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
SET(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
SET(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL -DG__STD_EXCEPTION")
diff -ur root-6.06.02.orig/cmake/modules/SetUpWindows.cmake root-6.06.02/cmake/modules/SetUpWindows.cmake
--- root-6.06.02.orig/cmake/modules/SetUpWindows.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/SetUpWindows.cmake 2016-03-15 18:28:14.347609002 +0100
@@ -13,7 +13,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -Wall -W -Woverloaded-virtual -fPIC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -W -fPIC")
- set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -std=legacy")
+ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")

1408
root-fontconfig.patch
View file

File diff suppressed because it is too large Load diff

254
root-gl2ps.patch
View file

@ -1,254 +0,0 @@
diff -Nur root-6.06.02.orig/cmake/modules/Findgl2ps.cmake root-6.06.02/cmake/modules/Findgl2ps.cmake
--- root-6.06.02.orig/cmake/modules/Findgl2ps.cmake 1970-01-01 01:00:00.000000000 +0100
+++ root-6.06.02/cmake/modules/Findgl2ps.cmake 2016-03-20 18:08:33.673986381 +0100
@@ -0,0 +1,21 @@
+# - Locate gl2ps library
+# Defines:
+#
+# GL2PS_FOUND
+# GL2PS_INCLUDE_DIR
+# GL2PS_INCLUDE_DIRS (not cached)
+# GL2PS_LIBRARIES
+
+find_path(GL2PS_INCLUDE_DIR NAMES gl2ps.h HINTS ${GL2PS_DIR}/include $ENV{GL2PS_DIR}/include /usr/include)
+find_library(GL2PS_LIBRARY NAMES gl2ps HINTS ${GL2PS_DIR}/lib $ENV{GL2PS_DIR}/lib)
+
+set(GL2PS_INCLUDE_DIRS ${GL2PS_INCLUDE_DIR})
+set(GL2PS_LIBRARIES ${GL2PS_LIBRARY})
+
+
+# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
+
+mark_as_advanced(GL2PS_FOUND GL2PS_INCLUDE_DIR GL2PS_LIBRARY)
diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake 2016-03-20 17:54:50.896874682 +0100
+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake 2016-03-20 18:14:26.140474123 +0100
@@ -70,6 +70,7 @@
ROOT_BUILD_OPTION(builtin_fftw3 OFF "Built the FFTW3 library internally (downloading tarfile from the Web)")
ROOT_BUILD_OPTION(builtin_ftgl ON "Built included libFTGL, or use system libftgl")
ROOT_BUILD_OPTION(builtin_freetype OFF "Built included libfreetype, or use system libfreetype")
+ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build included libgl2ps, or use system libgl2ps")
ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
diff -Nur 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-20 17:53:02.394804968 +0100
+++ root-6.06.02/cmake/modules/RootConfiguration.cmake 2016-03-20 18:08:33.674986391 +0100
@@ -153,6 +153,11 @@
set(opengllib ${OPENGL_gl_LIBRARY})
set(openglincdir ${OPENGL_INCLUDE_DIR})
+set(builtingl2ps ${value${builtin_gl2ps}})
+set(gl2pslibdir ${GL2PS_LIBRARY_DIR})
+set(gl2pslib ${GL2PS_LIBRARY})
+set(gl2psincdir ${GL2PS_INCLUDE_DIR})
+
set(buildldap ${value${ldap}})
set(ldaplibdir ${LDAP_LIBRARY_DIR})
set(ldaplib ${LDAP_LIBRARY})
diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake 2016-03-20 17:53:02.394804968 +0100
+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake 2016-03-20 18:08:33.690986549 +0100
@@ -334,6 +334,16 @@
endif()
endif()
+#---Check for gl2ps ------------------------------------------------------------------
+if(NOT builtin_gl2ps)
+ message(STATUS "Looking for gl2ps")
+ find_Package(gl2ps)
+ if(NOT GL2PS_FOUND)
+ message(STATUS "gl2ps not found. Switching on builtin_gl2ps option")
+ set(builtin_gl2ps ON CACHE BOOL "" FORCE)
+ endif()
+endif()
+
#---Check for Graphviz installation-------------------------------------------------------
if(gviz)
message(STATUS "Looking for Graphviz")
diff -Nur 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-20 17:53:02.468805698 +0100
+++ root-6.06.02/config/Makefile.in 2016-03-20 18:08:33.690986549 +0100
@@ -142,6 +142,11 @@
OPENGLLIB := @opengllib@
OPENGLINCDIR := $(filter-out /usr/include, @openglincdir@)
+BUILTINGL2PS := @builtingl2ps@
+GL2PSLIBDIR := @gl2pslibdir@
+GL2PSCLILIB := @gl2pslib@
+GL2PSINCDIR := $(filter-out /usr/include, @gl2psincdir@)
+
BUILDLDAP := @buildldap@
LDAPLIBDIR := @ldaplibdir@
LDAPCLILIB := @ldaplib@
diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
--- root-6.06.02.orig/configure 2016-03-20 17:53:02.513806142 +0100
+++ root-6.06.02/configure 2016-03-20 18:08:33.691986559 +0100
@@ -53,6 +53,7 @@
enable_builtin_afterimage \
enable_builtin_ftgl \
enable_builtin_freetype \
+ enable_builtin_gl2ps \
enable_builtin_glew \
enable_builtin_pcre \
enable_builtin_unuran \
@@ -182,6 +183,7 @@
enable_winrtdebug=
enable_builtin_freetype=no
enable_builtin_ftgl=no
+enable_builtin_gl2ps=no
enable_builtin_glew=no
enable_builtin_pcre=no
enable_builtin_unuran=no
@@ -1704,6 +1706,7 @@
builtin-afterimage Build included libAfterImage, or use system libAfterImage
builtin-ftgl Build included libFTGL, or use system libftgl
builtin-freetype Build included libfreetype, or use system libfreetype
+ builtin-gl2ps Build included libgl2ps, or use system libgl2ps
builtin-glew Build included libGLEW, or use system libGLEW
builtin-pcre Build included libpcre, or use system libpcre
builtin-unuran Build included libunuran, or use system libunuran
@@ -2047,6 +2050,7 @@
logmsg "Will use by default builtin versions of libraries on Win32"
enable_builtin_freetype="yes"
enable_builtin_ftgl="yes"
+ enable_builtin_gl2ps="yes"
enable_builtin_glew="yes"
enable_builtin_pcre="yes"
enable_builtin_unuran="yes"
@@ -3180,6 +3184,38 @@
######################################################################
#
+### echo %%% libgl2ps (builtin or system)
+#
+if test "x$enable_builtin_gl2ps" = "xno" ; then
+ check_header "gl2ps.h" "" \
+ $GL2PS ${GL2PS:+$GL2PS/include} /usr/include
+ if test "x$found_dir" = "x" ; then
+ enable_builtin_gl2ps=yes
+ else
+ gl2psinc=$found_hdr
+ gl2psincdir=$found_dir
+ fi
+
+ check_library "libgl2ps" "$enable_shared" "" \
+ $GL2PS ${GL2PS:+$GL2PS/lib} /usr/lib
+ if test "x$found_lib" = "x" ; then
+ gl2pslib=""
+ gl2pslibdir=""
+ enable_builtin_gl2ps="yes"
+ else
+ gl2pslib="$found_lib"
+ gl2pslibdir="$found_dir"
+ fi
+
+ if test "x$gl2psincdir" = "x" || test "x$gl2pslib" = "x"; then
+ enable_builtin_gl2ps="yes"
+ fi
+fi
+message "Checking whether to build included gl2ps"
+result "$enable_builtin_gl2ps"
+
+######################################################################
+#
### echo %%% libpcre (builtin or system) - Mandatory lib
#
# Mandatory test, must succeed (see http://www.pcre.org/)
@@ -7593,6 +7629,10 @@
-e "s|@ftglincdir@|$ftglincdir|" \
-e "s|@ftgllibdir@|$ftgllibdir|" \
-e "s|@ftgllibs@|$ftgllibs|" \
+ -e "s|@builtingl2ps@|$enable_builtin_gl2ps|" \
+ -e "s|@gl2psincdir@|$gl2psincdir|" \
+ -e "s|@gl2pslib@|$gl2pslib|" \
+ -e "s|@gl2pslibdir@|$gl2pslibdir|" \
-e "s|@glewincdir@|$glewincdir|" \
-e "s|@glewlibdir@|$glewlibdir|" \
-e "s|@glewlibs@|$glewlibs|" \
diff -Nur root-6.06.02.orig/graf3d/gl/CMakeLists.txt root-6.06.02/graf3d/gl/CMakeLists.txt
--- root-6.06.02.orig/graf3d/gl/CMakeLists.txt 2016-03-20 14:47:57.684579337 +0100
+++ root-6.06.02/graf3d/gl/CMakeLists.txt 2016-03-20 18:11:50.286931862 +0100
@@ -7,12 +7,20 @@
ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
list(REMOVE_ITEM headers gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h TGLContextPrivate.h
TGLMarchingCubes.h TKDEAdapter.h TGL5DPainter.h TKDEFGT.h TGLIsoMesh.h)
+set (installoptions OPTIONS REGEX gl2ps.h EXCLUDE)
ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
if(WIN32 OR cocoa)
list(REMOVE_ITEM headers TX11GL.h)
list(REMOVE_ITEM sources TX11GL.cxx)
- set(installoptions OPTIONS REGEX "TX11GL" EXCLUDE)
+ set(installoptions ${installoptions} REGEX TX11GL.h EXCLUDE)
+endif()
+
+if(builtin_gl2ps)
+ include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+else()
+ list(REMOVE_ITEM sources gl2ps.cxx)
+ include_directories(${GL2PS_INCLUDE_DIRS})
endif()
if(WIN32)
@@ -32,6 +40,6 @@
ROOT_GENERATE_DICTIONARY(G__GL ${headers} MODULE RGL LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
-ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
+ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx LIBRARIES ${gllibs} ${GL2PS_LIBRARIES} GLEW ${FTGL_LIBRARIES} fontconfig DEPENDENCIES Hist Gui Ged)
ROOT_INSTALL_HEADERS(${installoptions})
diff -Nur root-6.06.02.orig/graf3d/gl/Module.mk root-6.06.02/graf3d/gl/Module.mk
--- root-6.06.02.orig/graf3d/gl/Module.mk 2016-03-20 14:47:57.684579337 +0100
+++ root-6.06.02/graf3d/gl/Module.mk 2016-03-20 18:12:53.943561781 +0100
@@ -19,6 +19,7 @@
GLDH := $(GLDS:.cxx=.h)
GLH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
+GLH := $(filter-out $(MODDIRI)/gl2ps.h, $(GLH))
GLS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
# Excluded from win32 builds
@@ -42,6 +43,13 @@
# Used by rootcint
GLH2 := $(filter-out $(GLH1), $(GLH))
+ifeq ($(BUILTINGL2PS),yes)
+GL2PSFLAGS := -I$(MODDIRI)
+else()
+GLS := $(filter-out $(MODDIRS)/gl2ps.cxx, $(GLS))
+GL2PSFLAGS := $(GL2PSINCDIR:%=-I%)
+endif()
+
ifneq ($(OPENGLLIB),)
GLLIBS := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
$(XLIBS) -lm
@@ -78,6 +86,7 @@
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
"$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
+ $(GL2PSLIBDIR) $(GL2PSLIBS) \
$(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
$(call pcmrule,GL)
@@ -107,12 +116,12 @@
##### extra rules ######
ifeq ($(ARCH),win32)
$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
- $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
+ $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
$(GLDS): CINTFLAGS += $(OPENGLINCDIR:%=-I%) -I$(WIN32GDKDIR)/gdk/src \
- $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
+ $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%) $(GL2PSFLAGS)
else
-$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%)
-$(GLDS): CINTFLAGS += $(OPENGLINCDIR:%=-I%)
+$(GLO) $(GLDO): CXXFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
+$(GLDS): CINTFLAGS += $(OPENGLINCDIR:%=-I%) $(GL2PSFLAGS)
endif
$(call stripsrc,$(GLDIRS)/TGLText.o): $(FREETYPEDEP)

1031
root-html-markup.patch
View file

File diff suppressed because it is too large Load diff

877
root-latex-markup.patch
View file

@ -1,877 +0,0 @@
diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/src/TLatex.cxx
--- root-6.06.02.orig/graf2d/graf/src/TLatex.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf2d/graf/src/TLatex.cxx 2016-03-20 18:30:30.836024753 +0100
@@ -185,14 +185,19 @@
## <a name="L8"></a> Accents
Several kind of accents are available:
- #hat = Begin_Latex #hat{a} End_Latex
- #check = Begin_Latex #check{a} End_Latex
- #acute = Begin_Latex #acute{a} End_Latex
- #grave = Begin_Latex #grave{a} End_Latex
- #dot = Begin_Latex #dot{a} End_Latex
- #ddot = Begin_Latex #ddot{a} End_Latex
- #tilde = Begin_Latex #tilde{a} End_Latex
-
+Begin_Macro(source)
+{
+ TCanvas *cl = new TCanvas("cl","cl",10,10,700,350);
+ TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
+ Tl.DrawText(.1, .8, "#hat{a} :"); Tl.DrawLatex(.5, .8, "#hat{a}");
+ Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
+ Tl.DrawText(.1, .6, "#acute{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
+ Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
+ Tl.DrawText(.1, .4, "#dot{a} :"); Tl.DrawLatex(.5, .4, "#dot{a}");
+ Tl.DrawText(.1, .3, "#ddot{a} :"); Tl.DrawLatex(.5, .3, "#ddot{a}");
+ Tl.DrawText(.1, .2, "#tilde{a} :"); Tl.DrawLatex(.5, .2, "#tilde{a}");
+}
+End_Macro
The special sign: `#slash` draws a slash on top of the text between brackets:
diff -ur root-6.06.02.orig/hist/hist/src/TF1.cxx root-6.06.02/hist/hist/src/TF1.cxx
--- root-6.06.02.orig/hist/hist/src/TF1.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TF1.cxx 2016-03-20 18:30:30.871025101 +0100
@@ -949,9 +949,9 @@
/// Getting the error via TF1::DerivativeError:
/// (total error = roundoff error + interpolation error)
/// the estimate of the roundoff error is taken as follows:
-///Begin_Latex
-/// err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
-///End_Latex
+/// \f[
+/// err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
+/// \f]
/// where k is the double precision, ai are coefficients used in
/// central difference formulas
/// interpolation error is decreased by making the step size h smaller.
diff -ur root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx
--- root-6.06.02.orig/hist/hist/src/TGraphAsymmErrors.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TGraphAsymmErrors.cxx 2016-03-20 18:30:30.872025110 +0100
@@ -360,27 +360,33 @@
///
/// If the histograms are not filled with unit weights, the number of effective
/// entries is used to normalise the bin contents which might lead to wrong results.
-/// Begin_Latex effective entries = #frac{(#sum w_{i})^{2}}{#sum w_{i}^{2}}End_Latex
-///
+/// \f[
+/// \text{effective entries} = \frac{(\sum w_{i})^{2}}{\sum w_{i}^{2}}
+/// \f]
/// The points are assigned a x value at the center of each histogram bin.
-/// The y values are Begin_Latex eff = #frac{pass}{total} End_Latex for all options except for the
+/// The y values are \f$\text{eff} = \frac{\text{pass}}{\text{total}}\f$
+/// for all options except for the
/// bayesian methods where the result depends on the chosen option.
///
-/// If the denominator becomes 0 or pass > total, the corresponding bin is
+/// If the denominator becomes 0 or pass > total, the corresponding bin is
/// skipped.
///
/// 2) calculating ratios of two Poisson means (option 'pois'):
/// --------------------------------------------------------------
///
/// The two histograms are interpreted as independent Poisson processes and the ratio
-/// Begin_Latex #tau = #frac{n_{1}}{n_{2}} = #frac{#varepsilon}{1 - #varepsilon} with #varepsilon = #frac{n_{1}}{n_{1} + n_{2}} End_Latex
-/// The histogram 'pass' is interpreted as n_{1} and the total histogram
-/// is used for n_{2}
+/// \f[
+/// \tau = \frac{n_{1}}{n_{2}} = \frac{\varepsilon}{1 - \varepsilon}
+/// \f]
+/// with \f$\varepsilon = \frac{n_{1}}{n_{1} + n_{2}}\f$.
+/// The histogram 'pass' is interpreted as \f$n_{1}\f$ and the total histogram
+/// is used for \f$n_{2}\f$.
///
/// The (asymmetric) uncertainties of the Poisson ratio are linked to the uncertainties
/// of efficiency by a parameter transformation:
-/// Begin_Latex #Delta #tau_{low/up} = #frac{1}{(1 - #varepsilon)^{2}} #Delta #varepsilon_{low/up} End_Latex
-///
+/// \f[
+/// \Delta \tau_{low/up} = \frac{1}{(1 - \varepsilon)^{2}} \Delta \varepsilon_{low/up}
+/// \f]
/// The x errors span each histogram bin (lowedge ... lowedge+width)
/// The y errors depend on the chosen statistic methode which can be determined
/// by the options given below. For a detailed description of the used statistic
@@ -413,8 +419,7 @@
/// oscillation on the actual coverage probability a couple of approximations and
/// methodes has been developped. For a detailed discussion, please have a look at
/// this statistical paper:
-/// <a href="http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf"
-/// > http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf</a>
+/// http://www-stat.wharton.upenn.edu/~tcai/paper/Binomial-StatSci.pdf
void TGraphAsymmErrors::Divide(const TH1* pass, const TH1* total, Option_t *opt)
{
diff -ur root-6.06.02.orig/hist/hist/src/THnSparse.cxx root-6.06.02/hist/hist/src/THnSparse.cxx
--- root-6.06.02.orig/hist/hist/src/THnSparse.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/THnSparse.cxx 2016-03-20 18:30:30.872025110 +0100
@@ -764,8 +764,7 @@
////////////////////////////////////////////////////////////////////////////////
/// Get square of the error of bin addressed by linidx as
-/// BEGIN_LATEX #sum weight^{2}
-/// END_LATEX
+/// \f$\sum weight^{2}\f$
/// If errors are not enabled (via Sumw2() or CalculateErrors())
/// return contents.
diff -ur root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h
--- root-6.06.02.orig/math/mathcore/inc/Math/GaussIntegrator.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/inc/Math/GaussIntegrator.h 2016-03-20 18:30:30.910025487 +0100
@@ -92,31 +92,28 @@
Method:
For any interval [a,b] we define g8(a,b) and g16(a,b) to be the 8-point
and 16-point Gaussian quadrature approximations to
- Begin_Latex
- I = #int^{b}_{a} f(x)dx
- End_Latex
+ \f[
+ I = \int^{b}_{a} f(x)dx
+ \f]
and define
- Begin_Latex
- r(a,b) = #frac{#||{g_{16}(a,b)-g_{8}(a,b)}}{1+#||{g_{16}(a,b)}}
- End_Latex
+ \f[
+ r(a,b) = \frac{\left|g_{16}(a,b)-g_{8}(a,b)\right|}{1+\left|g_{16}(a,b)\right|}
+ \f]
Then,
- Begin_Latex
- G = #sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
- End_Latex
- where, starting with x0 = A and finishing with xk = B,
- the subdivision points xi(i=1,2,...) are given by
- Begin_Latex
- x_{i} = x_{i-1} + #lambda(B-x_{i-1})
- End_Latex
- Begin_Latex
- #lambda
- End_Latex
- is equal to the first member of the
- sequence 1,1/2,1/4,... for which r(xi-1, xi) < EPS.
+ \f[
+ G = \sum_{i=1}^{k}g_{16}(x_{i-1},x_{i})
+ \f]
+ where, starting with \f$x_{0} = A\f$ and finishing with \f$x_{k} = B\f$,
+ the subdivision points \f$x_{i}(i=1,2,...)\f$ are given by
+ \f[
+ x_{i} = x_{i-1} + \lambda(B-x_{i-1})
+ \f]
+ \f$\lambda\f$ is equal to the first member of the
+ sequence 1,1/2,1/4,... for which \f$r(x_{i-1}, x_{i}) < EPS\f$.
If, at any stage in the process of subdivision, the ratio
- Begin_Latex
- q = #||{#frac{x_{i}-x_{i-1}}{B-A}}
- End_Latex
+ \f[
+ q = \left|\frac{x_{i}-x_{i-1}}{B-A}\right|
+ \f]
is so small that 1+0.005q is indistinguishable from 1 to
machine accuracy, an error exit occurs with the function value
set equal to zero.
@@ -131,13 +128,13 @@
|I|&gt;1, and a bound on the absolute error in the case |I|&lt;1. More
precisely, if k is the number of sub-intervals contributing to the
approximation (see Method), and if
- Begin_Latex
- I_{abs} = #int^{B}_{A} #||{f(x)}dx
- End_Latex
+ \f[
+ I_{abs} = \int^{B}_{A} \left|f(x)\right|dx
+ \f]
then the relation
- Begin_Latex
- #frac{#||{G-I}}{I_{abs}+k} < EPS
- End_Latex
+ \f[
+ \frac{\left|G-I\right|}{I_{abs}+k} < EPS
+ \f]
will nearly always be true, provided the routine terminates without
printing an error message. For functions f having no singularities in
the closed interval [A,B] the accuracy will usually be much higher than
@@ -156,9 +153,9 @@
/** Returns Integral of function on an infinite interval.
This function computes, to an attempted specified accuracy, the value of the integral:
- Begin_Latex
- I = #int^{#infinity}_{-#infinity} f(x)dx
- End_Latex
+ \f[
+ I = \int^{\infty}_{-\infty} f(x)dx
+ \f]
Usage:
In any arithmetic expression, this function has the approximate value
of the integral I.
@@ -169,9 +166,9 @@
/** Returns Integral of function on an upper semi-infinite interval.
This function computes, to an attempted specified accuracy, the value of the integral:
- Begin_Latex
- I = #int^{#infinity}_{A} f(x)dx
- End_Latex
+ \f[
+ I = \int^{\infty}_{A} f(x)dx
+ \f]
Usage:
In any arithmetic expression, this function has the approximate value
of the integral I.
@@ -183,9 +180,9 @@
/** Returns Integral of function on a lower semi-infinite interval.
This function computes, to an attempted specified accuracy, the value of the integral:
- Begin_Latex
- I = #int^{B}_{#infinity} f(x)dx
- End_Latex
+ \f[
+ I = \int^{B}_{-\infty} f(x)dx
+ \f]
Usage:
In any arithmetic expression, this function has the approximate value
of the integral I.
diff -ur root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h
--- root-6.06.02.orig/math/mathcore/inc/Math/RichardsonDerivator.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/inc/Math/RichardsonDerivator.h 2016-03-20 18:30:30.910025487 +0100
@@ -88,10 +88,13 @@
computed by Richardson's extrapolation method (use 2 derivative estimates
to compute a third, more accurate estimation)
first, derivatives with steps h and h/2 are computed by central difference formulas
- Begin_Latex
- D(h) = #frac{f(x+h) - f(x-h)}{2h}
- End_Latex
- the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
+ \f[
+ D(h) = \frac{f(x+h) - f(x-h)}{2h}
+ \f]
+ the final estimate
+ \f[
+ D = \frac{4D(h/2) - D(h)}{3}
+ \f]
"Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
the argument eps may be specified to control the step size (precision).
@@ -103,9 +106,9 @@
Getting the error via TF1::DerivativeError:
(total error = roundoff error + interpolation error)
the estimate of the roundoff error is taken as follows:
- Begin_Latex
- err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
- End_Latex
+ \f[
+ err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
+ \f]
where k is the double precision, ai are coefficients used in
central difference formulas
interpolation error is decreased by making the step size h smaller.
@@ -141,10 +144,13 @@
computed by Richardson's extrapolation method (use 2 derivative estimates
to compute a third, more accurate estimation)
first, derivatives with steps h and h/2 are computed by central difference formulas
- Begin_Latex
- D(h) = #frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
- End_Latex
- the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
+ \f[
+ D(h) = \frac{f(x+h) - 2f(x) + f(x-h)}{h^{2}}
+ \f]
+ the final estimate
+ \f[
+ D = \frac{4D(h/2) - D(h)}{3}
+ \f]
"Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
the argument eps may be specified to control the step size (precision).
@@ -156,9 +162,9 @@
Getting the error via TF1::DerivativeError:
(total error = roundoff error + interpolation error)
the estimate of the roundoff error is taken as follows:
- Begin_Latex
- err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
- End_Latex
+ \f[
+ err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
+ \f]
where k is the double precision, ai are coefficients used in
central difference formulas
interpolation error is decreased by making the step size h smaller.
@@ -177,10 +183,13 @@
computed by Richardson's extrapolation method (use 2 derivative estimates
to compute a third, more accurate estimation)
first, derivatives with steps h and h/2 are computed by central difference formulas
- Begin_Latex
- D(h) = #frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
- End_Latex
- the final estimate Begin_Latex D = #frac{4D(h/2) - D(h)}{3} End_Latex
+ \f[
+ D(h) = \frac{f(x+2h) - 2f(x+h) + 2f(x-h) - f(x-2h)}{2h^{3}}
+ \f]
+ the final estimate
+ \f[
+ D = \frac{4D(h/2) - D(h)}{3}
+ \f]
"Numerical Methods for Scientists and Engineers", H.M.Antia, 2nd edition"
the argument eps may be specified to control the step size (precision).
@@ -192,9 +201,9 @@
Getting the error via TF1::DerivativeError:
(total error = roundoff error + interpolation error)
the estimate of the roundoff error is taken as follows:
- Begin_Latex
- err = k#sqrt{f(x)^{2} + x^{2}deriv^{2}}#sqrt{#sum ai^{2}},
- End_Latex
+ \f[
+ err = k\sqrt{f(x)^{2} + x^{2}deriv^{2}}\sqrt{\sum ai^{2}},
+ \f]
where k is the double precision, ai are coefficients used in
central difference formulas
interpolation error is decreased by making the step size h smaller.
diff -ur root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx root-6.06.02/math/mathmore/src/KelvinFunctions.cxx
--- root-6.06.02.orig/math/mathmore/src/KelvinFunctions.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/src/KelvinFunctions.cxx 2016-03-20 18:30:30.911025497 +0100
@@ -34,35 +34,33 @@
double kEulerGamma = 0.577215664901532860606512090082402431042;
-/* Begin_Html
-<center><h2>KelvinFunctions</h2></center>
+/**
+\class KelvinFunctions
-<p>
This class calculates the Kelvin functions Ber(x), Bei(x), Ker(x),
Kei(x), and their first derivatives.
-</p>
-
-End_Html */
+*/
////////////////////////////////////////////////////////////////////////////////
-/// Begin_Latex
-/// Ber(x) = Ber_{0}(x) = Re#left[J_{0}#left(x e^{3#pii/4}#right)#right]
-/// End_Latex
-/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
+/// \f[
+/// Ber(x) = Ber_{0}(x) = Re\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
+/// \f]
+/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
/// function of the first kind.
///
/// If x < fgMin (=20), Ber(x) is computed according to its polynomial
/// approximation
-/// Begin_Latex
-/// Ber(x) = 1 + #sum_{n #geq 1}#frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
-/// End_Latex
+/// \f[
+/// Ber(x) = 1 + \sum_{n \geq 1}\frac{(-1)^{n}(x/2)^{4n}}{[(2n)!]^{2}}
+/// \f]
/// For x > fgMin, Ber(x) is computed according to its asymptotic
/// expansion:
-/// Begin_Latex
-/// Ber(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) cos#alpha + G1(x) sin#alpha] - #frac{1}{#pi}Kei(x)
-/// End_Latex
-/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex.
-/// See also F1(x) and G1(x).
+/// \f[
+/// Ber(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) cos\alpha + G1(x) sin\alpha] - \frac{1}{\pi}Kei(x)
+/// \f]
+/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
+///
+/// See also F1() and G1().
///
/// Begin_Macro
/// {
@@ -102,24 +100,25 @@
}
////////////////////////////////////////////////////////////////////////////////
-/// Begin_Latex
-/// Bei(x) = Bei_{0}(x) = Im#left[J_{0}#left(x e^{3#pii/4}#right)#right]
-/// End_Latex
-/// where x is real, and Begin_Latex J_{0}(z) End_Latex is the zeroth-order Bessel
+/// \f[
+/// Bei(x) = Bei_{0}(x) = Im\left[J_{0}\left(x e^{3\pi i/4}\right)\right]
+/// \f]
+/// where x is real, and \f$J_{0}(z)\f$ is the zeroth-order Bessel
/// function of the first kind.
///
/// If x < fgMin (=20), Bei(x) is computed according to its polynomial
/// approximation
-/// Begin_Latex
-/// Bei(x) = #sum_{n #geq 0}#frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
-/// End_Latex
+/// \f[
+/// Bei(x) = \sum_{n \geq 0}\frac{(-1)^{n}(x/2)^{4n+2}}{[(2n+1)!]^{2}}
+/// \f]
/// For x > fgMin, Bei(x) is computed according to its asymptotic
/// expansion:
-/// Begin_Latex
-/// Bei(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}} [F1(x) sin#alpha + G1(x) cos#alpha] - #frac{1}{#pi}Ker(x)
-/// End_Latex
-/// where Begin_Latex #alpha = #frac{x}{#sqrt{2}} - #frac{#pi}{8} End_Latex
-/// See also F1(x) and G1(x).
+/// \f[
+/// Bei(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}} [F1(x) sin\alpha + G1(x) cos\alpha] - \frac{1}{\pi}Ker(x)
+/// \f]
+/// where \f$\alpha = \frac{x}{\sqrt{2}} - \frac{\pi}{8}\f$.
+///
+/// See also F1() and G1().
///
/// Begin_Macro
/// {
@@ -161,29 +160,30 @@
////////////////////////////////////////////////////////////////////////////////
-/// Begin_Latex
-/// Ker(x) = Ker_{0}(x) = Re#left[K_{0}#left(x e^{3#pii/4}#right)#right]
-/// End_Latex
-/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
+/// \f[
+/// Ker(x) = Ker_{0}(x) = Re\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
+/// \f]
+/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
/// Bessel function of the second kind.
///
/// If x < fgMin (=20), Ker(x) is computed according to its polynomial
/// approximation
-/// Begin_Latex
-/// Ker(x) = -#left(ln #frac{|x|}{2} + #gamma#right) Ber(x) + #left(#frac{#pi}{4} - #delta#right) Bei(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n}
-/// End_Latex
-/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
-/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
-/// Begin_Latex
-/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
-/// End_Latex
+/// \f[
+/// Ker(x) = -\left(ln \frac{|x|}{2} + \gamma\right) Ber(x) + \left(\frac{\pi}{4} - \delta\right) Bei(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n}
+/// \f]
+/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
+/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
+/// \f[
+/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
+/// \f]
/// For x > fgMin, Ker(x) is computed according to its asymptotic
/// expansion:
-/// Begin_Latex
-/// Ker(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) cos#beta + G2(x) sin#beta]
-/// End_Latex
-/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
-/// See also F2(x) and G2(x).
+/// \f[
+/// Ker(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) cos\beta + G2(x) sin\beta]
+/// \f]
+/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
+///
+/// See also F2() and G2().
///
/// Begin_Macro
/// {
@@ -227,29 +227,30 @@
////////////////////////////////////////////////////////////////////////////////
-/// Begin_Latex
-/// Kei(x) = Kei_{0}(x) = Im#left[K_{0}#left(x e^{3#pii/4}#right)#right]
-/// End_Latex
-/// where x is real, and Begin_Latex K_{0}(z) End_Latex is the zeroth-order modified
+/// \f[
+/// Kei(x) = Kei_{0}(x) = Im\left[K_{0}\left(x e^{3\pi i/4}\right)\right]
+/// \f]
+/// where x is real, and \f$K_{0}(z)\f$ is the zeroth-order modified
/// Bessel function of the second kind.
///
/// If x < fgMin (=20), Kei(x) is computed according to its polynomial
/// approximation
-/// Begin_Latex
-/// Kei(x) = -#left(ln #frac{x}{2} + #gamma#right) Bei(x) - #left(#frac{#pi}{4} - #delta#right) Ber(x) + #sum_{n #geq 0} #frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} #left(#frac{x}{2}#right)^{4n+2}
-/// End_Latex
-/// where Begin_Latex #gamma = 0.577215664... End_Latex is the Euler-Mascheroni constant,
-/// Begin_Latex #delta = #pi End_Latex for x < 0 and is otherwise zero, and
-/// Begin_Latex
-/// H_{n} = #sum_{k = 1}^{n} #frac{1}{k}
-/// End_Latex
+/// \f[
+/// Kei(x) = -\left(ln \frac{x}{2} + \gamma\right) Bei(x) - \left(\frac{\pi}{4} - \delta\right) Ber(x) + \sum_{n \geq 0} \frac{(-1)^{n}}{[(2n)!]^{2}} H_{2n} \left(\frac{x}{2}\right)^{4n+2}
+/// \f]
+/// where \f$\gamma = 0.577215664...\f$ is the Euler-Mascheroni constant,
+/// \f$\delta = \pi\f$ for x < 0 and is otherwise zero, and
+/// \f[
+/// H_{n} = \sum_{k = 1}^{n} \frac{1}{k}
+/// \f]
/// For x > fgMin, Kei(x) is computed according to its asymptotic
/// expansion:
-/// Begin_Latex
-/// Kei(x) = - #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} [F2(x) sin#beta + G2(x) cos#beta]
-/// End_Latex
-/// where Begin_Latex #beta = #frac{x}{#sqrt{2}} + #frac{#pi}{8} End_Latex
-/// See also F2(x) and G2(x).
+/// \f[
+/// Kei(x) = - \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} [F2(x) sin\beta + G2(x) cos\beta]
+/// \f]
+/// where \f$\beta = \frac{x}{\sqrt{2}} + \frac{\pi}{8}\f$.
+///
+/// See also F2() and G2().
///
/// Begin_Macro
/// {
@@ -298,10 +299,10 @@
/// If x < fgMin (=20), DBer(x) is computed according to the derivative of
/// the polynomial approximation of Ber(x). Otherwise it is computed
/// according to its asymptotic expansion
-/// Begin_Latex
-/// #frac{d}{dx} Ber(x) = M cos#left(#theta - #frac{#pi}{4}#right)
-/// End_Latex
-/// See also M(x) and Theta(x).
+/// \f[
+/// \frac{d}{dx} Ber(x) = M cos\left(\theta - \frac{\pi}{4}\right)
+/// \f]
+/// See also M() and Theta().
///
/// Begin_Macro
/// {
@@ -343,10 +344,10 @@
/// If x < fgMin (=20), DBei(x) is computed according to the derivative of
/// the polynomial approximation of Bei(x). Otherwise it is computed
/// according to its asymptotic expansion
-/// Begin_Latex
-/// #frac{d}{dx} Bei(x) = M sin#left(#theta - #frac{#pi}{4}#right)
-/// End_Latex
-/// See also M(x) and Theta(x).
+/// \f[
+/// \frac{d}{dx} Bei(x) = M sin\left(\theta - \frac{\pi}{4}\right)
+/// \f]
+/// See also M() and Theta().
///
/// Begin_Macro
/// {
@@ -388,10 +389,10 @@
/// If x < fgMin (=20), DKer(x) is computed according to the derivative of
/// the polynomial approximation of Ker(x). Otherwise it is computed
/// according to its asymptotic expansion
-/// Begin_Latex
-/// #frac{d}{dx} Ker(x) = N cos#left(#phi - #frac{#pi}{4}#right)
-/// End_Latex
-/// See also N(x) and Phi(x).
+/// \f[
+/// \frac{d}{dx} Ker(x) = N cos\left(\phi - \frac{\pi}{4}\right)
+/// \f]
+/// See also N() and Phi().
///
/// Begin_Macro
/// {
@@ -436,10 +437,10 @@
/// If x < fgMin (=20), DKei(x) is computed according to the derivative of
/// the polynomial approximation of Kei(x). Otherwise it is computed
/// according to its asymptotic expansion
-/// Begin_Latex
-/// #frac{d}{dx} Kei(x) = N sin#left(#phi - #frac{#pi}{4}#right)
-/// End_Latex
-/// See also N(x) and Phi(x).
+/// \f[
+/// \frac{d}{dx} Kei(x) = N sin\left(\phi - \frac{\pi}{4}\right)
+/// \f]
+/// See also N() and Phi().
///
/// Begin_Macro
/// {
@@ -481,9 +482,9 @@
////////////////////////////////////////////////////////////////////////////////
/// Utility function appearing in the calculations of the Kelvin
/// functions Bei(x) and Ber(x) (and their derivatives). F1(x) is given by
-/// Begin_Latex
-/// F1(x) = 1 + #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
-/// End_Latex
+/// \f[
+/// F1(x) = 1 + \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
+/// \f]
double KelvinFunctions::F1(double x)
{
@@ -510,9 +511,9 @@
////////////////////////////////////////////////////////////////////////////////
/// Utility function appearing in the calculations of the Kelvin
/// functions Kei(x) and Ker(x) (and their derivatives). F2(x) is given by
-/// Begin_Latex
-/// F2(x) = 1 + #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos#left(#frac{n#pi}{4}#right)
-/// End_Latex
+/// \f[
+/// F2(x) = 1 + \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} cos\left(\frac{n\pi}{4}\right)
+/// \f]
double KelvinFunctions::F2(double x)
{
@@ -541,9 +542,9 @@
////////////////////////////////////////////////////////////////////////////////
/// Utility function appearing in the calculations of the Kelvin
/// functions Bei(x) and Ber(x) (and their derivatives). G1(x) is given by
-/// Begin_Latex
-/// G1(x) = #sum_{n #geq 1} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
-/// End_Latex
+/// \f[
+/// G1(x) = \sum_{n \geq 1} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
+/// \f]
double KelvinFunctions::G1(double x)
{
@@ -568,9 +569,9 @@
////////////////////////////////////////////////////////////////////////////////
/// Utility function appearing in the calculations of the Kelvin
/// functions Kei(x) and Ker(x) (and their derivatives). G2(x) is given by
-/// Begin_Latex
-/// G2(x) = #sum_{n #geq 1} (-1)^{n} #frac{#prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin#left(#frac{n#pi}{4}#right)
-/// End_Latex
+/// \f[
+/// G2(x) = \sum_{n \geq 1} (-1)^{n} \frac{\prod_{m=1}^{n}(2m - 1)^{2}}{n! (8x)^{n}} sin\left(\frac{n\pi}{4}\right)
+/// \f]
double KelvinFunctions::G2(double x)
{
@@ -597,9 +598,9 @@
////////////////////////////////////////////////////////////////////////////////
/// Utility function appearing in the asymptotic expansions of DBer(x) and
/// DBei(x). M(x) is given by
-/// Begin_Latex
-/// M(x) = #frac{e^{x/#sqrt{2}}}{#sqrt{2#pix}}#left(1 + #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} - #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
-/// End_Latex
+/// \f[
+/// M(x) = \frac{e^{x/\sqrt{2}}}{\sqrt{2\pi x}}\left(1 + \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} - \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
+/// \f]
double KelvinFunctions::M(double x)
{
@@ -612,10 +613,10 @@
////////////////////////////////////////////////////////////////////////////////
/// Utility function appearing in the asymptotic expansions of DBer(x) and
-/// DBei(x). Begin_Latex #theta(x) #End_Latex is given by
-/// Begin_Latex
-/// #theta(x) = #frac{x}{#sqrt{2}} - #frac{#pi}{8} - #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} - #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
-/// End_Latex
+/// DBei(x). \f$\theta(x)\f$ is given by
+/// \f[
+/// \theta(x) = \frac{x}{\sqrt{2}} - \frac{\pi}{8} - \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} - \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
+/// \f]
double KelvinFunctions::Theta(double x)
{
@@ -628,10 +629,10 @@
////////////////////////////////////////////////////////////////////////////////
/// Utility function appearing in the asymptotic expansions of DKer(x) and
-/// DKei(x). (x) is given by
-/// Begin_Latex
-/// N(x) = #sqrt{#frac{#pi}{2x}} e^{-x/#sqrt{2}} #left(1 - #frac{1}{8#sqrt{2} x} + #frac{1}{256 x^{2}} + #frac{399}{6144#sqrt{2} x^{3}} + O#left(#frac{1}{x^{4}}#right)#right)
-/// End_Latex
+/// DKei(x). N(x) is given by
+/// \f[
+/// N(x) = \sqrt{\frac{\pi}{2x}} e^{-x/\sqrt{2}} \left(1 - \frac{1}{8\sqrt{2} x} + \frac{1}{256 x^{2}} + \frac{399}{6144\sqrt{2} x^{3}} + O\left(\frac{1}{x^{4}}\right)\right)
+/// \f]
double KelvinFunctions::N(double x)
{
@@ -644,10 +645,10 @@
////////////////////////////////////////////////////////////////////////////////
/// Utility function appearing in the asymptotic expansions of DKer(x) and
-/// DKei(x). Begin_Latex #phi(x) #End_Latex is given by
-/// Begin_Latex
-/// #phi(x) = - #frac{x}{#sqrt{2}} - #frac{#pi}{8} + #frac{1}{8#sqrt{2} x} - #frac{1}{16 x^{2}} + #frac{25}{384#sqrt{2} x^{3}} + O#left(#frac{1}{x^{5}}#right)
-/// End_Latex
+/// DKei(x). \f$\phi(x)\f$ is given by
+/// \f[
+/// \phi(x) = - \frac{x}{\sqrt{2}} - \frac{\pi}{8} + \frac{1}{8\sqrt{2} x} - \frac{1}{16 x^{2}} + \frac{25}{384\sqrt{2} x^{3}} + O\left(\frac{1}{x^{5}}\right)
+/// \f]
double KelvinFunctions::Phi(double x)
{
diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h
--- root-6.06.02.orig/roofit/roostats/inc/RooStats/HybridResult.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roostats/inc/RooStats/HybridResult.h 2016-03-20 18:30:30.945025834 +0100
@@ -85,7 +85,7 @@
/// The error on the "confidence level" of the alternative hypothesis
Double_t CLsplusbError() const;
- /// The error on the ratio CLs+b/CLb
+ /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
Double_t CLsError() const;
private:
diff -ur root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h
--- root-6.06.02.orig/roofit/roostats/inc/RooStats/HypoTestResult.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roostats/inc/RooStats/HypoTestResult.h 2016-03-20 18:30:30.972026102 +0100
@@ -37,11 +37,12 @@
Any tool inheriting from HypoTestCalculator can return a HypoTestResult.
As such, it stores a p-value for the null-hypothesis (eg. background-only)
and an alternate hypothesis (eg. signal+background).
- The p-values can also be transformed into confidence levels (CLb, CLsplusb) in a trivial way.
- The ratio of the CLsplusb to CLb is often called CLs, and is considered useful, though it is
- not a probability.
- Finally, the p-value of the null can be transformed into a number of equivalent Gaussian sigma using the
- Significance method.
+ The p-values can also be transformed into confidence levels
+ (\f$CL_{b}\f$, \f$CL_{s+b}\f$) in a trivial way.
+ The ratio of the \f$CL_{s+b}\f$ to \f$CL_{b}\f$ is often called
+ \f$CL_{s}\f$, and is considered useful, though it is not a probability.
+ Finally, the p-value of the null can be transformed into a number of
+ equivalent Gaussian sigma using the Significance method.
The p-value of the null for a given test statistic is rigorously defined and
this is the starting point for the following conventions.
@@ -52,17 +53,17 @@
observed value of the test statistic. This is the more standard
convention and avoids confusion when doing inverted tests.
-For exclusion, we also want the formula
-CLs = CLs+b / CLb to hold which therefore defines our conventions
-for CLs+b and CLb. CLs was specifically invented for exclusion
+For exclusion, we also want the formula \f$CL_{s} = CL_{s+b} / CL_{b}\f$
+to hold which therefore defines our conventions for \f$CL_{s+b}\f$ and
+\f$CL_{b}\f$. \f$CL_{s}\f$ was specifically invented for exclusion
and therefore all quantities need be related through the assignments
-as they are for exclusion: **CLs+b = p_{s+b}; CLb = p_b**. This
+as they are for exclusion: \f$CL_{s+b} = p_{s+b}\f$; \f$CL_{b} = p_{b}\f$. This
is derived by considering the scenarios of a powerful and not powerful
-inverted test, where for the not so powerful test, CLs must be
+inverted test, where for the not so powerful test, \f$CL_{s}\f$ must be
close to one.
For results of Hypothesis tests,
-CLs has no similar direct interpretation as for exclusion and can
+\f$CL_{s}\f$ has no similar direct interpretation as for exclusion and can
be larger than one.
*/
@@ -101,7 +102,7 @@
/// Convert AlternatePValue into a "confidence level"
virtual Double_t CLsplusb() const { return !fBackgroundIsAlt ? AlternatePValue() : NullPValue(); }
- /// CLs is simply CLs+b/CLb (not a method, but a quantity)
+ /// \f$CL_{s}\f$ is simply \f$CL_{s+b}/CL_{b}\f$ (not a method, but a quantity)
virtual Double_t CLs() const {
double thisCLb = CLb();
if (thisCLb == 0) {
@@ -144,7 +145,7 @@
/// The error on the "confidence level" of the alternative hypothesis
Double_t CLsplusbError() const;
- /// The error on the ratio CLs+b/CLb
+ /// The error on the ratio \f$CL_{s+b}/CL_{b}\f$
Double_t CLsError() const;
/// The error on the Null p-value
diff -ur root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx root-6.06.02/roofit/roostats/src/HybridResult.cxx
--- root-6.06.02.orig/roofit/roostats/src/HybridResult.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roostats/src/HybridResult.cxx 2016-03-20 18:30:30.973026112 +0100
@@ -100,11 +100,9 @@
}
///////////////////////////////////////////////////////////////////////////
-
+/// Returns \f$1 - CL_{b}\f$ : the B p-value
double HybridResult::NullPValue() const
{
- // return 1-CL_b : the B p-value
-
if (fComputationsNulDoneFlag==false) {
int nToys = fTestStat_b.size();
if (nToys==0) {
@@ -131,11 +129,9 @@
}
///////////////////////////////////////////////////////////////////////////
-
+/// Returns \f$CL_{s+b}\f$ : the S+B p-value
double HybridResult::AlternatePValue() const
{
- // return CL_s+b : the S+B p-value
-
if (fComputationsAltDoneFlag==false) {
int nToys = fTestStat_b.size();
if (nToys==0) {
@@ -162,40 +158,37 @@
}
///////////////////////////////////////////////////////////////////////////
-
+/// Returns an estimate of the error on \f$CL_{b}\f$ assuming a binomial
+/// error on \f$CL_{b}\f$:
+/// \f[
+/// \sigma_{CL_{b}} = \sqrt{CL_{b} \left( 1 - CL_{b} \right) / n_{toys}}
+/// \f]
Double_t HybridResult::CLbError() const
{
- // Returns an estimate of the error on CLb assuming a binomial error on
- // CLb:
- // BEGIN_LATEX
- // #sigma_{CL_{b}} &=& #sqrt{CL_{b} #left( 1 - CL_{b} #right) / n_{toys}}
- // END_LATEX
unsigned const int n = fTestStat_b.size();
return TMath::Sqrt(CLb() * (1. - CLb()) / n);
}
///////////////////////////////////////////////////////////////////////////
-
+/// Returns an estimate of the error on \f$CL_{s+b}\f$ assuming a binomial
+/// error on \f$CL_{s+b}\f$:
+/// \f[
+/// \sigma_{CL_{s+b}} = \sqrt{CL_{s+b} \left( 1 - CL_{s+b} \right) / n_{toys}}
+/// \f]
Double_t HybridResult::CLsplusbError() const
{
- // Returns an estimate of the error on CLsplusb assuming a binomial
- // error on CLsplusb:
- // BEGIN_LATEX
- // #sigma_{CL_{s+b}} &=& #sqrt{CL_{s+b} #left( 1 - CL_{s+b} #right) / n_{toys}}
- // END_LATEX
unsigned const int n = fTestStat_sb.size();
return TMath::Sqrt(CLsplusb() * (1. - CLsplusb()) / n);
}
///////////////////////////////////////////////////////////////////////////
-
+/// Returns an estimate of the error on \f$CL_{s}\f$ through combination
+/// of the errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
+/// \f[
+/// \sigma_{CL_s} = CL_s \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
+/// \f]
Double_t HybridResult::CLsError() const
{
- // Returns an estimate of the error on CLs through combination of the
- // errors on CLb and CLsplusb:
- // BEGIN_LATEX
- // #sigma_{CL_s} &=& CL_s #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
- // END_LATEX
unsigned const int n_b = fTestStat_b.size();
unsigned const int n_sb = fTestStat_sb.size();
diff -ur root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx root-6.06.02/roofit/roostats/src/HypoTestResult.cxx
--- root-6.06.02.orig/roofit/roostats/src/HypoTestResult.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/roofit/roostats/src/HypoTestResult.cxx 2016-03-20 18:30:30.973026112 +0100
@@ -229,8 +229,8 @@
}
////////////////////////////////////////////////////////////////////////////////
-/// compute CLb error
-/// Clb = 1 - NullPValue()
+/// compute \f$CL_{b}\f$ error
+/// \f$CL_{b}\f$ = 1 - NullPValue()
/// must use opposite condition that routine above
Double_t HypoTestResult::CLbError() const {
@@ -251,12 +251,12 @@
}
////////////////////////////////////////////////////////////////////////////////
-/// Returns an estimate of the error on CLs through combination of the
-/// errors on CLb and CLsplusb:
-/// BEGIN_LATEX
-/// #sigma_{CL_s} = CL_s
-/// #sqrt{#left( #frac{#sigma_{CL_{s+b}}}{CL_{s+b}} #right)^2 + #left( #frac{#sigma_{CL_{b}}}{CL_{b}} #right)^2}
-/// END_LATEX
+/// Returns an estimate of the error on \f$CL_{s}\f$ through combination of the
+/// errors on \f$CL_{b}\f$ and \f$CL_{s+b}\f$:
+/// \f[
+/// \sigma_{CL_s} = CL_s
+/// \sqrt{\left( \frac{\sigma_{CL_{s+b}}}{CL_{s+b}} \right)^2 + \left( \frac{\sigma_{CL_{b}}}{CL_{b}} \right)^2}
+/// \f]
Double_t HypoTestResult::CLsError() const {
if(!fAltDistr || !fNullDistr) return 0.0;

182
root-libgfortranbegin.patch
View file

@ -1,182 +0,0 @@
diff -ur root-6.06.02.orig/config/Makefile.freebsd7 root-6.06.02/config/Makefile.freebsd7
--- root-6.06.02.orig/config/Makefile.freebsd7 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.freebsd7 2016-03-20 16:55:12.753322362 +0100
@@ -49,8 +49,10 @@
endif
F77FLAGS = -fPIC -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a)
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.hurddeb root-6.06.02/config/Makefile.hurddeb
--- root-6.06.02.orig/config/Makefile.hurddeb 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.hurddeb 2016-03-20 16:55:12.753322362 +0100
@@ -42,8 +42,10 @@
endif
F77FLAGS = -fPIC -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linux root-6.06.02/config/Makefile.linux
--- root-6.06.02.orig/config/Makefile.linux 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linux 2016-03-20 16:55:12.753322362 +0100
@@ -55,8 +55,10 @@
else
F77LIBS := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
endif
+ifneq ($(shell $(F77) -m32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linuxalphagcc root-6.06.02/config/Makefile.linuxalphagcc
--- root-6.06.02.orig/config/Makefile.linuxalphagcc 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linuxalphagcc 2016-03-20 16:55:12.753322362 +0100
@@ -42,8 +42,10 @@
endif
F77FLAGS = -fPIC -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linuxarm root-6.06.02/config/Makefile.linuxarm
--- root-6.06.02.orig/config/Makefile.linuxarm 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linuxarm 2016-03-20 16:55:12.753322362 +0100
@@ -49,8 +49,10 @@
endif
F77FLAGS = -fPIC -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linuxarm64 root-6.06.02/config/Makefile.linuxarm64
--- root-6.06.02.orig/config/Makefile.linuxarm64 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linuxarm64 2016-03-20 16:55:12.753322362 +0100
@@ -53,8 +53,10 @@
else
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.a)
endif
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a)
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linuxhppa root-6.06.02/config/Makefile.linuxhppa
--- root-6.06.02.orig/config/Makefile.linuxhppa 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linuxhppa 2016-03-20 16:55:12.753322362 +0100
@@ -43,8 +43,10 @@
endif
F77FLAGS = -fPIC -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linuxia64gcc root-6.06.02/config/Makefile.linuxia64gcc
--- root-6.06.02.orig/config/Makefile.linuxia64gcc 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linuxia64gcc 2016-03-20 16:55:12.753322362 +0100
@@ -42,8 +42,10 @@
endif
F77FLAGS = -fPIC -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.a)
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linuxppcgcc root-6.06.02/config/Makefile.linuxppcgcc
--- root-6.06.02.orig/config/Makefile.linuxppcgcc 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linuxppcgcc 2016-03-20 16:55:12.753322362 +0100
@@ -50,8 +50,10 @@
endif
F77FLAGS = -m32 -fPIC -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.$(SOEXT))
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a) -lnsl
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linuxx32gcc root-6.06.02/config/Makefile.linuxx32gcc
--- root-6.06.02.orig/config/Makefile.linuxx32gcc 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linuxx32gcc 2016-03-20 16:55:12.753322362 +0100
@@ -54,8 +54,10 @@
else
F77LIBS := $(shell $(F77) -mx32 -print-file-name=libgfortran.a)
endif
+ifneq ($(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -mx32 -print-file-name=libgfortranbegin.a)
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.linuxx8664gcc root-6.06.02/config/Makefile.linuxx8664gcc
--- root-6.06.02.orig/config/Makefile.linuxx8664gcc 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.linuxx8664gcc 2016-03-20 16:55:12.754322372 +0100
@@ -62,8 +62,10 @@
else
F77LIBS := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
endif
+ifneq ($(shell $(F77) -m64 -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.win32gcc root-6.06.02/config/Makefile.win32gcc
--- root-6.06.02.orig/config/Makefile.win32gcc 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.win32gcc 2016-03-20 16:55:12.754322372 +0100
@@ -55,8 +55,10 @@
endif
F77FLAGS = -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.a)
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a)
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)
diff -ur root-6.06.02.orig/config/Makefile.win64gcc root-6.06.02/config/Makefile.win64gcc
--- root-6.06.02.orig/config/Makefile.win64gcc 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/Makefile.win64gcc 2016-03-20 16:55:12.754322372 +0100
@@ -55,8 +55,10 @@
endif
F77FLAGS = -std=legacy
F77LIBS := $(shell $(F77) -print-file-name=libgfortran.a)
+ifneq ($(shell $(F77) -print-file-name=libgfortranbegin.a),libgfortranbegin.a)
F77LIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a)
endif
+endif
ifneq ($(findstring g77, $(F77)),)
ifeq ($(F77),)

376
root-links.patch
View file

@ -1,376 +0,0 @@
diff -ur root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md root-6.06.02/documentation/users-guide/PhysicsVectors.md
--- root-6.06.02.orig/documentation/users-guide/PhysicsVectors.md 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/documentation/users-guide/PhysicsVectors.md 2016-03-07 19:15:32.945004806 +0100
@@ -5,7 +5,7 @@
and their rotation algorithms. The classes were ported to root from
CLHEP see:
-<http://wwwinfo.cern.ch/asd/lhc++/clhep/manual/UserGuide/Vector/vector.html>
+<http://www.cern.ch/clhep/manual/UserGuide/Vector/vector.html>
## The Physics Vector Classes
diff -ur root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx root-6.06.02/hist/hist/src/TVirtualFitter.cxx
--- root-6.06.02.orig/hist/hist/src/TVirtualFitter.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TVirtualFitter.cxx 2016-03-07 19:15:32.945004806 +0100
@@ -331,7 +331,7 @@
////////////////////////////////////////////////////////////////////////////////
/// static: Set the maximum number of function calls for the minimization algorithm
/// For example for MIGRAD this is the maxcalls value passed as first argument
-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
void TVirtualFitter::SetMaxIterations(Int_t niter)
{
@@ -341,7 +341,7 @@
////////////////////////////////////////////////////////////////////////////////
/// static: Set the Error Definition (default=1)
/// For Minuit this is the value passed with the "SET ERR" command
-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html)
+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html)
void TVirtualFitter::SetErrorDef(Double_t errdef)
{
@@ -356,7 +356,7 @@
////////////////////////////////////////////////////////////////////////////////
/// static: Set the tolerance used in the minimization algorithm
/// For example for MIGRAD this is tolerance value passed as second argument
-/// (see http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/node18.html )
+/// (see https://cern-tex.web.cern.ch/cern-tex/minuit/node18.html )
void TVirtualFitter::SetPrecision(Double_t prec)
{
diff -ur root-6.06.02.orig/man/man1/g2root.1 root-6.06.02/man/man1/g2root.1
--- root-6.06.02.orig/man/man1/g2root.1 2016-03-09 23:32:55.884697035 +0100
+++ root-6.06.02/man/man1/g2root.1 2016-03-07 19:15:34.837027205 +0100
@@ -13,7 +13,7 @@
You can convert a
.B GEANT
(see
-.I http://wwwinfo.cern.ch/asd/geant/index.html
+.I http://geant.cern.ch/
fore more on
.BR GEANT )
geometry to
diff -ur root-6.06.02.orig/man/man1/g2rootold.1 root-6.06.02/man/man1/g2rootold.1
--- root-6.06.02.orig/man/man1/g2rootold.1 2016-03-09 23:32:55.886697054 +0100
+++ root-6.06.02/man/man1/g2rootold.1 2016-03-07 19:15:34.838027217 +0100
@@ -5,15 +5,15 @@
.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
.\" other parms are allowed: see man(7), man(1)
.SH NAME
-g2rootold \- convert GEANT geomtry files to ROOT files
+g2rootold \- convert GEANT geometry files to ROOT files
.SH SYNOPSIS
-.B g2rootoldd
+.B g2rootold
.I [-f map_name] geant_name macro_name
.SH "DESCRIPTION"
You can convert a
.B GEANT
(see
-.I http://wwwinfo.cern.ch/asd/geant/index.html
+.I http://geant.cern.ch/
fore more on
.BR GEANT )
geometry to
@@ -103,9 +103,9 @@
.I JDIGI.
.SH "SEE ALSO"
.RS
-.IR root (1),
-.IR g2root (1),
-.IR h2root(1),
+.IR root(1) ,
+.IR g2root(1) ,
+.IR h2root(1) ,
.RE
and
.RS
diff -ur root-6.06.02.orig/math/doc/v520/index.html root-6.06.02/math/doc/v520/index.html
--- root-6.06.02.orig/math/doc/v520/index.html 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/doc/v520/index.html 2016-03-07 19:15:34.407022114 +0100
@@ -74,7 +74,7 @@
<ul>
<li><tt>GaussIntegrator</tt> and <tt>GaussLegendreIntegrator</tt> for numerical integration of one-dimensional functions. The first class uses Gaussian 8 and 16 point quadrature approximation, it provides the translation of the CERNLIB algorithm
- <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig, and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
+ <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/d103/top.html">DGAUSS</a> by Sigfried Kolbig, and it is used by the <tt>TF1::Integral</tt> method. The second one uses the Gauss Legendre quadrature formula. It is used by the <tt>TF1::IntegralFast</tt> method.
These classes implement both the same virtual interface as the adaptive integration methods provided by the MathMore library. They can all be created and used easily via the common class <tt>ROOT::Math::IntegratorOneDim</tt> providing the interfaces for numerical integration.
New template methods have been also included in the common Integration class in order to be able to integrate automatically any C++ callable object.
</li>
diff -ur root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h
--- root-6.06.02.orig/math/mathcore/inc/Math/PdfFuncMathCore.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/inc/Math/PdfFuncMathCore.h 2016-03-07 19:15:34.407022114 +0100
@@ -301,7 +301,7 @@
<A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
<A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
The same algorithms as in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
CERNLIB</A> (DENLAN) is used
@param x The argument \f$x\f$
diff -ur root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h
--- root-6.06.02.orig/math/mathcore/inc/Math/ProbFuncMathCore.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/inc/Math/ProbFuncMathCore.h 2016-03-07 19:15:34.407022114 +0100
@@ -381,7 +381,7 @@
<A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
<A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
The same algorithms as in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
CERNLIB</A> (DISLAN) is used.
@param x The argument \f$x\f$
@@ -756,7 +756,7 @@
<A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
<A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
The same algorithms as in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
CERNLIB</A> (XM1LAN) is used
@param x The argument \f$x\f$
@@ -783,7 +783,7 @@
<A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
<A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
The same algorithms as in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
CERNLIB</A> (XM1LAN) is used
@param x The argument \f$x\f$
diff -ur root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h
--- root-6.06.02.orig/math/mathcore/inc/Math/QuantFuncMathCore.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/inc/Math/QuantFuncMathCore.h 2016-03-07 19:15:34.407022114 +0100
@@ -528,7 +528,7 @@
<A HREF="http://dx.doi.org/10.1016/0010-4655(84)90085-7">Computer Phys. Comm. 31 (1984) 97-111</A>
<A HREF="http://dx.doi.org/10.1016/j.cpc.2008.03.002">[Erratum-ibid. 178 (2008) 972]</A>.
The same algorithms as in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g110/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g110/top.html">
CERNLIB</A> (RANLAN) is used.
@param z The argument \f$z\f$
diff -ur root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h
--- root-6.06.02.orig/math/mathcore/inc/Math/SpecFuncMathCore.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/inc/Math/SpecFuncMathCore.h 2016-03-07 19:15:34.408022126 +0100
@@ -193,7 +193,7 @@
For detailed description see
<A HREF="http://mathworld.wolfram.com/SineIntegral.html">
Mathworld</A>. The implementation used is that of
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
CERNLIB</A>,
based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
@@ -219,7 +219,7 @@
For detailed description see
<A HREF="http://mathworld.wolfram.com/CosineIntegral.html">
Mathworld</A>. The implementation used is that of
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c336/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c336/top.html">
CERNLIB</A>,
based on Y.L. Luke, The special functions and their approximations, v.II, (Academic Press, New York l969) 325-326.
diff -ur root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h
--- root-6.06.02.orig/math/mathmore/inc/Math/SpecFuncMathMore.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/inc/Math/SpecFuncMathMore.h 2016-03-07 19:15:34.681025358 +0100
@@ -193,7 +193,7 @@
(<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
Planetmath</A> and
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
CERNLIB</A>) use the + sign in front of n in the denominator. In
order to be C++ compliant, the present library uses the former
convention. The implementation used is that of
@@ -408,7 +408,7 @@
(<A HREF="http://www.gnu.org/software/gsl/manual/gsl-ref_7.html#SEC95">
GSL</A>, <A HREF="http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html">
Planetmath</A> and
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html">
CERNLIB</A>) use the + sign in front of n in the denominator. In
order to be C++ compliant, the present library uses the former
convention. The implementation used is that of
diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h
--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovAccurate.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/inc/Math/VavilovAccurate.h 2016-03-07 19:15:34.681025358 +0100
@@ -81,7 +81,7 @@
B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
<A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
which has been implemented in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
CERNLIB (G116)</A>.
The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
diff -ur root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h root-6.06.02/math/mathmore/inc/Math/VavilovFast.h
--- root-6.06.02.orig/math/mathmore/inc/Math/VavilovFast.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/inc/Math/VavilovFast.h 2016-03-07 19:15:34.681025358 +0100
@@ -90,7 +90,7 @@
A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
<A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
which has been implemented in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
CERNLIB (G115)</A>.
The class stores coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
diff -ur root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h root-6.06.02/math/mathmore/inc/Math/Vavilov.h
--- root-6.06.02.orig/math/mathmore/inc/Math/Vavilov.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/inc/Math/Vavilov.h 2016-03-07 19:15:34.681025358 +0100
@@ -92,14 +92,14 @@
A. Rotondi and P. Montagna, Fast calculation of Vavilov distribution,
<A HREF="http://dx.doi.org/10.1016/0168-583X(90)90749-K">Nucl. Instr. and Meth. B47 (1990) 215-224</A>,
which has been implemented in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g115/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g115/top.html">
CERNLIB (G115)</A>.
- VavilovAccurate uses the algorithm by
B. Schorr, Programs for the Landau and the Vavilov distributions and the corresponding random numbers,
<A HREF="http://dx.doi.org/10.1016/0010-4655(74)90091-5">Computer Phys. Comm. 7 (1974) 215-224</A>,
which has been implemented in
- <A HREF="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/g116/top.html">
+ <A HREF="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/g116/top.html">
CERNLIB (G116)</A>.
Both subclasses store coefficients needed to calculate \f$p(\lambda; \kappa, \beta^2)\f$
diff -ur root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx
--- root-6.06.02.orig/math/mathmore/src/SpecFuncMathMore.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathmore/src/SpecFuncMathMore.cxx 2016-03-07 19:15:34.681025358 +0100
@@ -103,7 +103,7 @@
http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
- CERNLIB
- http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
+ https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
while the latter is used by
@@ -239,7 +239,7 @@
http://planetmath.org/encyclopedia/EllipticIntegralsAndJacobiEllipticFunctions.html
- CERNLIB
- http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/c346/top.html
+ https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/c346/top.html
while the latter is used by
diff -ur root-6.06.02.orig/math/minuit/doc/index.txt root-6.06.02/math/minuit/doc/index.txt
--- root-6.06.02.orig/math/minuit/doc/index.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/minuit/doc/index.txt 2016-03-07 19:15:34.681025358 +0100
@@ -5,7 +5,7 @@
<li>The main TMinuit class is documented in class TMinuit.</li>
<li><a href="ftp://root.cern.ch/root/doc/5FittingHistograms.pdf">The Chapter about Fitting Histogram in the Users Guide
</a></li>
-<li><a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">The MINUIT documentation in CERNLIB
+<li><a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">The MINUIT documentation in CERNLIB
</a></li>
<li><a href="http://root.cern.ch/drupal/content/howtos#fit">How to Fit Histograms
</A></li>
diff -ur root-6.06.02.orig/math/minuit2/doc/index.txt root-6.06.02/math/minuit2/doc/index.txt
--- root-6.06.02.orig/math/minuit2/doc/index.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/minuit2/doc/index.txt 2016-03-07 19:15:34.682025370 +0100
@@ -13,7 +13,7 @@
<p>
<ol>
<li>
-F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>); </li>
+F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>); </li>
<li>
F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="http://seal.cern.ch/documents/minuit/mnusersguide.pdf">pdf</a>); </li>
<li>
diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.html root-6.06.02/math/minuit2/doc/Minuit2.html
--- root-6.06.02.orig/math/minuit2/doc/Minuit2.html 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/minuit2/doc/Minuit2.html 2016-03-07 19:15:34.681025358 +0100
@@ -32,7 +32,7 @@
<h2>References</h2>
<ol>
-<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html">html</a>);
+<li>F. James, <em>Fortran MINUIT Reference Manual</em> (<a href="https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html">html</a>);
<li>F. James and M. Winkler, <em>C++ MINUIT User's Guide</em> (<a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html">html</a> and
<a href="https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf">pdf</a>);
<li>F. James, <em>Minuit Tutorial on Function Minimization</em> (<a href="http://seal.cern.ch/documents/minuit/mntutorial.pdf">pdf</a>);
diff -ur root-6.06.02.orig/math/minuit2/doc/Minuit2.md root-6.06.02/math/minuit2/doc/Minuit2.md
--- root-6.06.02.orig/math/minuit2/doc/Minuit2.md 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/minuit2/doc/Minuit2.md 2016-03-07 19:15:34.682025370 +0100
@@ -14,7 +14,7 @@
## References
-1. F. James, _Fortran MINUIT Reference Manual_ ([html](http://wwwasdoc.web.cern.ch/wwwasdoc/minuit/minmain.html));
+1. F. James, _Fortran MINUIT Reference Manual_ ([html](https://cern-tex.web.cern.ch/cern-tex/minuit/minmain.html));
2. F. James and M. Winkler, _C++ MINUIT User's Guide_ ([html](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.html) and [pdf](https://root.cern.ch/root/htmldoc/guides/minuit2/Minuit2.pdf));
3. F. James, _Minuit Tutorial on Function Minimization_ ([pdf](http://seal.cern.ch/documents/minuit/mntutorial.pdf));
4. F. James, _The Interpretation of Errors in Minuit_ ([pdf](http://seal.cern.ch/documents/minuit/mnerror.pdf));
diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html root-6.06.02/math/smatrix/doc/SMatrixClass.html
--- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.html 2016-03-11 18:29:45.555122263 +0100
+++ root-6.06.02/math/smatrix/doc/SMatrixClass.html 2016-03-07 19:15:34.682025370 +0100
@@ -163,7 +163,7 @@
<h3>Linear Algebra Functions</h3>
Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric.
-In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html">dinv</a>.
+In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine <a href="https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html">dinv</a>.
<pre>
<em>// Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful</em>
bool ret = m.<strong>Invert</strong>()
diff -ur root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md root-6.06.02/math/smatrix/doc/SMatrixClass.md
--- root-6.06.02.orig/math/smatrix/doc/SMatrixClass.md 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/smatrix/doc/SMatrixClass.md 2016-03-07 19:15:34.682025370 +0100
@@ -132,7 +132,7 @@
### Linear Algebra Functions
-Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](http://wwwasdoc.web.cern.ch/wwwasdoc/shortwrupsdir/f010/top.html).
+Only limited linear algebra functionality is available for SMatrix. It is possible for squared matrices NxN, to find the inverse or to calculate the determinant. Different inversion algorithms are used if the matrix is smaller than 6x6 or if it is symmetric. In the case of a small matrix, a faster direct inversion is used. For a large (N > 6) symmetric matrix the Bunch-Kaufman diagonal pivoting method is used while for a large (N > 6) general matrix an LU factorization is performed using the same algorithm as in the CERNLIB routine [dinv](https://cern-tex.web.cern.ch/cern-tex/shortwrupsdir/f010/top.html).
<pre>_// Invert a NxN matrix. The inverted matrix replace the existing one and returns if the result is successful_
bool ret = m.**Invert**()
diff -ur root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx root-6.06.02/misc/table/src/TPolyLineShape.cxx
--- root-6.06.02.orig/misc/table/src/TPolyLineShape.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/misc/table/src/TPolyLineShape.cxx 2016-03-10 22:03:03.211002438 +0100
@@ -47,8 +47,8 @@
// V v v v v //
// TPolyLineShape TBRIK TTUBE TPCON TTRD1 //
// | ^ //
-// | | begin_html <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R O O T S H A P E S</a>end_html //
-// V | (see begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a>end_html as well) //
+// | | <a href="http://root.cern.ch/root/html/TShape.html#TShape:description">R O O T S H A P E S</a> //
+// V | (see <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node109.html#SECTION041000000000000000000000">GEANT 3.21 shapes</a> as well) //
// St_PolyLine3D | //
// | //
// TPoints3DABC //
diff -ur root-6.06.02.orig/misc/table/src/TVolume.cxx root-6.06.02/misc/table/src/TVolume.cxx
--- root-6.06.02.orig/misc/table/src/TVolume.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/misc/table/src/TVolume.cxx 2016-03-09 06:11:44.976464126 +0100
@@ -142,7 +142,7 @@
/// 10 - this unvisible, but sons are visible
/// 01 - this visible but sons
/// 11 - neither this nor its sons are visible
-/// Maps the value of the visibility flag to begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html
+/// Maps the value of the visibility flag to <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>
Int_t TVolume::MapStNode2GEANTVis(ENodeSEEN vis)
{
@@ -150,11 +150,12 @@
return mapVis[vis];
}
-//______________________________________________________________________________
-//ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
+////////////////////////////////////////////////////////////////////////////////
+/// ENodeSEEN TVolume::MapGEANT2StNodeVis(Int_t vis)
+/// Maps the value of <a href="https://cern-tex.web.cern.ch/cern-tex/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a> to the visibility flag
+
Int_t TVolume::MapGEANT2StNodeVis(Int_t vis)
{
-// Maps the value of begin_html <a href="http://wwwinfo.cern.ch/asdoc/geant_html3/node128.html#SECTION056000000000000000000000">GEANT 3.21 "volume attributes"</a>end_html to the visibility flag
const Int_t mapVis[4] = {1, -2, 0, -1 };
Int_t i;
// for (i =0; i<3;i++) if (mapVis[i] == vis) return (ENodeSEEN)i;

11
root-llvm-static.patch
View file

@ -1,11 +0,0 @@
diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
--- root-6.06.02.orig/interpreter/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/interpreter/CMakeLists.txt 2016-04-06 19:43:31.596966193 +0200
@@ -59,6 +59,7 @@
endif()
endif()
set(CMAKE_BUILD_TYPE ${LLVM_BUILD_TYPE})
+set(BUILD_SHARED_LIBS "NO")
#--- Do not build cling as part of llvm.
set(LLVM_NOCLING "YES")

36
root-macro-align.patch
View file

@ -1,36 +0,0 @@
diff -ur root-6.06.02.orig/hist/hist/src/TEfficiency.cxx root-6.06.02/hist/hist/src/TEfficiency.cxx
--- root-6.06.02.orig/hist/hist/src/TEfficiency.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TEfficiency.cxx 2016-03-08 21:34:59.673902466 +0100
@@ -329,7 +329,7 @@
parameters are shown in the plot below.
Begin_Macro(source)
- {
+{
//canvas only needed for the documentation
TCanvas* c1 = new TCanvas("c1","",600,400);
c1->SetFillStyle(1001);
@@ -363,7 +363,7 @@
//only for this documentation
return c1;
- }
+}
End_Macro
diff -ur root-6.06.02.orig/hist/hist/src/TH1.cxx root-6.06.02/hist/hist/src/TH1.cxx
--- root-6.06.02.orig/hist/hist/src/TH1.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TH1.cxx 2016-03-08 13:45:25.689411795 +0100
@@ -1809,9 +1809,9 @@
/// of comparison of the unweighted histogram with 217 events (minimal expected
/// frequency equal to one) and the weighted histogram with 500 events (minimal
/// expected frequency equal to 25)
-///Begin_Macro
+/// Begin_Macro
/// ../../../tutorials/math/chi2test.C(17)
-///End_Macro
+/// End_Macro
/// Fig 2. An example of comparison of the unweighted histogram with 217 events
/// and the weighted histogram with 500 events:
/// a) unweighted histogram;

187
root-missing-cmake-config.patch
View file

@ -1,187 +0,0 @@
diff -Nur root-6.06.02.orig/CMakeLists.txt root-6.06.02/CMakeLists.txt
--- root-6.06.02.orig/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/CMakeLists.txt 2016-04-04 13:15:41.550400890 +0200
@@ -252,6 +252,12 @@
endif()
install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
REGEX system.rootrc EXCLUDE
+ REGEX system.rootauthrc EXCLUDE
+ REGEX system.rootdaemonrc EXCLUDE
+ REGEX rootd.rc.d EXCLUDE
+ REGEX proofd.rc.d EXCLUDE
+ REGEX rootd.xinetd EXCLUDE
+ REGEX proofd.xinetd EXCLUDE
REGEX root.mimes EXCLUDE)
install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR})
install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR})
diff -Nur 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-04-04 13:15:41.491400432 +0200
@@ -404,7 +404,13 @@
set(perl ${PERL_EXECUTABLE})
#---RConfigure-------------------------------------------------------------------------------------------------
-set(setresuid undef)
+CHECK_CXX_SOURCE_COMPILES("#include <unistd.h>
+ int main() { int i = setresuid(0, 0, 0); return 0;}" found_setresuid)
+if(found_setresuid)
+ set(setresuid define)
+else()
+ set(setresuid undef)
+endif()
if(mathmore)
set(hasmathmore define)
else()
@@ -523,7 +529,16 @@
execute_Process(COMMAND hostname OUTPUT_VARIABLE BuildNodeInfo OUTPUT_STRIP_TRAILING_WHITESPACE )
configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/system.rootrc @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/rootauthrc.in ${CMAKE_BINARY_DIR}/etc/system.rootauthrc @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/rootdaemonrc.in ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc @ONLY NEWLINE_STYLE UNIX)
+
+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd @ONLY NEWLINE_STYLE UNIX)
+
configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in include/RConfigOptions.h NEWLINE_STYLE UNIX)
+
if(ruby)
file(APPEND ${CMAKE_BINARY_DIR}/include/RConfigOptions.h "\#define R__RUBY_MAJOR ${RUBY_MAJOR_VERSION}\n\#define R__RUBY_MINOR ${RUBY_MINOR_VERSION}\n")
endif()
@@ -665,8 +680,21 @@
install(FILES ${CMAKE_BINARY_DIR}/etc/root.mimes
${CMAKE_BINARY_DIR}/etc/system.rootrc
+ ${CMAKE_BINARY_DIR}/etc/system.rootauthrc
+ ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d
+ ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d
+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
+
+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd
+ ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd
+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
+
install(FILES ${CMAKE_BINARY_DIR}/root-help.el DESTINATION ${CMAKE_INSTALL_ELISPDIR})
if(NOT gnuinstall)
diff -Nur root-6.06.02.orig/graf2d/x11/CMakeLists.txt root-6.06.02/graf2d/x11/CMakeLists.txt
--- root-6.06.02.orig/graf2d/x11/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf2d/x11/CMakeLists.txt 2016-04-04 13:15:47.557447569 +0200
@@ -9,4 +9,9 @@
ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
ROOT_LINKER_LIBRARY(${libname} *.cxx *.c G__${libname}.cxx LIBRARIES Core ${X11_LIBRARIES} ${X11_Xpm_LIB} ${CMAKE_THREAD_LIBS_INIT})
-ROOT_INSTALL_HEADERS()
+
+if(AIX)
+ include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+endif()
+
+ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X11 EXCLUDE)
diff -Nur root-6.06.02.orig/main/CMakeLists.txt root-6.06.02/main/CMakeLists.txt
--- root-6.06.02.orig/main/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/main/CMakeLists.txt 2016-04-04 13:15:41.568401030 +0200
@@ -7,6 +7,7 @@
ROOT_EXECUTABLE(rootn.exe rmain.cxx LIBRARIES New Core MathCore Rint)
ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore)
ROOT_EXECUTABLE(ssh2rpd ssh2rpd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c )
+ ROOT_EXECUTABLE(xpdtest xpdtest.cxx LIBRARIES Proof Tree Hist RIO Net Thread Matrix MathCore)
endif()
ROOT_EXECUTABLE(root.exe rmain.cxx LIBRARIES Core Rint)
ROOT_EXECUTABLE(proofserv.exe pmain.cxx LIBRARIES Core MathCore)
diff -Nur root-6.06.02.orig/net/CMakeLists.txt root-6.06.02/net/CMakeLists.txt
--- root-6.06.02.orig/net/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/net/CMakeLists.txt 2016-04-04 13:15:41.576401092 +0200
@@ -1,6 +1,7 @@
add_subdirectory(net)
add_subdirectory(auth) # special CMakeListst.txt
+add_subdirectory(rootd)
if(bonjour)
add_subdirectory(bonjour)
diff -Nur root-6.06.02.orig/net/rootd/CMakeLists.txt root-6.06.02/net/rootd/CMakeLists.txt
--- root-6.06.02.orig/net/rootd/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ root-6.06.02/net/rootd/CMakeLists.txt 2016-04-04 13:15:41.577401100 +0200
@@ -0,0 +1,9 @@
+############################################################################
+# CMakeLists.txt file for building ROOT net/rootd package
+# @author Pere Mato, CERN
+############################################################################
+
+ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
+ LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
+
+ROOT_INSTALL_HEADERS()
diff -Nur root-6.06.02.orig/proof/pq2/CMakeLists.txt root-6.06.02/proof/pq2/CMakeLists.txt
--- root-6.06.02.orig/proof/pq2/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/proof/pq2/CMakeLists.txt 2016-04-04 13:15:41.580401123 +0200
@@ -3,4 +3,7 @@
# @author Pere Mato, CERN
############################################################################
-ROOT_INSTALL_HEADERS()
\ No newline at end of file
+ROOT_EXECUTABLE(pq2 *.cxx LIBRARIES Core Proof Hist Matrix Tree
+ RIO Net Thread MathCore)
+
+ROOT_INSTALL_HEADERS()
diff -Nur root-6.06.02.orig/proof/proofd/CMakeLists.txt root-6.06.02/proof/proofd/CMakeLists.txt
--- root-6.06.02.orig/proof/proofd/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/proof/proofd/CMakeLists.txt 2016-04-04 13:15:41.583401147 +0200
@@ -4,6 +4,7 @@
############################################################################
include_directories(${XROOTD_INCLUDE_DIRS})
+include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
add_definitions(${XROOTD_CFLAGS})
ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion)
@@ -11,14 +12,16 @@
ROOT_LINKER_LIBRARY(XrdProofd XProofProtUtils.cxx LIBRARIES ${XROOTD_LIBRARIES})
else()
ROOT_EXECUTABLE(proofd proofd.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcat.c
- LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS} )
+ LIBRARIES ${XROOTD_LIBRARIES} rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTLIBS})
if (NOT XROOTD_NOMAIN)
ROOT_EXECUTABLE(xproofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
LIBRARIES ${XROOTD_LIBRARIES} ${SYSLIBS})
endif ()
ROOT_LINKER_LIBRARY(XrdProofd X*.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx
LIBRARIES ${XROOTD_LIBRARIES} rpdutil ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
- set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "" )
+ set_target_properties(XrdProofd PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ ROOT_EXECUTABLE(proofexecv proofexecv.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdconn.cxx ${CMAKE_SOURCE_DIR}/net/rpdutils/src/rpdpriv.cxx
+ LIBRARIES ${SYSLIBS})
endif()
if(builtin_xrootd)
@@ -38,4 +41,4 @@
endif()
-ROOT_INSTALL_HEADERS()
+ROOT_INSTALL_HEADERS(OPTIONS REGEX inc/X EXCLUDE)
diff -Nur root-6.06.02.orig/proof/proofx/CMakeLists.txt root-6.06.02/proof/proofx/CMakeLists.txt
--- root-6.06.02.orig/proof/proofx/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/proof/proofx/CMakeLists.txt 2016-04-04 13:15:41.595401240 +0200
@@ -1,4 +1,3 @@
-
############################################################################
# CMakeLists.txt file for building ROOT proof/proofx package
# @author Pere Mato, CERN
@@ -14,6 +13,7 @@
endif()
include_directories(${XROOTD_INCLUDE_DIRS})
+include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/../proofd/inc)
link_directories(${XROOTD_LIBRARY_DIR})
add_definitions(${XROOTD_CFLAGS})

33
root-more-fflags.patch
View file

@ -1,33 +0,0 @@
diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
index f51bcbe..1ee0602 100644
--- a/cmake/modules/RootConfiguration.cmake
+++ b/cmake/modules/RootConfiguration.cmake
@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
#---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
-string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
+string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
set(ROOT_COMPILER_FLAG_HINTS "#
set(ROOT_DEFINITIONS \"${__defs}\")
diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
index 045926d..a419744 100644
--- a/cmake/scripts/RootUseFile.cmake.in
+++ b/cmake/scripts/RootUseFile.cmake.in
@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
add_definitions(${ROOT_DEFINITIONS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
index b9a8e34..f931ad3 100644
--- a/etc/cmake/RootUseFile.cmake
+++ b/etc/cmake/RootUseFile.cmake
@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
add_definitions(${ROOT_DEFINITIONS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")

28
root-no-abi-check.patch
View file

@ -1,28 +0,0 @@
diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
index 896ca4c..51e01905 100644
--- a/cmake/modules/CheckCompiler.cmake
+++ b/cmake/modules/CheckCompiler.cmake
@@ -1,7 +1,6 @@
#---------------------------------------------------------------------------------------------------
# CheckCompiler.cmake
#---------------------------------------------------------------------------------------------------
-include (CheckCXXSourceCompiles)
#---Enable FORTRAN (unfortunatelly is not not possible in all cases)-------------------------------
if(fortran)
@@ -53,15 +52,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
endif()
message(STATUS "Found GCC. Major version ${GCC_MAJOR}, minor version ${GCC_MINOR}")
set(COMPILER_VERSION gcc${GCC_MAJOR}${GCC_MINOR}${GCC_PATCH})
- CHECK_CXX_SOURCE_COMPILES("
- #include <string>
- #if _GLIBCXX_USE_CXX11_ABI
- #error \"cling does not support GCC 5 ABI.\"
- #endif
- int main() {}" CXX_SUPPORTS_OLD_ABI)
- if(NOT CXX_SUPPORTS_OLD_ABI)
- message(FATAL_ERROR "Found GCC compiler with new ABI. Cling does not support the GCC 5 ABI yet")
- endif()
else()
set(GCC_MAJOR 0)
set(GCC_MINOR 0)

20
root-no-testdata.patch
View file

@ -1,20 +0,0 @@
diff -ur root-6.06.02.orig/test/CMakeLists.txt root-6.06.02/test/CMakeLists.txt
--- root-6.06.02.orig/test/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/test/CMakeLists.txt 2016-04-02 17:06:39.536489046 +0200
@@ -239,13 +239,14 @@
#--stressProof-------------------------------------------------------------------------------
if(NOT WIN32)
- add_custom_target(TestData ALL COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
+ add_custom_target(TestData COMMAND ${CMAKE_COMMAND} -DDST=${CMAKE_SOURCE_DIR}/files -P ${CMAKE_CURRENT_SOURCE_DIR}/rootDownloadData.cmake)
ROOT_EXECUTABLE(stressProof stressProof.cxx LIBRARIES Proof ProofPlayer Hist)
ROOT_ADD_TEST(test-stressproof COMMAND stressProof lite://
-h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event
-l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress
ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
- FAILREGEX "FAILED|Error in")
+ FAILREGEX "FAILED|Error in"
+ DEPENDS TestData)
endif()
#--testbits----------------------------------------------------------------------------------

38
root-ppc64.patch
View file

@ -1,38 +0,0 @@
diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/SetUpLinux.cmake 2016-04-06 09:42:10.258085039 +0200
@@ -30,8 +30,8 @@
else()
message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
endif()
-elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
- message(STATUS "Found a 64bit ppc64 little endian system")
+elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
+ message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
set(SPECIAL_CINT_FLAGS "-DG__64BIT")
if(CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "Found GNU compiler collection")
diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
--- root-6.06.02.orig/config/root-config.in 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/config/root-config.in 2016-04-06 09:48:35.837025323 +0200
@@ -205,17 +205,12 @@
;;
linuxppcgcc)
# PPC Linux with gcc
- auxcflags="${cxxversionflag} -Wno-deprecated-declarations -fsigned-char -I/usr/X11/include"
+ auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m32 -fsigned-char"
+ auxldflags="-m32"
auxlibs="-lm -ldl -rdynamic"
;;
linuxppc64gcc)
- # PPC64 (64 bit mode) Linux with gcc 3.x
- auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
- auxldflags="-m64"
- auxlibs="-lm -ldl -rdynamic"
- ;;
-ppc64le)
- # PPC64 (64 bit mode) little endian
+ # PPC64/PPC64LE (64 bit mode) Linux with gcc
auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
auxldflags="-m64"
auxlibs="-lm -ldl -rdynamic"

156
root-private-public.patch
View file

@ -1,156 +0,0 @@
diff -ur root-6.06.02.orig/proof/proofx/inc/TXSocket.h root-6.06.02/proof/proofx/inc/TXSocket.h
--- root-6.06.02.orig/proof/proofx/inc/TXSocket.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/proof/proofx/inc/TXSocket.h 2016-04-03 11:21:57.879553149 +0200
@@ -43,8 +43,8 @@
#ifndef ROOT_TSocket
#include "TSocket.h"
#endif
-#ifndef ROOT_XrdProofConn
-#include "XrdProofConn.h"
+#ifndef __XPTYPES_H
+#include "XProtocol/XPtypes.hh"
#endif
#ifndef XRC_UNSOLMSG_H
#include "XrdClient/XrdClientUnsolMsg.hh"
@@ -58,6 +58,7 @@
class TXHandler;
class TXSocketHandler;
class XrdClientMessage;
+class XrdProofConn;
// To transmit info to Handlers
typedef struct {
@@ -140,7 +141,7 @@
void PostMsg(Int_t type, const char *msg = 0);
// Auxilliary
- Int_t GetLowSocket() const { return (fConn ? fConn->GetLowSocket() : -1); }
+ Int_t GetLowSocket() const;
static void SetLocation(const char *loc = ""); // Set location string
@@ -170,13 +171,13 @@
virtual Int_t GetClientID() const { return -1; }
virtual Int_t GetClientIDSize() const { return 1; }
- Int_t GetLogConnID() const { return (fConn ? fConn->GetLogConnID() : -1); }
- Int_t GetOpenError() const { return (fConn ? fConn->GetOpenError() : -1); }
- Int_t GetServType() const { return (fConn ? fConn->GetServType() : -1); }
- Int_t GetSessionID() const { return (fConn ? fConn->GetSessionID() : -1); }
+ Int_t GetLogConnID() const;
+ Int_t GetOpenError() const;
+ Int_t GetServType() const;
+ Int_t GetSessionID() const;
Int_t GetXrdProofdVersion() const { return fXrdProofdVersion; }
- Bool_t IsValid() const { return (fConn ? (fConn->IsValid()) : kFALSE); }
+ Bool_t IsValid() const;
Bool_t IsServProofd();
virtual void RemoveClientID() { }
virtual void SetClientID(Int_t) { }
@@ -215,11 +216,9 @@
void SendUrgent(Int_t type, Int_t int1, Int_t int2);
// Interrupt the low level socket
- inline void SetInterrupt(Bool_t i = kTRUE) { R__LOCKGUARD(fAMtx);
- fRDInterrupt = i;
- if (i && fConn) fConn->SetInterrupt();
- if (i && fAWait) fASem.Post(); }
+ void SetInterrupt(Bool_t i = kTRUE);
inline Bool_t IsInterrupt() { R__LOCKGUARD(fAMtx); return fRDInterrupt; }
+
// Set / Check async msg queue waiting status
inline void SetAWait(Bool_t w = kTRUE) { R__LOCKGUARD(fAMtx); fAWait = w; }
inline Bool_t IsAWait() { R__LOCKGUARD(fAMtx); return fAWait; }
diff -ur root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx root-6.06.02/proof/proofx/src/TXProofMgr.cxx
--- root-6.06.02.orig/proof/proofx/src/TXProofMgr.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/proof/proofx/src/TXProofMgr.cxx 2016-04-03 11:09:26.464327948 +0200
@@ -40,6 +40,8 @@
#include "TSysEvtHandler.h"
#include "XProofProtocol.h"
+#include "XrdProofConn.h"
+
ClassImp(TXProofMgr)
//
diff -ur root-6.06.02.orig/proof/proofx/src/TXSocket.cxx root-6.06.02/proof/proofx/src/TXSocket.cxx
--- root-6.06.02.orig/proof/proofx/src/TXSocket.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/proof/proofx/src/TXSocket.cxx 2016-04-03 11:58:23.937790633 +0200
@@ -912,6 +912,46 @@
}
////////////////////////////////////////////////////////////////////////////////
+/// Getter for logical connection ID
+
+Int_t TXSocket::GetLogConnID() const
+{
+ return (fConn ? fConn->GetLogConnID() : -1);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// Getter for last error
+
+Int_t TXSocket::GetOpenError() const
+{
+ return (fConn ? fConn->GetOpenError() : -1);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// Getter for server type
+
+Int_t TXSocket::GetServType() const
+{
+ return (fConn ? fConn->GetServType() : -1);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// Getter for session ID
+
+Int_t TXSocket::GetSessionID() const
+{
+ return (fConn ? fConn->GetSessionID() : -1);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// Getter for validity status
+
+Bool_t TXSocket::IsValid() const
+{
+ return (fConn ? (fConn->IsValid()) : kFALSE);
+}
+
+////////////////////////////////////////////////////////////////////////////////
/// Return kTRUE if the remote server is a 'proofd'
Bool_t TXSocket::IsServProofd()
@@ -1633,6 +1673,16 @@
}
////////////////////////////////////////////////////////////////////////////////
+
+void TXSocket::SetInterrupt(Bool_t i)
+{
+ R__LOCKGUARD(fAMtx);
+ fRDInterrupt = i;
+ if (i && fConn) fConn->SetInterrupt();
+ if (i && fAWait) fASem.Post();
+}
+
+////////////////////////////////////////////////////////////////////////////////
/// Send a TMessage object. Returns the number of bytes in the TMessage
/// that were sent and -1 in case of error.
@@ -1923,6 +1973,12 @@
}
////////////////////////////////////////////////////////////////////////////////
+
+Int_t TXSocket::GetLowSocket() const {
+ return (fConn ? fConn->GetLowSocket() : -1);
+}
+
+////////////////////////////////////////////////////////////////////////////////
/// Init environment variables for XrdClient
void TXSocket::InitEnvs()

147
root-s390x.patch
View file

@ -1,147 +0,0 @@
diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake 2016-04-06 10:07:33.109883779 +0200
+++ root-6.06.02/cmake/modules/SetUpLinux.cmake 2016-04-06 10:10:14.541179186 +0200
@@ -54,6 +54,32 @@
else()
message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
endif()
+elseif(${SYSCTL_OUTPUT} MATCHES s390x)
+ message(STATUS "Found a 64bit system")
+ set(BIT_ENVIRONMENT "-m64")
+ set(SPECIAL_CINT_FLAGS "-DG__64BIT")
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "Found GNU compiler collection")
+ set(ROOT_ARCHITECTURE linuxs390xgcc)
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+ message(STATUS "Found CLANG compiler")
+ set(ROOT_ARCHITECTURE linuxs390xgcc)
+ else()
+ message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+ endif()
+elseif(${SYSCTL_OUTPUT} MATCHES s390)
+ message(STATUS "Found a 31bit system")
+ set(BIT_ENVIRONMENT "-m31")
+ set(SPECIAL_CINT_FLAGS "")
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "Found GNU compiler collection")
+ set(ROOT_ARCHITECTURE linuxs390gcc)
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+ message(STATUS "Found CLANG compiler")
+ set(ROOT_ARCHITECTURE linuxs390gcc)
+ else()
+ message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+ endif()
else()
message(STATUS "Found a 32bit system")
set(BIT_ENVIRONMENT "-m32")
diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
--- root-6.06.02.orig/config/root-config.in 2016-04-06 09:48:35.837025323 +0200
+++ root-6.06.02/config/root-config.in 2016-04-06 10:13:04.506542626 +0200
@@ -215,6 +215,18 @@
auxldflags="-m64"
auxlibs="-lm -ldl -rdynamic"
;;
+linuxs390gcc)
+ # s390 (31 bit mode) Linux with gcc
+ auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m31 -fsigned-char"
+ auxldflags="-m31"
+ auxlibs="-lm -ldl -rdynamic"
+ ;;
+linuxs390xgcc)
+ # s390x (64 bit mode) Linux with gcc
+ auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
+ auxldflags="-m64"
+ auxlibs="-lm -ldl -rdynamic"
+ ;;
linuxx8664gcc)
# AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x
auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64"
diff -ur root-6.06.02.orig/core/base/inc/RConfig.h root-6.06.02/core/base/inc/RConfig.h
--- root-6.06.02.orig/core/base/inc/RConfig.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/inc/RConfig.h 2016-04-06 10:10:14.675180260 +0200
@@ -202,6 +202,19 @@
# define NEED_SIGJMP
#endif
+#if defined(linux) && defined(__s390__)
+# define R__LINUX
+# define R__UNIX
+# define NEED_SIGJMP
+#endif
+
+#if defined(linux) && defined(__s390x__)
+# define R__LINUX
+# define R__UNIX
+# define R__B64
+# define NEED_SIGJMP
+#endif
+
#if defined(__MACH__) && defined(__i386__) && !defined(__APPLE__)
# define R__HURD
# define f2cFortran /* cfortran.h does not know HURD - sigh */
diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
--- root-6.06.02.orig/core/pcre/CMakeLists.txt 2016-04-06 09:53:37.247748077 +0200
+++ root-6.06.02/core/pcre/CMakeLists.txt 2016-04-06 10:16:45.144317047 +0200
@@ -54,6 +54,10 @@
set(PCRE_CFLAGS "-O")
elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
set(PCRE_CFLAGS "-O")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
+ set(PCRE_CFLAGS "-m64 -O")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
+ set(PCRE_CFLAGS "-m31 -O")
elseif(ROOT_ARCHITECTURE MATCHES linux)
set(PCRE_CFLAGS "-m32 -O")
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake 2016-04-06 09:53:37.258748191 +0200
+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake 2016-04-06 10:17:44.948798562 +0200
@@ -49,6 +49,10 @@
set(AFTER_CC "${AFTER_CC}")
elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
set(AFTER_CC "${AFTER_CC}")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
+ set(AFTER_CC "${AFTER_CC} -m64")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
+ set(AFTER_CC "${AFTER_CC} .m31")
elseif(ROOT_ARCHITECTURE MATCHES linux)
set(AFTER_CC "${AFTER_CC} -m32")
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt 2016-04-06 09:59:35.237876779 +0200
+++ root-6.06.02/graf2d/freetype/CMakeLists.txt 2016-04-06 10:18:44.239276178 +0200
@@ -56,6 +56,10 @@
set(FREETYPE_CFLAGS "-O")
elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
set(FREETYPE_CFLAGS "-O")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxs390x)
+ set(FREETYPE_CFLAGS "-m64 -O")
+ elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
+ set(FREETYPE_CFLAGS "-m31 -O")
elseif(ROOT_ARCHITECTURE MATCHES linux)
set(FREETYPE_CFLAGS "-m32 -O")
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
--- root-6.06.02.orig/interpreter/CMakeLists.txt 2016-04-06 09:53:37.270748316 +0200
+++ root-6.06.02/interpreter/CMakeLists.txt 2016-04-06 10:10:14.704180492 +0200
@@ -21,6 +21,8 @@
set(ROOT_CLING_TARGET "ARM")
elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
set(ROOT_CLING_TARGET "PowerPC")
+elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
+ set(ROOT_CLING_TARGET "SystemZ")
elseif(ROOT_ARCHITECTURE MATCHES linux)
set(ROOT_CLING_TARGET "X86")
elseif(ROOT_ARCHITECTURE MATCHES macosx)
diff -ur root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake
--- root-6.06.02.orig/interpreter/llvm/src/cmake/config-ix.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/interpreter/llvm/src/cmake/config-ix.cmake 2016-04-06 10:10:14.747180837 +0200
@@ -372,6 +372,8 @@
set(LLVM_NATIVE_ARCH Hexagon)
elseif (LLVM_NATIVE_ARCH MATCHES "s390x")
set(LLVM_NATIVE_ARCH SystemZ)
+elseif (LLVM_NATIVE_ARCH MATCHES "s390")
+ set(LLVM_NATIVE_ARCH SystemZ)
else ()
message(FATAL_ERROR "Unknown architecture ${LLVM_NATIVE_ARCH}")
endif ()

30
root-save-memory.patch
View file

@ -1,30 +0,0 @@
diff -ur root-6.06.02.orig/core/utils/CMakeLists.txt root-6.06.02/core/utils/CMakeLists.txt
--- root-6.06.02.orig/core/utils/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/utils/CMakeLists.txt 2016-03-18 00:28:13.225932434 +0100
@@ -36,7 +36,9 @@
${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
${corelinklibs})
-add_dependencies(rootcling CLING LLVMRES)
+# The dependency on Cling was added to prevent Cling (libCling) and
+# rootcling from being linked in parallel.
+add_dependencies(rootcling CLING LLVMRES Cling)
ROOT_EXECUTABLE(rlibmap src/rlibmap.cxx)
diff -ur root-6.06.02.orig/core/utils/Module.mk root-6.06.02/core/utils/Module.mk
--- root-6.06.02.orig/core/utils/Module.mk 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/utils/Module.mk 2016-03-18 00:10:57.995028698 +0100
@@ -25,9 +25,11 @@
CLINGMETAUTILSO = $(METAUTILSTO) $(METAUTILSOLLVM)
ROOTCLINGEXEEXTRAO = $(COREO) $(COREDO) $(IOO) $(IODO) $(THREADO) $(THREADDO) $(METAOLLVM)
+# The dependency on $(CLINGLIB) was added to prevent $(CLINGLIB) and
+# $(ROOTCLINGEXE) from being linked in parallel.
$(ROOTCLINGEXE): $(ROOTCLINGO) $(ROOTCLINGUTILO) $(ROOTCLINGTCLINGO) \
$(CLINGMETAUTILSO) $(SNPRINTFO) $(CLINGO) $(ROOTCLINGEXEEXTRAO) \
- $(PCREDEP) $(CORELIBDEP)
+ $(PCREDEP) $(CORELIBDEP) $(CLINGLIB)
$(LD) $(LDFLAGS) $(OSTHREADLIBDIR) $(OSTHREADLIB) -o $@ $(ROOTCLINGO) $(ROOTCLINGUTILO) \
$(ROOTCLINGTCLINGO) $(CLINGMETAUTILSO) \
$(SNPRINTFO) $(CLINGO) $(ROOTCLINGEXEEXTRAO) $(CLINGLIBEXTRA) \

266
root-see-macro-output.patch
View file

@ -1,266 +0,0 @@
diff -ur root-6.06.02.orig/tutorials/fit/fit1.C root-6.06.02/tutorials/fit/fit1.C
--- root-6.06.02.orig/tutorials/fit/fit1.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/fit/fit1.C 2016-03-07 19:06:10.039340647 +0100
@@ -13,7 +13,6 @@
void fit1() {
//Simple fitting example (1-d histogram with an interpreted function)
- //To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("c1_fit1","The Fit Canvas",200,10,700,500);
diff -ur root-6.06.02.orig/tutorials/fit/fitslicesy.C root-6.06.02/tutorials/fit/fitslicesy.C
--- root-6.06.02.orig/tutorials/fit/fitslicesy.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/fit/fitslicesy.C 2016-03-07 19:06:10.038340635 +0100
@@ -1,7 +1,6 @@
void fitslicesy() {
//
// Illustrates how to use the TH1::FitSlicesY function
-// To see the output of this macro, click begin_html <a href="gif/fitslicesy.gif" >here</a> end_html
// It uses the TH2F histogram generated in macro hsimple.C
// It invokes FitSlicesY and draw the fitted "mean" and "sigma"
// in 2 sepate pads.
diff -ur root-6.06.02.orig/tutorials/fit/multifit.C root-6.06.02/tutorials/fit/multifit.C
--- root-6.06.02.orig/tutorials/fit/multifit.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/fit/multifit.C 2016-03-07 19:06:10.039340647 +0100
@@ -3,7 +3,6 @@
void multifit() {
// Fitting multiple functions to different ranges of a 1-D histogram
-// To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
// Example showing how to fit in a sub-range of an histogram
// An histogram is created and filled with the bin contents and errors
// defined in the table below.
diff -ur root-6.06.02.orig/tutorials/geom/shapes.C root-6.06.02/tutorials/geom/shapes.C
--- root-6.06.02.orig/tutorials/geom/shapes.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/geom/shapes.C 2016-03-07 19:06:10.038340635 +0100
@@ -3,7 +3,6 @@
void shapes() {
//The old geometry shapes (see script geodemo.C)
-//To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("glc1","Geometry Shapes",200,10,700,500);
diff -ur root-6.06.02.orig/tutorials/graphics/basic3d.C root-6.06.02/tutorials/graphics/basic3d.C
--- root-6.06.02.orig/tutorials/graphics/basic3d.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphics/basic3d.C 2016-03-07 19:06:10.029340528 +0100
@@ -1,6 +1,5 @@
void basic3d(){
// Show 3-D polylines and markers
- // To see the output of this macro, click begin_html <a href="gif/basic3d.gif">here</a> end_html
//
TCanvas *c1 = new TCanvas("c1","PolyLine3D & PolyMarker3D Window",200,10,700,500);
diff -ur root-6.06.02.orig/tutorials/graphics/canvas.C root-6.06.02/tutorials/graphics/canvas.C
--- root-6.06.02.orig/tutorials/graphics/canvas.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphics/canvas.C 2016-03-07 19:06:10.030340540 +0100
@@ -1,6 +1,5 @@
void canvas(){
//Example of primitives in a canvas
-// To see the output of this macro, click begin_html <a href="gif/canvas.gif" >here</a> end_html
// One of the first actions in a ROOT session is the creation of a Canvas.
// Here we create a Canvas named "c1"
//Author: Rene Brun
diff -ur root-6.06.02.orig/tutorials/graphics/feynman.C root-6.06.02/tutorials/graphics/feynman.C
--- root-6.06.02.orig/tutorials/graphics/feynman.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphics/feynman.C 2016-03-07 19:06:10.029340528 +0100
@@ -1,7 +1,6 @@
void feynman()
{
//Draw Feynman diagrams
- // To see the output of this macro, click begin_html <a href="gif/feynman.gif">here</a>. end_html
//Author: Otto Schaile
TCanvas *c1 = new TCanvas("c1", "A canvas", 10,10, 600, 300);
diff -ur root-6.06.02.orig/tutorials/graphics/gaxis.C root-6.06.02/tutorials/graphics/gaxis.C
--- root-6.06.02.orig/tutorials/graphics/gaxis.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphics/gaxis.C 2016-03-07 19:06:10.027340505 +0100
@@ -1,6 +1,5 @@
void gaxis(){
//Simple example illustrating how to draw TGaxis objects in various formats.
-//To see the output of this macro, click begin_html <a href="gif/gaxis.gif" >here</a> end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("c1","Examples of Gaxis",10,10,700,500);
diff -ur root-6.06.02.orig/tutorials/graphics/tornado.C root-6.06.02/tutorials/graphics/tornado.C
--- root-6.06.02.orig/tutorials/graphics/tornado.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphics/tornado.C 2016-03-07 19:06:10.028340516 +0100
@@ -1,6 +1,5 @@
void tornado() {
//Show 3-d polymarkers
-// To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
//Author: Rene Brun
gBenchmark->Start("tornado");
diff -ur root-6.06.02.orig/tutorials/graphs/gerrors2.C root-6.06.02/tutorials/graphs/gerrors2.C
--- root-6.06.02.orig/tutorials/graphs/gerrors2.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphs/gerrors2.C 2016-03-07 19:06:10.030340540 +0100
@@ -1,6 +1,5 @@
void gerrors2() {
//Draw two graphs with error bars
- // To see the output of this macro, click begin_html <a href="gif/gerrors2.gif">here</a>. end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("c1","gerrors2",200,10,700,500);
diff -ur root-6.06.02.orig/tutorials/graphs/gerrors.C root-6.06.02/tutorials/graphs/gerrors.C
--- root-6.06.02.orig/tutorials/graphs/gerrors.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphs/gerrors.C 2016-03-07 19:06:10.031340552 +0100
@@ -1,6 +1,5 @@
void gerrors() {
//Draw a graph with error bars
- // To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("c1","A Simple Graph with error bars",200,10,700,500);
diff -ur root-6.06.02.orig/tutorials/graphs/graph.C root-6.06.02/tutorials/graphs/graph.C
--- root-6.06.02.orig/tutorials/graphs/graph.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphs/graph.C 2016-03-07 19:06:10.031340552 +0100
@@ -1,6 +1,5 @@
void graph() {
//Draw a simple graph
- // To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("c1","A Simple Graph Example",200,10,700,500);
diff -ur root-6.06.02.orig/tutorials/graphs/surfaces.C root-6.06.02/tutorials/graphs/surfaces.C
--- root-6.06.02.orig/tutorials/graphs/surfaces.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/graphs/surfaces.C 2016-03-07 19:06:10.031340552 +0100
@@ -1,6 +1,5 @@
void surfaces() {
//Draw 2-Dim functions
- // To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("c1","Surfaces Drawing Options",200,10,700,900);
diff -ur root-6.06.02.orig/tutorials/hist/fillrandom.C root-6.06.02/tutorials/hist/fillrandom.C
--- root-6.06.02.orig/tutorials/hist/fillrandom.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/hist/fillrandom.C 2016-03-07 19:06:10.037340623 +0100
@@ -1,6 +1,5 @@
void fillrandom() {
//Fill a 1-D histogram from a parametric function
- // To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("c1","The FillRandom example",200,10,700,900);
diff -ur root-6.06.02.orig/tutorials/hist/hsum.C root-6.06.02/tutorials/hist/hsum.C
--- root-6.06.02.orig/tutorials/hist/hsum.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/hist/hsum.C 2016-03-07 19:06:10.038340635 +0100
@@ -1,7 +1,6 @@
// histograms filled and drawn in a loop
void hsum() {
//
-// To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
// Simple example illustrating how to use the C++ interpreter
// to fill histograms in a loop and show the graphics results
//Author: Rene Brun
diff -ur root-6.06.02.orig/tutorials/hist/twoscales.C root-6.06.02/tutorials/hist/twoscales.C
--- root-6.06.02.orig/tutorials/hist/twoscales.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/hist/twoscales.C 2016-03-07 19:06:10.037340623 +0100
@@ -9,7 +9,6 @@
{
//example of macro illustrating how to superimpose two histograms
//with different scales in the "same" pad.
- // To see the output of this macro, click begin_html <a href="gif/twoscales.gif" >here</a> end_html
//Author: Rene Brun
TCanvas *c1 = new TCanvas("c1","hists with different scales",600,400);
diff -ur root-6.06.02.orig/tutorials/pyroot/fillrandom.py root-6.06.02/tutorials/pyroot/fillrandom.py
--- root-6.06.02.orig/tutorials/pyroot/fillrandom.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/fillrandom.py 2016-03-07 19:06:10.035340599 +0100
@@ -1,5 +1,4 @@
#
-# To see the output of this macro, click begin_html <a href="gif/fillrandom.gif">here</a>. end_html
#
from ROOT import TCanvas, TPad, TFormula, TF1, TPaveLabel, TH1F, TFile
diff -ur root-6.06.02.orig/tutorials/pyroot/fit1.py root-6.06.02/tutorials/pyroot/fit1.py
--- root-6.06.02.orig/tutorials/pyroot/fit1.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/fit1.py 2016-03-07 19:06:10.032340564 +0100
@@ -1,5 +1,4 @@
#
-# To see the output of this macro, click begin_html <a href="gif/fit1.gif">here</a>. end_html
#
from os import path
from ROOT import TCanvas, TFile, TPaveText
diff -ur root-6.06.02.orig/tutorials/pyroot/gerrors.py root-6.06.02/tutorials/pyroot/gerrors.py
--- root-6.06.02.orig/tutorials/pyroot/gerrors.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/gerrors.py 2016-03-07 19:06:10.034340587 +0100
@@ -1,5 +1,4 @@
#
-# To see the output of this macro, click begin_html <a href="gif/gerrors.gif">here</a>. end_html
#
from ROOT import TCanvas, TGraphErrors
diff -ur root-6.06.02.orig/tutorials/pyroot/graph.py root-6.06.02/tutorials/pyroot/graph.py
--- root-6.06.02.orig/tutorials/pyroot/graph.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/graph.py 2016-03-07 19:06:10.034340587 +0100
@@ -1,5 +1,4 @@
#
-# To see the output of this macro, click begin_html <a href="gif/graph.gif">here</a>. end_html
#
from ROOT import TCanvas, TGraph
diff -ur root-6.06.02.orig/tutorials/pyroot/h1draw.py root-6.06.02/tutorials/pyroot/h1draw.py
--- root-6.06.02.orig/tutorials/pyroot/h1draw.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/h1draw.py 2016-03-07 19:06:10.032340564 +0100
@@ -1,5 +1,4 @@
#
-# To see the output of this macro, click begin_html <a href="gif/h1draw.gif">here</a> end_html
#
from ROOT import TCanvas, TPad, TFile, TPaveLabel, TPaveText
diff -ur root-6.06.02.orig/tutorials/pyroot/hsum.py root-6.06.02/tutorials/pyroot/hsum.py
--- root-6.06.02.orig/tutorials/pyroot/hsum.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/hsum.py 2016-03-07 19:06:10.034340587 +0100
@@ -1,5 +1,4 @@
#
-# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
# Simple example illustrating how to use the C++ interpreter
# to fill histograms in a loop and show the graphics results
#
diff -ur root-6.06.02.orig/tutorials/pyroot/multifit.py root-6.06.02/tutorials/pyroot/multifit.py
--- root-6.06.02.orig/tutorials/pyroot/multifit.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/multifit.py 2016-03-07 19:06:10.035340599 +0100
@@ -1,4 +1,3 @@
-# To see the output of this macro, click begin_html <a href="gif/multifit.gif" >here</a> end_html
# Example showing how to fit in a sub-range of an histogram
# An histogram is created and filled with the bin contents and errors
# defined in the table below.
diff -ur root-6.06.02.orig/tutorials/pyroot/shapes.py root-6.06.02/tutorials/pyroot/shapes.py
--- root-6.06.02.orig/tutorials/pyroot/shapes.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/shapes.py 2016-03-07 19:06:10.036340611 +0100
@@ -1,5 +1,4 @@
#
-# To see the output of this macro, click begin_html <a href="gif/shapes.gif" >here</a> end_html
#
import ROOT
diff -ur root-6.06.02.orig/tutorials/pyroot/surfaces.py root-6.06.02/tutorials/pyroot/surfaces.py
--- root-6.06.02.orig/tutorials/pyroot/surfaces.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/surfaces.py 2016-03-07 19:06:10.033340576 +0100
@@ -1,5 +1,4 @@
#
-# To see the output of this macro, click begin_html <a href="gif/surfaces.gif">here</a> end_html
#
from ROOT import TCanvas, TPaveText, TPad, TF2
diff -ur root-6.06.02.orig/tutorials/pyroot/tornado.py root-6.06.02/tutorials/pyroot/tornado.py
--- root-6.06.02.orig/tutorials/pyroot/tornado.py 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/pyroot/tornado.py 2016-03-07 19:06:10.033340576 +0100
@@ -1,4 +1,3 @@
-# To see the output of this macro, click begin_html <a href="gif/tornado.gif" >here</a> end_html
from ROOT import TCanvas, TView, TPolyMarker3D, TPaveText
from ROOT import gROOT, gBenchmark
diff -ur root-6.06.02.orig/tutorials/ruby/hsum.rb root-6.06.02/tutorials/ruby/hsum.rb
--- root-6.06.02.orig/tutorials/ruby/hsum.rb 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/ruby/hsum.rb 2016-03-07 19:06:10.036340611 +0100
@@ -4,7 +4,6 @@
# (20/01/2004) --elathan <elathan@phys.uoa.gr>
#
# original header:
-# To see the output of this macro, click begin_html <a href="gif/hsum.gif" >here</a> end_html
# Simple example illustrating how to use the C++ interpreter
# to fill histograms in a loop and show the graphics results

11
root-soname.patch
View file

@ -1,11 +0,0 @@
--- root-6.06.02.orig/cmake/modules/RootNewMacros.cmake 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/cmake/modules/RootNewMacros.cmake 2016-03-15 18:37:23.252408979 +0100
@@ -39,7 +39,7 @@
if(soversion)
set(ROOT_LIBRARY_PROPERTIES ${ROOT_LIBRARY_PROPERTIES}
VERSION ${ROOT_VERSION}
- SOVERSION ${ROOT_MAJOR_VERSION}
+ SOVERSION ${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}
SUFFIX ${libsuffix}
PREFIX ${libprefix} )
else()

56
root-stressgraphics.patch
View file

@ -1,56 +0,0 @@
diff -ur root-6.06.04.orig/test/stressGraphics.ref root-6.06.04/test/stressGraphics.ref
--- root-6.06.04.orig/test/stressGraphics.ref 2016-05-03 20:23:11.000000000 +0200
+++ root-6.06.04/test/stressGraphics.ref 2016-06-24 15:43:16.130227298 +0200
@@ -3,18 +3,18 @@
2 3940 600 14009 100 5437 1500 15379 7900 9282 3000 3778 600
3 452 50 12632 50 4797 350 11232 4200 3796 10700 492 50
4 23617 1500 19255 100 43077 12000 143320 123000 45665 11000 24908 1500
- 5 1025 50 12802 50 19715 2900 33468 9900 30846 5000 1072 50
+ 5 1025 150 12802 150 19715 2900 33468 9900 30846 5000 1072 200
6 430 50 12616 50 4041 400 9558 100 5325 700 471 50
7 4980 50 13821 50 8215 310 16143 1300 12230 500 5011 70
- 8 5442 80 13415 50 9599 150 18430 400 12398 200 5469 80
- 9 9253 100 14310 50 9664 400 19851 2400 12199 300 9449 100
- 10 8863 70 13539 100 14622 200 25627 150 25264 200 8894 70
- 11 12971 100 14377 50 20508 700 34063 600 32033 500 12864 150
- 12 7674 100 13482 50 27519 2500 83557 800 38505 4000 7720 150
- 13 5600 100 13242 100 9805 400 16881 400 15063 800 5638 100
- 14 14190539 500000 12926 100 15663 800 23076 9500 25987 900 14190704 500000
- 15 15690 5000 17179 100 12037 800 23076 9500 15202 900 10437 5000
- 16 28072 400 23287 200 25845 2000 44462 11000 30062 3500 38007 400
+ 8 5442 80 13415 50 9599 150 18430 700 12398 300 5469 80
+ 9 9253 100 14310 50 9664 600 19851 2400 12199 900 9449 100
+ 10 8863 70 13539 100 14622 1100 25627 1100 25264 1700 8894 70
+ 11 12971 100 14377 50 20508 1300 34063 2000 32033 1200 12864 150
+ 12 7674 100 13482 50 27519 2500 83557 3000 38505 4000 7720 150
+ 13 5600 400 13242 300 9805 400 16881 400 15063 800 5638 400
+ 14 14190539 4000000 12926 100 15663 800 23076 9500 25987 3000 14190704 4000000
+ 15 15690 5000 17179 200 12037 800 23076 9500 15202 900 10437 5000
+ 16 28072 400 23287 200 25845 2000 44462 11000 30062 5000 38007 400
17 20444 400 21520 100 12050 800 27511 11000 16867 600 20721 400
18 15894 100 19305 100 12943 550 27187 10300 16309 350 15925 100
19 22521 300 42774 150 21207 6800 43868 17000 19232 11000 22729 300
@@ -25,7 +25,7 @@
24 7813 300 23739 100 4662 2300 11085 6000 6973 3100 8081 300
25 4545 150 14541 100 11094 1400 27602 14800 13094 2800 4467 150
26 6141 200 15967 100 14776 4200 39594 21600 19331 7000 6126 200
- 27 9110 500 16737 100 9738 4200 21346 21600 10645 7000 8869 500
+ 27 9110 500 16737 200 9738 4200 21346 21600 10645 7000 8869 500
28 17016 5500 18198 100 13764 3400 32434 17400 22157 5000 20823 5500
29 30615 8200 27494 100 29010 5900 50520 18200 35724 5400 36690 8200
30 3304592 100 709013 100 155478 32000 62688 19000 123056 7000 0 0
@@ -35,11 +35,11 @@
34 310239 6500 123808 500 38898 10400 62719 34100 45592 14000 317918 6500
35 352426 5000 156863 750 43638 6300 65828 31800 53934 6500 357204 5000
36 2128608 35000 794584 200 79412 3400 60580 9900 123159 3500 2156042 35000
- 37 1456993 2000 853193 50000 54777 8600 38425 13500 91242 18100 1463263 5000
+ 37 1456993 9000 853193 50000 54777 8600 38425 13500 91242 18100 1463263 7000
38 38312 200 56877 100 47205 3900 36524 11800 119641 8000 38121 200
- 39 15025 1500 29289 500 34091 1500 42525 11300 33336 3900 14787 1500
+ 39 15025 3000 29289 500 34091 1500 42525 11300 33336 3900 14787 4000
40 254604 5000 376027 7000 34608 5000 55666 30400 46534 6500 259594 5000
- 41 4846 50 14075 100 24281 100 33239 150 25636 100 4877 50
+ 41 4846 150 14075 100 24281 200 33239 600 25636 300 4877 150
42 1435879 150000 12837 100 96029 4000 25972 100 359846 15000 1085792 250000
43 5884 500 16577 200 30259 3500 40706 14000 30026 4000 0 0
44 5723 700 15720 200 14291 2600 32236 11000 16916 3200 5670 800

28
root-template-files.patch
View file

@ -1,28 +0,0 @@
diff -ur root-6.06.02.orig/tutorials/mlp/mlpHiggs.C root-6.06.02/tutorials/mlp/mlpHiggs.C
--- root-6.06.02.orig/tutorials/mlp/mlpHiggs.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/mlp/mlpHiggs.C 2016-03-23 21:58:56.072799219 +0100
@@ -15,8 +15,8 @@
// equal to 1 for the signal and 0 for the background is added.
const char *fname = "mlpHiggs.root";
TFile *input = 0;
- if (!gSystem->AccessPathName(fname)) {
- input = TFile::Open(fname);
+ if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
+ input = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
} else {
printf("accessing %s file from http://root.cern.ch/files\n",fname);
input = TFile::Open(Form("http://root.cern.ch/files/%s",fname));
diff -ur root-6.06.02.orig/tutorials/quadp/portfolio.C root-6.06.02/tutorials/quadp/portfolio.C
--- root-6.06.02.orig/tutorials/quadp/portfolio.C 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tutorials/quadp/portfolio.C 2016-03-23 22:19:31.309867477 +0100
@@ -273,8 +273,8 @@
const char *fname = "stock.root";
TFile *f = 0;
- if (!gSystem->AccessPathName(fname)) {
- f = TFile::Open(fname);
+ if (!gSystem->AccessPathName(Form("%s/%s", gSystem->DirName(__FILE__), fname))) {
+ f = TFile::Open(Form("%s/%s", gSystem->DirName(__FILE__), fname));
} else {
printf("accessing %s file from http://root.cern.ch/files\n",fname);
f = TFile::Open(Form("http://root.cern.ch/files/%s",fname));

3105
root-test-install.patch
View file

File diff suppressed because it is too large Load diff

85
root-testfiles.sh
View file

@ -1,85 +0,0 @@
#! /bin/sh
SITE="http://root.cern.ch/files"
mkdir files
pushd files
wget -N ${SITE}/aleph_ref_4.root
wget -N ${SITE}/aleph.root
wget -N ${SITE}/alice3_ref_4.root
wget -N ${SITE}/alice3.root
wget -N ${SITE}/ams_ref_3.root
wget -N ${SITE}/ams.root
wget -N ${SITE}/babar2_ref_3.root
wget -N ${SITE}/babar2.root
wget -N ${SITE}/barres_ref_3.root
wget -N ${SITE}/barres.root
wget -N ${SITE}/belle_ref_3.root
wget -N ${SITE}/belle.root
wget -N ${SITE}/bes_ref_3.root
wget -N ${SITE}/bes.root
wget -N ${SITE}/brahms_ref_3.root
wget -N ${SITE}/brahms.root
wget -N ${SITE}/btev_ref_3.root
wget -N ${SITE}/btev.root
wget -N ${SITE}/cdf_ref_4.root
wget -N ${SITE}/cdf.root
wget -N ${SITE}/chambers_ref_3.root
wget -N ${SITE}/chambers.root
wget -N ${SITE}/cms_ref_3.root
wget -N ${SITE}/cms.root
wget -N ${SITE}/dubna_ref_3.root
wget -N ${SITE}/dubna.root
wget -N ${SITE}/e907_ref_3.root
wget -N ${SITE}/e907.root
wget -N ${SITE}/felix_ref_3.root
wget -N ${SITE}/felix.root
wget -N ${SITE}/ganil_ref_3.root
wget -N ${SITE}/ganil.root
wget -N ${SITE}/gem_ref_3.root
wget -N ${SITE}/gem.root
wget -N ${SITE}/hades2_ref_4.root
wget -N ${SITE}/hades2.root
wget -N ${SITE}/hermes_ref_3.root
wget -N ${SITE}/hermes.root
wget -N ${SITE}/integral_ref_3.root
wget -N ${SITE}/integral.root
wget -N ${SITE}/lhcbfull_ref_3.root
wget -N ${SITE}/lhcbfull.root
wget -N ${SITE}/na35_ref_3.root
wget -N ${SITE}/na35.root
wget -N ${SITE}/na47_ref_3.root
wget -N ${SITE}/na47.root
wget -N ${SITE}/na49_ref_3.root
wget -N ${SITE}/na49.root
wget -N ${SITE}/p326_ref_3.root
wget -N ${SITE}/p326.root
wget -N ${SITE}/phenix_ref_3.root
wget -N ${SITE}/phenix.root
wget -N ${SITE}/phobos2_ref_4.root
wget -N ${SITE}/phobos2.root
wget -N ${SITE}/sdc_ref_3.root
wget -N ${SITE}/sdc.root
wget -N ${SITE}/sld_ref_3.root
wget -N ${SITE}/sld.root
wget -N ${SITE}/star_ref_3.root
wget -N ${SITE}/star.root
wget -N ${SITE}/tesla_ref_3.root
wget -N ${SITE}/tesla.root
wget -N ${SITE}/wa91_ref_3.root
wget -N ${SITE}/wa91.root
wget -N ${SITE}/europe.root
wget -N ${SITE}/linearIO.root
wget -N ${SITE}/stressHistogram.5.18.00.root
wget -N ${SITE}/stressRooFit_v534_ref.root
wget -N ${SITE}/tmva_class_example.root
wget -N ${SITE}/tmva_reg_example.root
wget -N ${SITE}/usa.root
for f in *.root ; do ln -s $f $f.ROOT.cachefile ; done
popd
tar -J -c --group root --owner root -f root-testfiles.tar.xz files

194
root-tildes.patch
View file

@ -1,194 +0,0 @@
diff -ur root-6.06.02.orig/core/base/src/TDirectory.cxx root-6.06.02/core/base/src/TDirectory.cxx
--- root-6.06.02.orig/core/base/src/TDirectory.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/src/TDirectory.cxx 2016-04-06 10:30:12.110817348 +0200
@@ -810,7 +810,7 @@
/// MyClass *obj = (MyClass*)directory->GetObjectChecked("some object of MyClass","MyClass"));
/// ~~~
/// Note: We recommend using the method TDirectory::GetObject:
-/// ~~~ {.cpp}~
+/// ~~~ {.cpp}
/// MyClass *obj = 0;
/// directory->GetObject("some object inheriting from MyClass",obj);
/// if (obj) { ... we found what we are looking for ... }
diff -ur root-6.06.02.orig/core/base/src/TQObject.cxx root-6.06.02/core/base/src/TQObject.cxx
--- root-6.06.02.orig/core/base/src/TQObject.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/src/TQObject.cxx 2016-04-06 10:30:12.132817525 +0200
@@ -1040,7 +1040,7 @@
///
/// TQObject::Connect("TGButton", "Clicked()",
/// "TH2F", myHist, "Draw(Option_t*)");
-///~~~
+/// ~~~
/// cl == 0 - corresponds to function (interpereted or global)
/// the name of the function is defined by the slot string,
/// parameter receiver should be 0.
diff -ur root-6.06.02.orig/core/base/src/TSystem.cxx root-6.06.02/core/base/src/TSystem.cxx
--- root-6.06.02.orig/core/base/src/TSystem.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/base/src/TSystem.cxx 2016-04-06 10:30:12.133817533 +0200
@@ -2677,7 +2677,7 @@
/// We allow them to type:
/// ~~~ {.cpp}
/// .X myfunc.C++(arg1,arg2)
-/// ~~~
+/// ~~~
/// or
/// ~~~ {.cpp}
/// .X myfunc.C+(arg1,arg2)
@@ -3843,7 +3843,7 @@
/// the use of ';' to separate several instructions. However, shell specific
/// construct should be avoided. In particular this description can contain
/// environment variables, like $ROOTSYS (or %ROOTSYS% on windows).
-/// ~~~ {.cpp}
+/// ~~~ {.cpp}
/// Five special variables will be expanded before execution:
/// Variable name Expands to
/// ------------- ----------
@@ -3915,7 +3915,7 @@
/// IncludePath should contain the list of compiler flags to indicate where
/// to find user defined header files. It is used to expand $IncludePath in
/// the directives given to SetMakeSharedLib() and SetMakeExe(), e.g.:
-/// ~~~ {.cpp}
+/// ~~~ {.cpp}
/// gSystem->SetInclude("-I$ROOTSYS/include -Imydirectory/include");
/// ~~~
/// the default value of IncludePath on Unix is:
diff -ur root-6.06.02.orig/core/cont/src/TClonesArray.cxx root-6.06.02/core/cont/src/TClonesArray.cxx
--- root-6.06.02.orig/core/cont/src/TClonesArray.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/cont/src/TClonesArray.cxx 2016-04-06 10:30:12.133817533 +0200
@@ -663,7 +663,7 @@
/// Create an array of clone objects of class cl. The class must inherit from
/// TObject. If the class defines an own operator delete(), make sure that
/// it looks like this:
-/// ~~~ {.cpp}
+/// ~~~ {.cpp}
/// void MyClass::operator delete(void *vp)
/// {
/// if ((Long_t) vp != TObject::GetDtorOnly())
diff -ur root-6.06.02.orig/core/cont/src/TCollection.cxx root-6.06.02/core/cont/src/TCollection.cxx
--- root-6.06.02.orig/core/cont/src/TCollection.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/core/cont/src/TCollection.cxx 2016-04-06 10:30:12.134817541 +0200
@@ -321,7 +321,7 @@
/// ~~~
/// Otherwise override the `Print(Option_t *option, Int_t)`
/// variant. Remember to declare:
-/// ~~~ {.cpp]
+/// ~~~ {.cpp}
/// using TCollection::Print;
/// ~~~
/// somewhere close to the method declaration.
diff -ur root-6.06.02.orig/documentation/users-guide/MathLibraries.md root-6.06.02/documentation/users-guide/MathLibraries.md
--- root-6.06.02.orig/documentation/users-guide/MathLibraries.md 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/documentation/users-guide/MathLibraries.md 2016-04-06 10:30:19.094873608 +0200
@@ -189,7 +189,7 @@
int i;
i = TMath::LocMin(10, &v[0]);
std::cout << v[i] << std::endl;
- ```
+```
Another example of these functions can be found in $ROOTSYS/tutorials/permute.C.
@@ -233,7 +233,7 @@
// old-style
mean = TMath::Mean(n, &v[0], &w[0]);
- ```
+```
### Special and Statistical Functions.
diff -ur root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx root-6.06.02/graf2d/asimage/src/TASImage.cxx
--- root-6.06.02.orig/graf2d/asimage/src/TASImage.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf2d/asimage/src/TASImage.cxx 2016-04-06 10:30:12.135817549 +0200
@@ -5964,7 +5964,7 @@
/// im1->GetImageBuffer(&buf, &int, TImage::kXpm); /*raw buffer*/
/// TImage *im2 = TImage::Create();
/// im2->SetImageBuffer(&buf, TImage::kXpm);
-/// ~~~
+/// ~~~
/// 2. xpm as an array of strings (pre-parsed)
/// ~~~ {.cpp}
/// For example:
diff -ur root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx root-6.06.02/graf2d/postscript/src/TPostScript.cxx
--- root-6.06.02.orig/graf2d/postscript/src/TPostScript.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf2d/postscript/src/TPostScript.cxx 2016-04-06 10:30:12.136817557 +0200
@@ -132,7 +132,7 @@
because we clear only the pads and not the main canvas.
Note that `c1->Update` must be called at the end of the first picture.
-~~~ {.cpp}
+ ~~~ {.cpp}
{
TFile *f1 = new TFile("hsimple.root");
TCanvas *c1 = new TCanvas("c1");
diff -ur root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx
--- root-6.06.02.orig/graf3d/eve/src/TEveCalo3DGL.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf3d/eve/src/TEveCalo3DGL.cxx 2016-04-06 10:30:12.136817557 +0200
@@ -330,7 +330,7 @@
/// | 2-----|-3
/// |/ |/
/// 1-------0
-///~~~
+/// ~~~
void TEveCalo3DGL::RenderBox(const Float_t pnts[8]) const
{
diff -ur root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx root-6.06.02/graf3d/g3d/src/TAxis3D.cxx
--- root-6.06.02.orig/graf3d/g3d/src/TAxis3D.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf3d/g3d/src/TAxis3D.cxx 2016-04-06 10:30:12.136817557 +0200
@@ -71,7 +71,7 @@
To change attributes of the rulers attached to the current Pad, one may
query its pointer first:
-~~~ {.cpp]
+~~~ {.cpp}
TAxis3D *axis = TAxis3D::GetPadAxis(); // Ask axis pointer
if (axis) {
TAxis3D::ToggleRulers() // To pop axes down
diff -ur root-6.06.02.orig/hist/hist/src/TH2Poly.cxx root-6.06.02/hist/hist/src/TH2Poly.cxx
--- root-6.06.02.orig/hist/hist/src/TH2Poly.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/hist/hist/src/TH2Poly.cxx 2016-04-06 10:30:12.137817565 +0200
@@ -80,7 +80,7 @@
many times.
The following very simple macro shows how to build and fill a `TH2Poly`:
-~~~ {.cpp]
+~~~ {.cpp}
{
TH2Poly *h2p = new TH2Poly();
diff -ur root-6.06.02.orig/tree/tree/src/TTree.cxx root-6.06.02/tree/tree/src/TTree.cxx
--- root-6.06.02.orig/tree/tree/src/TTree.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tree/tree/src/TTree.cxx 2016-04-06 10:30:12.138817573 +0200
@@ -2584,9 +2584,9 @@
/// T->Fill(); //loop
/// file->Write();
/// file->Close();
-///~~~
+/// ~~~
/// but do the following:
-///~~~ {.cpp}
+/// ~~~ {.cpp}
/// TFile *file = new TFile("myfile.root","recreate");
/// TTree *T = new TTree("T","title");
/// T->Fill(); //loop
@@ -6487,7 +6487,7 @@
/// ~~~ {.cpp}
/// TPrincipal *principal =
/// (TPrincipal*)gROOT->GetListOfSpecials()->FindObject("principal");
-/// ~~~
+/// ~~~
TPrincipal* TTree::Principal(const char* varexp, const char* selection, Option_t* option, Long64_t nentries, Long64_t firstentry)
{
diff -ur root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx
--- root-6.06.02.orig/tree/treeplayer/src/TTreePlayer.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/tree/treeplayer/src/TTreePlayer.cxx 2016-04-06 10:30:12.139817582 +0200
@@ -3004,6 +3004,7 @@
/// The function return the status of the fit in the following form
/// ~~~{.cpp}
/// fitResult = migradResult + 10*minosResult + 100*hesseResult + 1000*improveResult
+/// ~~~
/// - The fitResult is 0 is the fit is OK.
/// - The fitResult is negative in case of an error not connected with the fit.
/// - The number of entries used in the fit can be obtained via

274
root-tmath-doc.patch
View file

@ -1,274 +0,0 @@
diff -ur root-6.06.02.orig/math/mathcore/src/TMath.cxx root-6.06.02/math/mathcore/src/TMath.cxx
--- root-6.06.02.orig/math/mathcore/src/TMath.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/mathcore/src/TMath.cxx 2016-03-09 06:21:28.492819438 +0100
@@ -359,9 +359,9 @@
/// Handbook of Mathematical Functions by Abramowitz and Stegun, formula 6.5.1 on page 260 .
/// Its normalization is such that TMath::Gamma(a,+infinity) = 1 .
///
-/// Begin_Latex
-/// P(a, x) = #frac{1}{#Gamma(a) } #int_{0}^{x} t^{a-1} e^{-t} dt
-/// End_Latex
+/// \f[
+/// P(a, x) = \frac{1}{\Gamma(a)} \int_{0}^{x} t^{a-1} e^{-t} dt
+/// \f]
///
///
///--- Nve 14-nov-1998 UU-SAP Utrecht
@@ -559,15 +559,16 @@
/// see TMath::PoissonI to get a non-smooth function.
/// Note that for large values of par, it is better to call
/// TMath::Gaus(x,par,sqrt(par),kTRUE)
-///Begin_Html
+/// Begin_Macro
+/// {
+/// TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
+/// TF1 *poisson = new TF1("poisson", "TMath::Poisson(x, 5)", 0, 15);
+/// poisson->Draw("L");
+/// }
+/// End_Macro
Double_t TMath::Poisson(Double_t x, Double_t par)
{
-/*
-<img src="gif/Poisson.gif">
-*/
-//End_Html
-
if (x<0)
return 0;
else if (x == 0.0)
@@ -587,15 +588,17 @@
/// compute the Poisson distribution function for (x,par)
/// This is a non-smooth function.
/// This function is equivalent to ROOT::Math::poisson_pdf
-///Begin_Html
+/// Begin_Macro
+/// {
+/// TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
+/// TF1 *poissoni = new TF1("poissoni", "TMath::PoissonI(x, 5)", 0, 15);
+/// poissoni->SetNpx(1000);
+/// poissoni->Draw("L");
+/// }
+/// End_Macro
Double_t TMath::PoissonI(Double_t x, Double_t par)
{
-/*
-<img src="gif/PoissonI.gif">
-*/
-//End_Html
-
Int_t ix = Int_t(x);
return Poisson(ix,par);
}
@@ -630,36 +633,33 @@
////////////////////////////////////////////////////////////////////////////////
/// Calculates the Kolmogorov distribution function,
-///Begin_Html
+/// \f[
+/// P(z) = 2 \sum_{j=1}^{\infty} (-1)^{j-1} e^{-2 j^2 z^2}
+/// \f]
+/// which gives the probability that Kolmogorov's test statistic will exceed
+/// the value z assuming the null hypothesis. This gives a very powerful
+/// test for comparing two one-dimensional distributions.
+/// see, for example, Eadie et al, "statistocal Methods in Experimental
+/// Physics', pp 269-270).
+///
+/// This function returns the confidence level for the null hypothesis, where:
+/// z = dn*sqrt(n), and
+/// dn is the maximum deviation between a hypothetical distribution
+/// function and an experimental distribution with
+/// n events
+///
+/// NOTE: To compare two experimental distributions with m and n events,
+/// use z = sqrt(m*n/(m+n))*dn
+///
+/// Accuracy: The function is far too accurate for any imaginable application.
+/// Probabilities less than 10^-15 are returned as zero.
+/// However, remember that the formula is only valid for "large" n.
+/// Theta function inversion formula is used for z <= 1
+///
+/// This function was translated by Rene Brun from PROBKL in CERNLIB.
Double_t TMath::KolmogorovProb(Double_t z)
{
- /*
- <img src="gif/kolmogorov.gif">
- */
- //End_Html
- // which gives the probability that Kolmogorov's test statistic will exceed
- // the value z assuming the null hypothesis. This gives a very powerful
- // test for comparing two one-dimensional distributions.
- // see, for example, Eadie et al, "statistocal Methods in Experimental
- // Physics', pp 269-270).
- //
- // This function returns the confidence level for the null hypothesis, where:
- // z = dn*sqrt(n), and
- // dn is the maximum deviation between a hypothetical distribution
- // function and an experimental distribution with
- // n events
- //
- // NOTE: To compare two experimental distributions with m and n events,
- // use z = sqrt(m*n/(m+n))*dn
- //
- // Accuracy: The function is far too accurate for any imaginable application.
- // Probabilities less than 10^-15 are returned as zero.
- // However, remember that the formula is only valid for "large" n.
- // Theta function inversion formula is used for z <= 1
- //
- // This function was translated by Rene Brun from PROBKL in CERNLIB.
-
Double_t fj[4] = {-2,-8,-18,-32}, r[4];
const Double_t w = 2.50662827;
// c1 - -pi**2/8, c2 = 9*c1, c3 = 25*c1
@@ -2254,15 +2254,40 @@
/// The definition can be found in "Engineering Statistics Handbook" on site
/// http://www.itl.nist.gov/div898/handbook/eda/section3/eda366b.htm
/// use now implementation in ROOT::Math::gamma_pdf
-///Begin_Html
+/// Begin_Macro
+/// {
+/// TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
+///
+/// c1->SetLogy();
+/// c1->SetGridx();
+/// c1->SetGridy();
+///
+/// TF1 *gdist = new TF1("gdist", "TMath::GammaDist(x, [0], [1], [2])", 0, 10);
+///
+/// gdist->SetParameters(0.5, 0., 1.);
+/// gdist->SetLineColor(2);
+/// TF1 *gdist1 = gdist->DrawCopy("L");
+/// gdist->SetParameters(1.0, 0., 1.);
+/// gdist->SetLineColor(3);
+/// TF1 *gdist2 = gdist->DrawCopy("LSAME");
+/// gdist->SetParameters(2.0, 0., 1.);
+/// gdist->SetLineColor(4);
+/// TF1 *gdist3 = gdist->DrawCopy("LSAME");
+/// gdist->SetParameters(5.0, 0., 1.);
+/// gdist->SetLineColor(6);
+/// TF1 *gdist4 = gdist->DrawCopy("LSAME");
+///
+/// legend = new TLegend(0.15, 0.15, 0.5, 0.35);
+/// legend->AddEntry(gdist1, "gamma = 0.5, mu = 0, beta = 1", "L");
+/// legend->AddEntry(gdist2, "gamma = 1.0, mu = 0, beta = 1", "L");
+/// legend->AddEntry(gdist3, "gamma = 2.0, mu = 0, beta = 1", "L");
+/// legend->AddEntry(gdist4, "gamma = 5.0, mu = 0, beta = 1", "L");
+/// legend->Draw();
+/// }
+/// End_Macro
Double_t TMath::GammaDist(Double_t x, Double_t gamma, Double_t mu, Double_t beta)
{
- /*
- <img src="gif/gammadist.gif">
- */
- //End_Html
-
if ((x<mu) || (gamma<=0) || (beta <=0)) {
Error("TMath::GammaDist", "illegal parameter values x = %f , gamma = %f beta = %f",x,gamma,beta);
return 0;
@@ -2308,21 +2333,47 @@
////////////////////////////////////////////////////////////////////////////////
/// Computes the density of LogNormal distribution at point x.
/// Variable X has lognormal distribution if Y=Ln(X) has normal distribution
-/// sigma is the shape parameter
-/// theta is the location parameter
-/// m is the scale parameter
+/// - sigma is the shape parameter
+/// - theta is the location parameter
+/// - m is the scale parameter
/// The formula was taken from "Engineering Statistics Handbook" on site
/// http://www.itl.nist.gov/div898/handbook/eda/section3/eda3669.htm
/// Implementation using ROOT::Math::lognormal_pdf
-///Begin_Html
+/// Begin_Macro
+/// {
+/// TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
+///
+/// c1->SetLogy();
+/// c1->SetGridx();
+/// c1->SetGridy();
+///
+/// TF1 *logn = new TF1("logn", "TMath::LogNormal(x, [0], [1], [2])", 0, 5);
+/// logn->SetMinimum(1e-3);
+///
+/// logn->SetParameters(0.5, 0., 1.);
+/// logn->SetLineColor(2);
+/// TF1 *logn1 = logn->DrawCopy("L");
+/// logn->SetParameters(1.0, 0., 1.);
+/// logn->SetLineColor(3);
+/// TF1 *logn2 = logn->DrawCopy("LSAME");
+/// logn->SetParameters(2.0, 0., 1.);
+/// logn->SetLineColor(4);
+/// TF1 *logn3 = logn->DrawCopy("LSAME");
+/// logn->SetParameters(5.0, 0., 1.);
+/// logn->SetLineColor(6);
+/// TF1 *logn4 = logn->DrawCopy("LSAME");
+///
+/// legend = new TLegend(0.15, 0.15, 0.5, 0.35);
+/// legend->AddEntry(logn1, "sigma = 0.5, theta = 0, m = 1", "L");
+/// legend->AddEntry(logn2, "sigma = 1.0, theta = 0, m = 1", "L");
+/// legend->AddEntry(logn3, "sigma = 2.0, theta = 0, m = 1", "L");
+/// legend->AddEntry(logn4, "sigma = 5.0, theta = 0, m = 1", "L");
+/// legend->Draw();
+/// }
+/// End_Macro
Double_t TMath::LogNormal(Double_t x, Double_t sigma, Double_t theta, Double_t m)
{
- /*
- <img src="gif/lognormal.gif">
- */
- //End_Html
-
if ((x<theta) || (sigma<=0) || (m<=0)) {
Error("TMath::Lognormal", "illegal parameter values");
return 0;
@@ -2615,15 +2666,39 @@
///density function computed numerically in an accurate way: our approximation
///shows a difference of less than 3% around the peak of the density function, slowly
///increasing going towards the extreme tails to the right and to the left"
-///Begin_Html
+/// Begin_Macro
+/// {
+/// TCanvas *c1 = new TCanvas("c1", "c1", 700, 500);
+///
+/// c1->SetGridx();
+/// c1->SetGridy();
+///
+/// TF1 *vavilov = new TF1("vavilov", "TMath::Vavilov(x, [0], [1])", -3, 11);
+///
+/// vavilov->SetParameters(0.5, 0.);
+/// vavilov->SetLineColor(2);
+/// TF1 *vavilov1 = vavilov->DrawCopy("L");
+/// vavilov->SetParameters(0.3, 0.);
+/// vavilov->SetLineColor(3);
+/// TF1 *vavilov2 = vavilov->DrawCopy("LSAME");
+/// vavilov->SetParameters(0.2, 0.);
+/// vavilov->SetLineColor(4);
+/// TF1 *vavilov3 = vavilov->DrawCopy("LSAME");
+/// vavilov->SetParameters(0.1, 0.);
+/// vavilov->SetLineColor(6);
+/// TF1 *vavilov4 = vavilov->DrawCopy("LSAME");
+///
+/// legend = new TLegend(0.5, 0.65, 0.85, 0.85);
+/// legend->AddEntry(vavilov1, "kappa = 0.5, beta2 = 0", "L");
+/// legend->AddEntry(vavilov2, "kappa = 0.3, beta2 = 0", "L");
+/// legend->AddEntry(vavilov3, "kappa = 0.2, beta2 = 0", "L");
+/// legend->AddEntry(vavilov4, "kappa = 0.1, beta2 = 0", "L");
+/// legend->Draw();
+/// }
+/// End_Macro
Double_t TMath::Vavilov(Double_t x, Double_t kappa, Double_t beta2)
{
-/*
-<img src="gif/Vavilov.gif">
-*/
-//End_Html
-
Double_t *ac = new Double_t[14];
Double_t *hc = new Double_t[9];

483
root-tprincipal-doc.patch
View file

@ -1,483 +0,0 @@
diff --git a/hist/hist/src/TPrincipal.cxx b/hist/hist/src/TPrincipal.cxx
index 76bb5d4..d5bab47 100644
--- a/hist/hist/src/TPrincipal.cxx
+++ b/hist/hist/src/TPrincipal.cxx
@@ -182,7 +182,7 @@ the \f$N\f$ largest eigenvalues, and their associated eigenvectors, the
error \f$E_N\f$ is minimized.
The transformation matrix to go from the pattern space to the feature
-space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$
+space consists of the ordered eigenvectors \f$\mathbf{e}_1,\ldots,\mathbf{e}_P\f$
\f$\mathbf{e}_0,\ldots,\mathbf{e}_{P-1}\f$ for its columns
\f[
\mathsf{T} = \left[
@@ -207,10 +207,6 @@ in the transformed space.
Christian Holm August 2000, CERN
*/
-// $Id$
-// $Date: 2006/05/24 14:55:26 $
-// $Author: brun $
-
#include "TPrincipal.h"
#include "TVectorD.h"
@@ -228,7 +224,7 @@ Christian Holm August 2000, CERN
ClassImp(TPrincipal);
////////////////////////////////////////////////////////////////////////////////
-/// Empty CTOR, Do not use.
+/// Empty constructor. Do not use.
TPrincipal::TPrincipal()
: fMeanValues(0),
@@ -247,10 +243,10 @@ TPrincipal::TPrincipal()
}
////////////////////////////////////////////////////////////////////////////////
-/// Ctor. Argument is number of variables in the sample of data
+/// Constructor. Argument is number of variables in the sample of data
/// Options are:
-/// N Normalize the covariance matrix (default)
-/// D Store input data (default)
+/// - N Normalize the covariance matrix (default)
+/// - D Store input data (default)
///
/// The created object is named "principal" by default.
@@ -311,7 +307,7 @@ TPrincipal::TPrincipal(Int_t nVariables, Option_t *opt)
}
////////////////////////////////////////////////////////////////////////////////
-///copy constructor
+/// Copy constructor.
TPrincipal::TPrincipal(const TPrincipal& pr) :
TNamed(pr),
@@ -332,7 +328,7 @@ TPrincipal::TPrincipal(const TPrincipal& pr) :
}
////////////////////////////////////////////////////////////////////////////////
-///assignement operator
+/// Assignment operator.
TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
{
@@ -356,7 +352,7 @@ TPrincipal& TPrincipal::operator=(const TPrincipal& pr)
}
////////////////////////////////////////////////////////////////////////////////
-/// destructor
+/// Destructor.
TPrincipal::~TPrincipal()
{
@@ -367,136 +363,52 @@ TPrincipal::~TPrincipal()
}
////////////////////////////////////////////////////////////////////////////////
-/// Begin_Html
+/// Add a data point and update the covariance matrix. The input
+/// array must be <TT>fNumberOfVariables</TT> long.
+///
+///
+/// The Covariance matrix and mean values of the input data is calculated
+/// on the fly by the following equations:
+///
+/// \f[
+/// \left<x_i\right>^{(0)} = x_{i0}
+/// \f]
+///
+///
+/// \f[
+/// \left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
+/// + \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
+/// \f]
+///
+/// \f[
+/// C_{ij}^{(0)} = 0
+/// \f]
+///
+///
+///
+/// \f[
+/// C_{ij}^{(n)} = C_{ij}^{(n-1)}
+/// + \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
+/// \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
+/// - \frac1n C_{ij}^{(n-1)}
+/// \f]
+///
+/// since this is a really fast method, with no rounding errors (please
+/// refer to CERN 72-21 pp. 54-106).
+///
+///
+/// The data is stored internally in a <TT>TVectorD</TT>, in the following
+/// way:
+///
+/// \f[
+/// \mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
+/// \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
+/// \f]
+///
+/// With \f$P\f$ as defined in the class description.
void TPrincipal::AddRow(const Double_t *p)
{
- /*
- </PRE>
-Add a data point and update the covariance matrix. The input
-array must be <TT>fNumberOfVariables</TT> long.
-
-<P>
-The Covariance matrix and mean values of the input data is caculated
-on the fly by the following equations:
-<BR><P></P>
-<DIV ALIGN="CENTER">
-
-<!-- MATH
- \begin{displaymath}
-\left<x_i\right>^{(0)} = x_{i0}
-\end{displaymath}
- -->
-
-
-<IMG
- WIDTH="90" HEIGHT="31" BORDER="0"
- SRC="gif/principal_img36.gif"
- ALT="\begin{displaymath}
-\left&lt;x_i\right&gt;^{(0)} = x_{i0}
-\end{displaymath}">
-</DIV>
-<BR CLEAR="ALL">
-<P></P>
-<BR><P></P>
-<DIV ALIGN="CENTER">
-
-<!-- MATH
- \begin{displaymath}
-\left<x_i\right>^{(n)} = \left<x_i\right>^{(n-1)}
-+ \frac1n \left(x_{in} - \left<x_i\right>^{(n-1)}\right)
-\end{displaymath}
- -->
-
-
-<IMG
- WIDTH="302" HEIGHT="42" BORDER="0"
- SRC="gif/principal_img37.gif"
- ALT="\begin{displaymath}
-\left&lt;x_i\right&gt;^{(n)} = \left&lt;x_i\right&gt;^{(n-1)}
-+ \frac1n \left(x_{in} - \left&lt;x_i\right&gt;^{(n-1)}\right)
-\end{displaymath}">
-</DIV>
-<BR CLEAR="ALL">
-<P></P>
-<BR><P></P>
-<DIV ALIGN="CENTER">
-
-<!-- MATH
- \begin{displaymath}
-C_{ij}^{(0)} = 0
-\end{displaymath}
- -->
-
-
-<IMG
- WIDTH="62" HEIGHT="34" BORDER="0"
- SRC="gif/principal_img38.gif"
- ALT="\begin{displaymath}
-C_{ij}^{(0)} = 0
-\end{displaymath}">
-</DIV>
-<BR CLEAR="ALL">
-<P></P>
-<BR><P></P>
-<DIV ALIGN="CENTER">
-
-<!-- MATH
- \begin{displaymath}
-C_{ij}^{(n)} = C_{ij}^{(n-1)}
-+ \frac1{n-1}\left[\left(x_{in} - \left<x_i\right>^{(n)}\right)
- \left(x_{jn} - \left<x_j\right>^{(n)}\right)\right]
-- \frac1n C_{ij}^{(n-1)}
-\end{displaymath}
- -->
-
-
-<IMG
- WIDTH="504" HEIGHT="43" BORDER="0"
- SRC="gif/principal_img39.gif"
- ALT="\begin{displaymath}
-C_{ij}^{(n)} = C_{ij}^{(n-1)}
-+ \frac1{n-1}\left[\left(x_{i...
-...\left&lt;x_j\right&gt;^{(n)}\right)\right]
-- \frac1n C_{ij}^{(n-1)}
-\end{displaymath}">
-</DIV>
-<BR CLEAR="ALL">
-<P></P>
-since this is a really fast method, with no rounding errors (please
-refer to CERN 72-21 pp. 54-106).
-
-<P>
-The data is stored internally in a <TT>TVectorD</TT>, in the following
-way:
-<BR><P></P>
-<DIV ALIGN="CENTER">
-
-<!-- MATH
- \begin{displaymath}
-\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
- \left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
-\end{displaymath}
- -->
-
-
-<IMG
- WIDTH="319" HEIGHT="31" BORDER="0"
- SRC="gif/principal_img40.gif"
- ALT="\begin{displaymath}
-\mathbf{x} = \left[\left(x_{0_0},\ldots,x_{{P-1}_0}\right),\ldots,
-\left(x_{0_i},\ldots,x_{{P-1}_i}\right), \ldots\right]
-\end{displaymath}">
-</DIV>
-<BR CLEAR="ALL">
-<P></P>
-With <IMG
- WIDTH="18" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
- SRC="gif/principal_img6.gif"
- ALT="$P$"> as defined in the class description.
- <PRE>
- */
- // End_Html
if (!p)
return;
@@ -606,25 +518,25 @@ const Double_t *TPrincipal::GetRow(Int_t row)
////////////////////////////////////////////////////////////////////////////////
-/// Generates the file <filename>, with .C appended if it does
+/// Generates the file `<filename>`, with `.C` appended if it does
/// argument doesn't end in .cxx or .C.
///
/// The file contains the implementation of two functions
-///
+/// ~~~ {.cpp}
/// void X2P(Double_t *x, Double *p)
/// void P2X(Double_t *p, Double *x, Int_t nTest)
-///
-/// which does the same as TPrincipal::X2P and TPrincipal::P2X
+/// ~~~
+/// which does the same as `TPrincipal::X2P` and `TPrincipal::P2X`
/// respectively. Please refer to these methods.
///
/// Further, the static variables:
-///
+/// ~~~ {.cpp}
/// Int_t gNVariables
/// Double_t gEigenValues[]
/// Double_t gEigenVectors[]
/// Double_t gMeanValues[]
/// Double_t gSigmaValues[]
-///
+/// ~~~
/// are initialized. The only ROOT header file needed is Rtypes.h
///
/// See TPrincipal::MakeRealCode for a list of options
@@ -641,17 +553,17 @@ void TPrincipal::MakeCode(const char *filename, Option_t *opt)
////////////////////////////////////////////////////////////////////////////////
/// Make histograms of the result of the analysis.
/// The option string say which histograms to create
-/// X Histogram original data
-/// P Histogram principal components corresponding to
-/// original data
-/// D Histogram the difference between the original data
-/// and the projection of principal unto a lower
-/// dimensional subspace (2D histograms)
-/// E Histogram the eigenvalues
-/// S Histogram the square of the residues
-/// (see TPrincipal::SumOfSquareResidues)
-/// The histograms will be named <name>_<type><number>, where <name>
-/// is the first argument, <type> is one of X,P,D,E,S, and <number>
+/// - X Histogram original data
+/// - P Histogram principal components corresponding to
+/// original data
+/// - D Histogram the difference between the original data
+/// and the projection of principal unto a lower
+/// dimensional subspace (2D histograms)
+/// - E Histogram the eigenvalues
+/// - S Histogram the square of the residues
+/// (see `TPrincipal::SumOfSquareResiduals`)
+/// The histograms will be named `<name>_<type><number>`, where `<name>`
+/// is the first argument, `<type>` is one of X,P,D,E,S, and `<number>`
/// is the variable.
void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
@@ -870,7 +782,7 @@ void TPrincipal::MakeHistograms(const char *name, Option_t *opt)
}
////////////////////////////////////////////////////////////////////////////////
-/// PRIVATE METHOD: Normalize the covariance matrix
+/// Normalize the covariance matrix
void TPrincipal::MakeNormalised()
{
@@ -896,21 +808,21 @@ void TPrincipal::MakeNormalised()
////////////////////////////////////////////////////////////////////////////////
/// Generate the file <classname>PCA.cxx which contains the
/// implementation of two methods:
-///
+/// ~~~ {.cpp}
/// void <classname>::X2P(Double_t *x, Double *p)
/// void <classname>::P2X(Double_t *p, Double *x, Int_t nTest)
-///
+/// ~~~
/// which does the same as TPrincipal::X2P and TPrincipal::P2X
-/// respectivly. Please refer to these methods.
+/// respectively. Please refer to these methods.
///
/// Further, the public static members:
-///
+/// ~~~ {.cpp}
/// Int_t <classname>::fgNVariables
/// Double_t <classname>::fgEigenValues[]
/// Double_t <classname>::fgEigenVectors[]
/// Double_t <classname>::fgMeanValues[]
/// Double_t <classname>::fgSigmaValues[]
-///
+/// ~~~
/// are initialized, and assumed to exist. The class declaration is
/// assumed to be in <classname>.h and assumed to be provided by the
/// user.
@@ -918,7 +830,7 @@ void TPrincipal::MakeNormalised()
/// See TPrincipal::MakeRealCode for a list of options
///
/// The minimal class definition is:
-///
+/// ~~~ {.cpp}
/// class <classname> {
/// public:
/// static Int_t fgNVariables;
@@ -930,7 +842,7 @@ void TPrincipal::MakeNormalised()
/// void X2P(Double_t *x, Double_t *p);
/// void P2X(Double_t *p, Double_t *x, Int_t nTest);
/// };
-///
+/// ~~~
/// Whether the methods <classname>::X2P and <classname>::P2X should
/// be static or not, is up to the user.
@@ -944,8 +856,8 @@ void TPrincipal::MakeMethods(const char *classname, Option_t *opt)
////////////////////////////////////////////////////////////////////////////////
/// Perform the principal components analysis.
/// This is done in several stages in the TMatrix::EigenVectors method:
-/// * Transform the covariance matrix into a tridiagonal matrix.
-/// * Find the eigenvalues and vectors of the tridiagonal matrix.
+/// - Transform the covariance matrix into a tridiagonal matrix.
+/// - Find the eigenvalues and vectors of the tridiagonal matrix.
void TPrincipal::MakePrincipals()
{
@@ -963,7 +875,6 @@ void TPrincipal::MakePrincipals()
}
////////////////////////////////////////////////////////////////////////////////
-/// PRIVATE METHOD:
/// This is the method that actually generates the code for the
/// transformations to and from feature space and pattern space
/// It's called by TPrincipal::MakeCode and TPrincipal::MakeMethods.
@@ -1153,10 +1064,10 @@ void TPrincipal::P2X(const Double_t *p, Double_t *x, Int_t nTest)
////////////////////////////////////////////////////////////////////////////////
/// Print the statistics
/// Options are
-/// M Print mean values of original data
-/// S Print sigma values of original data
-/// E Print eigenvalues of covariance matrix
-/// V Print eigenvectors of covariance matrix
+/// - M Print mean values of original data
+/// - S Print sigma values of original data
+/// - E Print eigenvalues of covariance matrix
+/// - V Print eigenvectors of covariance matrix
/// Default is MSE
void TPrincipal::Print(Option_t *opt) const
@@ -1237,60 +1148,20 @@ void TPrincipal::Print(Option_t *opt) const
}
////////////////////////////////////////////////////////////////////////////////
-/// PRIVATE METHOD:
-/// Begin_html
+/// Calculates the sum of the square residuals, that is
+///
+/// \f[
+/// E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
+/// \f]
+///
+/// where \f$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}\f$
+/// is the \f$i^{\mbox{th}}\f$ component of the principal vector, corresponding to
+/// \f$x_i\f$, the original data; I.e., the square distance to the space
+/// spanned by \f$N\f$ eigenvectors.
void TPrincipal::SumOfSquareResiduals(const Double_t *x, Double_t *s)
{
- /*
- </PRE>
- Calculates the sum of the square residuals, that is
- <BR><P></P>
- <DIV ALIGN="CENTER">
-
- <!-- MATH
- \begin{displaymath}
- E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
- \end{displaymath}
- -->
-
-
- <IMG
- WIDTH="147" HEIGHT="58" BORDER="0"
- SRC="gif/principal_img52.gif"
- ALT="\begin{displaymath}
- E_N = \sum_{i=0}^{P-1} \left(x_i - x^\prime_i\right)^2
- \end{displaymath}">
- </DIV>
- <BR CLEAR="ALL">
- <P></P>
- where
- <!-- MATH
- $x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$
- -->
- <IMG
- WIDTH="122" HEIGHT="40" ALIGN="MIDDLE" BORDER="0"
- SRC="gif/principal_img53.gif"
- ALT="$x^\prime_i = \sum_{j=i}^N p_i e_{n_j}$">, <IMG
- WIDTH="19" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="gif/principal_img54.gif"
- ALT="$p_i$"> is the
- <IMG
- WIDTH="28" HEIGHT="23" ALIGN="BOTTOM" BORDER="0"
- SRC="gif/principal_img55.gif"
- ALT="$i^{\mbox{th}}$"> component of the principal vector, corresponding to
- <IMG
- WIDTH="20" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="gif/principal_img56.gif"
- ALT="$x_i$">, the original data; I.e., the square distance to the space
- spanned by <IMG
- WIDTH="20" HEIGHT="15" ALIGN="BOTTOM" BORDER="0"
- SRC="gif/principal_img12.gif"
- ALT="$N$"> eigenvectors.
- <BR>
- <PRE>
- */
- // End_Html
+
if (!x)
return;
@@ -1330,6 +1201,7 @@ void TPrincipal::Test(Option_t *)
////////////////////////////////////////////////////////////////////////////////
/// Calculate the principal components from the original data vector
/// x, and return it in p.
+///
/// It's the users responsibility to make sure that both x and p are
/// of the right size (i.e., memory must be allocated for p).

13
root-tvector2-comment.patch
View file

@ -1,13 +0,0 @@
diff -ur root-6.06.02.orig/math/physics/inc/TVector2.h root-6.06.02/math/physics/inc/TVector2.h
--- root-6.06.02.orig/math/physics/inc/TVector2.h 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/physics/inc/TVector2.h 2016-03-06 19:07:23.115476536 +0100
@@ -96,7 +96,8 @@
TVector2 Rotate (Double_t phi) const;
// returns phi angle in the interval [0,2*PI)
- static Double_t Phi_0_2pi(Double_t x); // returns phi angle in the interval
+ static Double_t Phi_0_2pi(Double_t x);
+
// returns phi angle in the interval [-PI,PI)
static Double_t Phi_mpi_pi(Double_t x);

97
root-type1-embed.patch
View file

@ -1,97 +0,0 @@
diff -ur root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx root-6.06.02/graf2d/mathtext/src/fontembedps.cxx
--- root-6.06.02.orig/graf2d/mathtext/src/fontembedps.cxx 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/graf2d/mathtext/src/fontembedps.cxx 2016-03-20 14:52:11.268005800 +0100
@@ -30,14 +30,14 @@
#ifndef LITTLE_ENDIAN
#define LITTLE_ENDIAN 1
#endif // LITTLE_ENDIAN
-#include "Byteswap.h"
-#define bswap_16(x) Rbswap_16((x))
-#define bswap_32(x) Rbswap_32((x))
#else // R__BYTESWAP
#ifdef LITTLE_ENDIAN
#undef LITTLE_ENDIAN
#endif // LITTLE_ENDIAN
#endif // R__BYTESWAP
+#include "Byteswap.h"
+#define bswap_16(x) Rbswap_16((x))
+#define bswap_32(x) Rbswap_32((x))
// References:
//
@@ -236,29 +236,26 @@
if(magic_number[0] == '\200') {
// IBM PC format printer font binary
- // FIXME: Maybe the real name can be parsed out of the
- // file
- font_name = "";
-
struct pfb_segment_header_s segment_header;
size_t offset = 0;
- segment_header.type = 0;
+ // The two char elements of struct
+ // pfb_segment_header_s are most likely aligned to
+ // larger than 1 byte boundaries, so copy all the
+ // elements individually
+ segment_header.always_128 = font_data[offset];
+ segment_header.type = font_data[offset + 1];
+
while (segment_header.type != TYPE_EOF) {
- // The two char elements of struct
- // pfb_segment_header_s are most likely aligned to
- // larger than 1 byte boundaries, so copy all the
- // elements individually
- segment_header.always_128 = font_data[offset];
- segment_header.type = font_data[offset + 1];
memcpy(&segment_header.length, &font_data[offset + 2],
sizeof(unsigned int));
offset += sizeof(unsigned int) + 2;
-#ifdef LITTLE_ENDIAN
+#ifndef LITTLE_ENDIAN
segment_header.length =
bswap_32(segment_header.length);
#endif // LITTLE_ENDIAN
char *buffer = new char[segment_header.length];
+ char *fname;
memcpy(buffer, &font_data[offset],
segment_header.length);
@@ -278,6 +275,26 @@
buffer[segment_header.length - 1] = '\n';
}
ret.append(buffer, segment_header.length);
+
+ fname = (char*)memmem(buffer, segment_header.length,
+ "/FontName", 9);
+ if (fname) {
+ fname += 9;
+ while (fname < buffer + segment_header.length &&
+ isspace(*fname)) {
+ fname++;
+ }
+ if (fname < buffer + segment_header.length &&
+ *fname == '/') {
+ fname++;
+ }
+ int len = 0;
+ while (fname + len < buffer + segment_header.length &&
+ isgraph(*(fname + len))) {
+ len++;
+ }
+ font_name.assign(fname, len);
+ }
break;
case TYPE_BINARY:
append_asciihex(
@@ -289,6 +306,9 @@
}
delete [] buffer;
+
+ segment_header.always_128 = font_data[offset];
+ segment_header.type = font_data[offset + 1];
}
return ret;

305
root-unuran.patch
View file

@ -1,305 +0,0 @@
diff -Nur root-6.06.02.orig/cmake/modules/FindUnuran.cmake root-6.06.02/cmake/modules/FindUnuran.cmake
--- root-6.06.02.orig/cmake/modules/FindUnuran.cmake 1970-01-01 01:00:00.000000000 +0100
+++ root-6.06.02/cmake/modules/FindUnuran.cmake 2016-03-20 17:53:02.393804958 +0100
@@ -0,0 +1,21 @@
+# - Locate Unuran library
+# Defines:
+#
+# UNURAN_FOUND
+# UNURAN_INCLUDE_DIR
+# UNURAN_INCLUDE_DIRS (not cached)
+# UNURAN_LIBRARIES
+
+find_path(UNURAN_INCLUDE_DIR NAMES unuran.h HINTS ${UNURAN_DIR}/include $ENV{UNURAN_DIR}/include /usr/include)
+find_library(UNURAN_LIBRARY NAMES unuran HINTS ${UNURAN_DIR}/lib $ENV{UNURAN_DIR}/lib)
+
+set(UNURAN_INCLUDE_DIRS ${UNURAN_INCLUDE_DIR})
+set(UNURAN_LIBRARIES ${UNURAN_LIBRARY})
+
+
+# handle the QUIETLY and REQUIRED arguments and set UNURAN_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(UNURAN DEFAULT_MSG UNURAN_LIBRARY UNURAN_INCLUDE_DIR)
+
+mark_as_advanced(UNURAN_FOUND UNURAN_INCLUDE_DIR UNURAN_LIBRARY)
diff -Nur root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake root-6.06.02/cmake/modules/RootBuildOptions.cmake
--- root-6.06.02.orig/cmake/modules/RootBuildOptions.cmake 2016-03-20 14:37:23.656597032 +0100
+++ root-6.06.02/cmake/modules/RootBuildOptions.cmake 2016-03-20 17:54:50.896874682 +0100
@@ -73,6 +73,7 @@
ROOT_BUILD_OPTION(builtin_glew ON "Built included libGLEW, or use system libGLEW")
ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
ROOT_BUILD_OPTION(builtin_pcre OFF "Built included libpcre, or use system libpcre")
+ROOT_BUILD_OPTION(builtin_unuran OFF "Build included libunuran, or use system libunuran")
ROOT_BUILD_OPTION(builtin_zlib OFF "Built included libz, or use system libz")
ROOT_BUILD_OPTION(builtin_lzma OFF "Built included liblzma, or use system liblzma")
ROOT_BUILD_OPTION(builtin_davix OFF "Built the Davix library internally (downloading tarfile from the Web)")
diff -Nur 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-20 15:54:25.926191321 +0100
+++ root-6.06.02/cmake/modules/RootConfiguration.cmake 2016-03-20 17:53:02.394804968 +0100
@@ -142,6 +142,11 @@
set(zliblib ${ZLIB_LIBRARY})
set(zlibincdir ${ZLIB_INCLUDE_DIR})
+set(builtinunuran ${value${builtin_unuran}})
+set(unuranlibdir ${UNURAN_LIBRARY_DIR})
+set(unuranlib ${UNURAN_LIBRARY})
+set(unuranincdir ${UNURAN_INCLUDE_DIR})
+
set(buildgl ${value${opengl}})
set(opengllibdir ${OPENGL_LIBRARY_DIR})
set(openglulib ${OPENGL_glu_LIBRARY})
diff -Nur root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake
--- root-6.06.02.orig/cmake/modules/SearchInstalledSoftware.cmake 2016-03-20 17:08:52.186461662 +0100
+++ root-6.06.02/cmake/modules/SearchInstalledSoftware.cmake 2016-03-20 17:53:02.394804968 +0100
@@ -40,6 +40,16 @@
endif()
endif()
+#---Check for Unuran ------------------------------------------------------------------
+if(NOT builtin_unuran)
+ message(STATUS "Looking for Unuran")
+ find_Package(Unuran)
+ if(NOT UNURAN_FOUND)
+ message(STATUS "Unuran not found. Switching on builtin_unuran option")
+ set(builtin_unuran ON CACHE BOOL "" FORCE)
+ endif()
+endif()
+
#---Check for Freetype---------------------------------------------------------------
if(NOT builtin_freetype)
message(STATUS "Looking for Freetype")
diff -Nur 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-20 15:54:25.999192031 +0100
+++ root-6.06.02/config/Makefile.in 2016-03-20 17:53:02.468805698 +0100
@@ -121,6 +121,11 @@
BUILTINPCRE := @builtinpcre@
+BUILTINUNURAN := @builtinunuran@
+UNURANLIBDIR := @unuranlibdir@
+UNURANLIB := @unuranlib@
+UNURANINCDIR := $(filter-out /usr/include, @unuranincdir@)
+
BUILTINZLIB := @builtinzlib@
ZLIBLIBDIR := @zliblibdir@
ZLIBCLILIB := @zliblib@
diff -Nur root-6.06.02.orig/configure root-6.06.02/configure
--- root-6.06.02.orig/configure 2016-03-20 16:48:49.767492974 +0100
+++ root-6.06.02/configure 2016-03-20 17:53:02.513806142 +0100
@@ -55,6 +55,7 @@
enable_builtin_freetype \
enable_builtin_glew \
enable_builtin_pcre \
+ enable_builtin_unuran \
enable_builtin_zlib \
enable_builtin_lzma \
enable_builtin_llvm \
@@ -183,6 +184,7 @@
enable_builtin_ftgl=no
enable_builtin_glew=no
enable_builtin_pcre=no
+enable_builtin_unuran=no
enable_builtin_zlib=no
enable_builtin_lzma=no
enable_builtin_llvm=yes
@@ -1704,6 +1706,7 @@
builtin-freetype Build included libfreetype, or use system libfreetype
builtin-glew Build included libGLEW, or use system libGLEW
builtin-pcre Build included libpcre, or use system libpcre
+ builtin-unuran Build included libunuran, or use system libunuran
builtin-zlib Build included libz, or use system libz
builtin-lzma Build included liblzma, or use system liblzma
libcxx Build using libc++, required by clang option (MacOS X only, for the time being)
@@ -2046,6 +2049,7 @@
enable_builtin_ftgl="yes"
enable_builtin_glew="yes"
enable_builtin_pcre="yes"
+ enable_builtin_unuran="yes"
enable_builtin_zlib="yes"
enable_builtin_lzma="yes"
top_builddir=`cygpath -u $top_builddir`
@@ -3210,6 +3214,38 @@
######################################################################
#
+### echo %%% libunuran (builtin or system)
+#
+if test "x$enable_builtin_unuran" = "xno" ; then
+ check_header "unuran.h" "" \
+ $UNURAN ${UNURAN:+$UNURAN/include} /usr/include
+ if test "x$found_dir" = "x" ; then
+ enable_builtin_unuran=yes
+ else
+ unuraninc=$found_hdr
+ unuranincdir=$found_dir
+ fi
+
+ check_library "libunuran" "$enable_shared" "" \
+ $UNURAN ${UNURAN:+$UNURAN/lib} /usr/lib
+ if test "x$found_lib" = "x" ; then
+ unuranlib=""
+ unuranlibdir=""
+ enable_builtin_unuran="yes"
+ else
+ unuranlib="$found_lib"
+ unuranlibdir="$found_dir"
+ fi
+
+ if test "x$unuranincdir" = "x" || test "x$unuranlib" = "x"; then
+ enable_builtin_unuran="yes"
+ fi
+fi
+message "Checking whether to build included unuran"
+result "$enable_builtin_unuran"
+
+######################################################################
+#
### echo %%% Use included zLib or use systems
#
if test "x$enable_builtin_zlib" = "xno" ; then
@@ -7720,6 +7756,10 @@
-e "s|@top_srcdir@|$top_srcdir|" \
-e "s|@ttffontdir@|$fontdir|" \
-e "s|@tutdir@|$tutdir|" \
+ -e "s|@builtinunuran@|$enable_builtin_unuran|" \
+ -e "s|@unuranincdir@|$unuranincdir|" \
+ -e "s|@unuranlib@|$unuranlib|" \
+ -e "s|@unuranlibdir@|$unuranlibdir|" \
-e "s|@winrtdebug@|$enable_winrtdebug|" \
-e "s|@xmlincdir@|$xmlincdir|" \
-e "s|@xmllib@|$xmllib|" \
diff -Nur root-6.06.02.orig/math/unuran/CMakeLists.txt root-6.06.02/math/unuran/CMakeLists.txt
--- root-6.06.02.orig/math/unuran/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/unuran/CMakeLists.txt 2016-03-20 17:53:02.552806526 +0100
@@ -3,6 +3,9 @@
############################################################################
#---Define package related variables-----------------------------------------------------------------
+
+if(builtin_unuran)
+
set(UNR_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(UNR_VERSION "1.8.0-root")
set(UNR_TARNAME "unuran-${UNR_VERSION}")
@@ -62,8 +65,17 @@
${UNR_UNTARDIR}/src/tests/*.c
${UNR_UNTARDIR}/src/uniform/*.c
${UNR_UNTARDIR}/src/urng/*.c )
+set(unrconfig ${UNR_UNTARDIR}/config.h)
+
+else()
+
+include_directories(${UNURAN_INCLUDE_DIRS})
+set(unrsources)
+set(unrconfig)
+
+endif()
ROOT_GENERATE_DICTIONARY(G__Unuran *.h MODULE Unuran LINKDEF LinkDef.h)
-ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${UNR_UNTARDIR}/config.h LIBRARIES Core DEPENDENCIES Hist MathCore)
+ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${unrconfig} LIBRARIES Core ${UNURAN_LIBRARIES} DEPENDENCIES Hist MathCore)
ROOT_INSTALL_HEADERS()
diff -Nur root-6.06.02.orig/math/unuran/Module.mk root-6.06.02/math/unuran/Module.mk
--- root-6.06.02.orig/math/unuran/Module.mk 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/math/unuran/Module.mk 2016-03-20 17:53:02.553806536 +0100
@@ -12,6 +12,8 @@
UNURANDIRS := $(UNURANDIR)/src
UNURANDIRI := $(UNURANDIR)/inc
+ifeq ($(BUILTINUNURAN),yes)
+
UNRVERS := unuran-1.8.0-root
UNRSRCS := $(MODDIRS)/$(UNRVERS).tar.gz
@@ -43,15 +45,18 @@
$(filter $(UNRDIRS)/src/uniform/%,$(UNRTARCONTENT)) \
$(filter $(UNRDIRS)/src/urng/%,$(UNRTARCONTENT)))
endif
-UNRO := $(UNRS:.c=.o)
+UNRFLAGS := -I$(UNRDIRS)/src
-ifeq ($(PLATFORM),win32)
-UNRLIBS := $(UNRDIRS)/src/.libs/libunuran.lib
else
-UNRLIBS := $(UNRDIRS)/src/.libs/libunuran.a
+
+UNURANETAG :=
+UNRCFG :=
+UNRS :=
+UNRFLAGS := $(UNURANINCDIR:%=-I%)
+
endif
-UNRFLAGS := -I$(UNRDIRS)/src
+UNRO := $(UNRS:.c=.o)
##### libUnuran #####
UNURANL := $(MODDIRI)/LinkDef.h
@@ -84,6 +89,8 @@
include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG)
cp $< $@
+ifeq ($(BUILTINUNURAN),yes)
+
$(UNURANDEP): $(UNRCFG)
$(UNRS): $(UNURANETAG)
@@ -134,12 +141,14 @@
GNUMAKE=$(MAKE) ./configure CC="$$ACC" \
CFLAGS="$$ACFLAGS");
+endif
+
$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
$(MAINLIBS) $(UNURANLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libUnuran.$(SOEXT) $@ \
"$(UNURANO) $(UNURANDO)" \
- "$(UNURANLIBEXTRA) $(UNRO)"
+ "$(UNURANLIBEXTRA) $(UNRO) $(UNURANLIBDIR) $(UNURANLIB)"
$(call pcmrule,UNURAN)
$(noop)
@@ -158,16 +167,19 @@
clean-$(MODNAME):
@rm -f $(UNURANO) $(UNURANDO)
+ifeq ($(BUILTINUNURAN),yes)
-@(if [ -d $(UNRDIRS) ]; then \
cd $(UNRDIRS); \
$(MAKE) clean; \
fi)
+endif
clean:: clean-$(MODNAME)
distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(UNURANO) $(UNURANDO) $(UNURANETAG) $(UNURANDEP) \
$(UNURANDS) $(UNURANDH) $(UNURANLIB) $(UNURANMAP)
+ifeq ($(BUILTINUNURAN),yes)
@mv $(UNRSRCS) $(UNRDIR)/-$(UNRVERS).tar.gz
ifeq ($(UNURKEEP),yes)
@mv $(UNRDIRS) $(UNRDIRS).keep
@@ -177,6 +189,7 @@
@mv $(UNRDIRS).keep $(UNRDIRS)
endif
@mv $(UNRDIR)/-$(UNRVERS).tar.gz $(UNRSRCS)
+endif
distclean:: distclean-$(MODNAME)
@@ -184,6 +197,7 @@
$(UNURANO): CXXFLAGS += $(UNRFLAGS)
+ifeq ($(BUILTINUNURAN),yes)
ifeq ($(PLATFORM),win32)
$(UNRO): CFLAGS := $(filter-out -FIsehmap.h,$(filter-out -Iinclude,$(CFLAGS) -I$(UNRDIRS) -I$(UNRDIRS)/src/ -I$(UNRDIRS)/src/utils -DHAVE_CONFIG_H))
else
@@ -194,3 +208,4 @@
ifeq ($(CC),icc)
$(UNRO): CFLAGS += -mp
endif
+endif

12
root-werror.patch
View file

@ -1,12 +0,0 @@
diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
--- root-6.06.02.orig/interpreter/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
+++ root-6.06.02/interpreter/CMakeLists.txt 2016-03-20 17:33:36.288203832 +0100
@@ -40,7 +40,7 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
#---Do not transform warnings in errors-------------------------------------------------------------
-string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
#---Build LLVM/Clang with symbol visibility=hidden--------------------------------------------------
ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -fvisibility=hidden)

3462
root.spec
View file

File diff suppressed because it is too large Load diff

2
sources
View file

@ -1,2 +0,0 @@
8ae1d36c9fb30c4ee13099ec55a9339a root-6.06.06.tar.xz
7bb34ac86cae35a58bf226a22a328b9b root-testfiles.tar.xz