diff options
| author |   Andrew Savchenko <bircoph@gmail.com> | 2015-04-08 05:24:03 +0300 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gmail.com> | 2015-04-08 05:24:03 +0300 |
| commit | 12927c96d1a128d55ac21a00cb3595945a17b65b (patch) | |
| tree | ec4243026d717cee386b488ed9d809e4b8725896 /sci-physics/root/files | |
| parent | Merge remote-tracking branch 'github/master' (diff) | |
| download | sci-12927c96d1a128d55ac21a00cb3595945a17b65b.tar.gz sci-12927c96d1a128d55ac21a00cb3595945a17b65b.tar.bz2 sci-12927c96d1a128d55ac21a00cb3595945a17b65b.zip | |
sci-physics/root: version bump
Diffstat (limited to 'sci-physics/root/files')
| -rw-r--r-- | sci-physics/root/files/root-6.00.01-tutorials-path.patch | 39 | ||||
| -rw-r--r-- | sci-physics/root/files/root-6.00.02-tm_zone.patch | 22 | ||||
| -rw-r--r-- | sci-physics/root/files/root-6.02.05-xrootd4.patch | 11 |
3 files changed, 11 insertions, 61 deletions
diff --git a/sci-physics/root/files/root-6.00.01-tutorials-path.patch b/sci-physics/root/files/root-6.00.01-tutorials-path.patch deleted file mode 100644 index cb6861554..000000000 --- a/sci-physics/root/files/root-6.00.01-tutorials-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/config/RConfigure.in b/config/RConfigure.in -index 5950401..e4fbfbf 100644 ---- a/config/RConfigure.in -+++ b/config/RConfigure.in -@@ -11,6 +11,7 @@ - #define ROOTDATADIR "@datadir@" - #define ROOTDOCDIR "@docdir@" - #define ROOTMACRODIR "@macrodir@" -+#define ROOTTUTDIR "@tutdir@" - #define ROOTSRCDIR "@srcdir@" - #define ROOTICONPATH "@iconpath@" - #define EXTRAICONPATH "@extraiconpath@" -diff --git a/configure b/configure -index 131df92..2c8ea95 100755 ---- a/configure -+++ b/configure -@@ -7537,6 +7537,7 @@ sed \ - -e "s|@prefix@|$prefix|" \ - -e "s|@srcdir@|$srcdir|" \ - -e "s|@ttffontdir@|$fontdir|" \ -+ -e "s|@tutdir@|$tutdir|" \ - -e "s|@setresuid@|$setresuid|" \ - -e "s|@hasmathmore@|$hasmathmore|" \ - -e "s|@haspthread@|$haspthread|" \ -diff --git a/core/base/src/TApplication.cxx b/core/base/src/TApplication.cxx -index 1c1809a..7d7ed37 100644 ---- a/core/base/src/TApplication.cxx -+++ b/core/base/src/TApplication.cxx -@@ -866,8 +866,8 @@ Long_t TApplication::ProcessLine(const char *line, Bool_t sync, Int_t *err) - Error("ProcessLine", "Cannot show demos in batch mode!"); - return 1; - } --#ifdef ROOTDOCDIR -- ProcessLine(".x " ROOTDOCDIR "/tutorials/demos.C"); -+#ifdef ROOTTUTDIR -+ ProcessLine(".x " ROOTTUTDIR "/demos.C"); - #else - ProcessLine(".x $(ROOTSYS)/tutorials/demos.C"); - #endif diff --git a/sci-physics/root/files/root-6.00.02-tm_zone.patch b/sci-physics/root/files/root-6.00.02-tm_zone.patch deleted file mode 100644 index cdd1b13e4..000000000 --- a/sci-physics/root/files/root-6.00.02-tm_zone.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 08b08412bafc24fa635b0fdb832097a3aa2fa1d2 Mon Sep 17 00:00:00 2001 -From: Pere Mato <pere.mato@cern.ch> -Date: Sun, 21 Sep 2014 19:27:30 +0200 -Subject: [PATCH] Fix for ROOT-6728 - Compilation error in TTimeStamp - ---- - core/base/src/TTimeStamp.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/base/src/TTimeStamp.cxx b/core/base/src/TTimeStamp.cxx -index 8709220..f0ff12d 100644 ---- a/core/base/src/TTimeStamp.cxx -+++ b/core/base/src/TTimeStamp.cxx -@@ -813,7 +813,7 @@ void TTimeStamp::DumpTMStruct(const tm_t &tmstruct) - tmstruct.tm_isdst); - #if (defined(linux) && !defined(R__WINGCC)) || defined(R__MACOSX) - printf(",\n tm_gmtoff %6ld, tm_zone \"%s\"", --#if defined(__USE_BSD) || defined(R__MACOSX) -+#if defined(__USE_BSD) || defined(R__MACOSX) || defined(__USE_MISC) - tmstruct.tm_gmtoff, tmstruct.tm_zone); - #else - tmstruct.__tm_gmtoff, tmstruct.__tm_zone); diff --git a/sci-physics/root/files/root-6.02.05-xrootd4.patch b/sci-physics/root/files/root-6.02.05-xrootd4.patch new file mode 100644 index 000000000..0b4a4bef0 --- /dev/null +++ b/sci-physics/root/files/root-6.02.05-xrootd4.patch @@ -0,0 +1,11 @@ +https://sft.its.cern.ch/jira/browse/ROOT-6998 +--- root-6.02.05/net/netxng/src/TNetXNGFile.cxx.orig 2015-02-09 11:59:47.000000000 +0300 ++++ root-6.02.05/net/netxng/src/TNetXNGFile.cxx 2015-04-05 11:32:31.893127758 +0300 +@@ -28,6 +28,7 @@ + #include <XrdCl/XrdClFile.hh> + #include <XrdCl/XrdClXRootDResponses.hh> + #include <XrdCl/XrdClDefaultEnv.hh> ++#include <XrdVersion.hh> + #include <iostream> + + //------------------------------------------------------------------------------ |