diff options
author | 2014-06-29 21:52:27 +0400 | |
---|---|---|
committer | 2014-06-29 21:52:27 +0400 | |
commit | 5db2b39f503b53bc996ab07e7c13e8b866e2d085 (patch) | |
tree | 7d67ad7bc299722bc00961daee0ba3c3d3658ac9 /app-doc/root-docs/files | |
parent | Merge remote-tracking branch 'gentoo/master' into upstream-master (diff) | |
download | sci-5db2b39f503b53bc996ab07e7c13e8b866e2d085.tar.gz sci-5db2b39f503b53bc996ab07e7c13e8b866e2d085.tar.bz2 sci-5db2b39f503b53bc996ab07e7c13e8b866e2d085.zip |
sci-physics/root, app-doc/root-docs: version bump to ROOT-6
This is a major version bump for ROOT-6. Please refer to package's
ChangeLog files for details. Testing is welcome.
Diffstat (limited to 'app-doc/root-docs/files')
-rw-r--r-- | app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch | 16 | ||||
-rw-r--r-- | app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch | 57 |
2 files changed, 73 insertions, 0 deletions
diff --git a/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch b/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch new file mode 100644 index 000000000..b155795c9 --- /dev/null +++ b/app-doc/root-docs/files/root-docs-6.00.01-cernbuild.patch @@ -0,0 +1,16 @@ +diff --git a/tutorials/tree/cernbuild.C b/tutorials/tree/cernbuild.C +index ba516b6..793ecb5 100644 +--- a/tutorials/tree/cernbuild.C ++++ b/tutorials/tree/cernbuild.C +@@ -2,6 +2,11 @@ + // see also a variant in staff.C + // Author: Rene Brun + ++#include "TFile.h" ++#include "TSystem.h" ++#include "TString.h" ++#include "TTree.h" ++ + TFile *cernbuild(Int_t get=0, Int_t print=1) { + + Int_t Category; diff --git a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch b/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch new file mode 100644 index 000000000..8ad9b888f --- /dev/null +++ b/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch @@ -0,0 +1,57 @@ +diff --git a/Makefile b/Makefile +index 600e8db..afad025 100644 +--- a/Makefile ++++ b/Makefile +@@ -1072,16 +1072,7 @@ $(ROOTPCH): $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS) + + ifeq ($(BUILDX11),yes) + ifeq ($(BUILDASIMAGE),yes) +-html: rootexecs postbin changelog releasenotes +-ifneq ($(USECONFIG),FALSE) +- @if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \ +- || [ "`which root.exe`" -ot "bin/root.exe" ]; then \ +- echo 'ERROR: root.exe has not been installed by this build.'; \ +- echo ' Run "make install" before running "make html".'; \ +- exit 1; \ +- fi +-endif +- @$(MAKELOGHTML) ++html: compiledata releasenotes + @$(MAKEHTML) + else + html: +diff --git a/build/unix/makehtml.sh b/build/unix/makehtml.sh +index a94e790..8b4589d 100755 +--- a/build/unix/makehtml.sh ++++ b/build/unix/makehtml.sh +@@ -1,16 +1,16 @@ + #! /bin/sh + + dir=`pwd` +-ROOT=$dir/bin/root ++ROOT=root + cd tutorials + # we need tutorials/hsimple.root + if [ ! -f hsimple.root ]; then +- $ROOT -n -l -b -q hsimple.C ++ $ROOT -n -l -b -q hsimple.C && exit 1 + fi + cd tree + # we need tutorials/tree/cernstaff.root + if [ ! -f cernstaff.root ]; then +- $ROOT -n -l -b -q cernbuild.C ++ $ROOT -n -l -b -q cernbuild.C || exit 1 + fi + cd $dir + +@@ -20,7 +20,9 @@ echo "" + + # To generate the full documentation, we do need to + # use the graphics engine, so do not use '-b'. +-$ROOT -n -l <<makedoc ++$ROOT -n -l <<makedoc || exit 1 ++ #include "THtml.h" ++ gSystem->Load("libHtml"); + THtml h; + h.LoadAllLibs(); + h.MakeAll(); |