[root/f18] Compilation and documentation fixes

[Mattias Ellert]

commit 24a64f44438ac75a5726f9b66864a598d50fdb05
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Oct 13 16:45:40 2012 +0200

    Compilation and documentation fixes

 root-gfal-bits.patch    |   15 +++++++++++++++
 root-tclass-fix.patch   |   24 ++++++++++++++++++++++++
 root-thtml-revert.patch |   18 ++++++++++++++++++
 root.spec               |    9 +++++++++
 4 files changed, 66 insertions(+), 0 deletions(-)
---
diff --git a/root-gfal-bits.patch b/root-gfal-bits.patch
new file mode 100644
index 0000000..ab7afff
--- /dev/null
+++ b/root-gfal-bits.patch
@@ -0,0 +1,15 @@
+diff -ur root-5.34.02.orig/io/gfal/src/TGFALFile.cxx root-5.34.02/io/gfal/src/TGFALFile.cxx
+--- root-5.34.02.orig/io/gfal/src/TGFALFile.cxx	2012-09-21 16:29:07.000000000 +0200
++++ root-5.34.02/io/gfal/src/TGFALFile.cxx	2012-10-12 22:59:42.785689152 +0200
+@@ -60,6 +60,11 @@
+ //                                                                      //
+ //////////////////////////////////////////////////////////////////////////
+ 
++#ifdef _FILE_OFFSET_BITS
++#undef _FILE_OFFSET_BITS
++#endif
++#define _FILE_OFFSET_BITS 64
++
+ #include "TGFALFile.h"
+ #include "TROOT.h"
+ #include "TUrl.h"
diff --git a/root-tclass-fix.patch b/root-tclass-fix.patch
new file mode 100644
index 0000000..98c11bf
--- /dev/null
+++ b/root-tclass-fix.patch
@@ -0,0 +1,24 @@
+--- v5-34-00-patches/core/meta/src/TClass.cxx	2012/08/24 14:30:19	45695
++++ v5-34-00-patches/core/meta/src/TClass.cxx	2012/10/05 21:03:30	46365
+@@ -2544,7 +2544,10 @@
+          if (objType) {
+             const char *typdfName = objType->GetTypeName();
+             if (typdfName && strcmp(typdfName, name)) {
+-               cl = TClass::GetClass(typdfName, load);
++               TString alternateName(typdfName);
++               // TClass::GetClass might get call GetTypeName and thus
++               // re-use the static storage use by GetTypeName!
++               cl = TClass::GetClass(alternateName, load);
+                return cl;
+             }
+          }
+@@ -3206,9 +3209,6 @@
+          fRealData->Delete();
+       delete fRealData;  fRealData=0;
+       
+-      if (fStreamerInfo)
+-         fStreamerInfo->Delete();
+-      delete fStreamerInfo; fStreamerInfo=0;
+    }
+ }
+ 
diff --git a/root-thtml-revert.patch b/root-thtml-revert.patch
new file mode 100644
index 0000000..a1d1960
--- /dev/null
+++ b/root-thtml-revert.patch
@@ -0,0 +1,18 @@
+--- v5-34-00-patches/html/src/THtml.cxx	2012/08/29 09:33:39	45728
++++ v5-34-00-patches/html/src/THtml.cxx	2012/05/08 15:21:21	44178
+@@ -310,13 +310,11 @@
+          if (!filename.EndsWith(fsentry->GetName()))
+             continue;
+          fsentry->GetFullName(filesysname, kTRUE); // get the short version
+-         filename = filesysname;
+          if (!filename.EndsWith(filesysname)) {
+-            // It's something - let's see whether we find something better
+-            // else leave it as plan B. This helps finding Reflex sources.
+-            //filesysname = "";
++            filesysname = "";
+             continue;
+          }
++         filename = filesysname;
+          fsentry->GetFullName(filesysname, kFALSE); // get the long version
+          if (fse) *fse = fsentry;
+          break;
diff --git a/root.spec b/root.spec
index 98aa869..b7368b8 100644
--- a/root.spec
+++ b/root.spec
@@ -62,6 +62,12 @@ Patch3:		%{name}-xrootd.patch
 Patch4:		%{name}-meta.patch
 #		Fixes for latest glibc headers
 Patch5:		%{name}-glibc.patch
+#		Missing Include
+Patch6:		%{name}-gfal-bits.patch
+#		Backport meta fixes
+Patch7:		%{name}-tclass-fix.patch
+#		Revert THtml change
+Patch8:		%{name}-thtml-revert.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #		The build segfaults on ppc64 during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
@@ -1024,6 +1030,9 @@ fi
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \
 	   -name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \