diff options
author | Andrew Savchenko <bircoph@gmail.com> | 2014-06-29 21:52:27 +0400 |
---|---|---|
committer | Andrew Savchenko <bircoph@gmail.com> | 2014-06-29 21:52:27 +0400 |
commit | 5db2b39f503b53bc996ab07e7c13e8b866e2d085 (patch) | |
tree | 7d67ad7bc299722bc00961daee0ba3c3d3658ac9 /sci-physics/root/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 'sci-physics/root/files')
16 files changed, 68 insertions, 485 deletions
diff --git a/sci-physics/root/files/root-5.28.00b-asneeded.patch b/sci-physics/root/files/root-5.28.00b-asneeded.patch deleted file mode 100644 index b845247e1..000000000 --- a/sci-physics/root/files/root-5.28.00b-asneeded.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- root.orig/configure 2010-12-20 07:17:54.000000000 +0000 -+++ root/configure 2010-12-20 07:16:05.000000000 +0000 -@@ -709,7 +709,7 @@ - cat <<EOF > conftest.mk - include ${ac_srcdir}/config/Makefile.${arch} - conftest: conftest.c -- \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ -+ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ - - conftest.c: - echo "int main() { return 0; }" > \$@ -@@ -723,7 +723,7 @@ - cat <<EOF > conftest.mk - include ${ac_srcdir}/config/Makefile.${arch} - conftest:conftest.c -- \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ -+ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ - - conftest.c: - echo "extern int $linksymbol (); " > \$@ diff --git a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch deleted file mode 100644 index 732431943..000000000 --- a/sci-physics/root/files/root-5.28.00b-prop-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur root.orig/config/Makefile.in root/config/Makefile.in ---- root.orig/config/Makefile.in 2010-12-14 17:20:26.000000000 +0300 -+++ root/config/Makefile.in 2010-12-17 22:33:34.902161458 +0300 -@@ -27,7 +27,7 @@ - - EXTRA_CFLAGS := -Iinclude @cflags@ - EXTRA_CXXFLAGS := -Iinclude @cflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WINRTDEBUG := @winrtdebug@ - - GLBPATCHFLAGS := @glbpatchcflags@ - diff --git a/sci-physics/root/files/root-5.28.00b-unuran.patch b/sci-physics/root/files/root-5.28.00b-unuran.patch deleted file mode 100644 index 76422daed..000000000 --- a/sci-physics/root/files/root-5.28.00b-unuran.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk ---- root.orig/math/unuran/Module.mk 2010-11-25 20:41:32.000000000 +0100 -+++ root/math/unuran/Module.mk 2010-11-25 20:51:47.190704977 +0100 -@@ -20,7 +20,7 @@ - UNURANETAG := $(call stripsrc,$(UNURANDIRS)/headers.d) - UNRCFG := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h) - --UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -)) -+UNRTARCONTENT:= - UNRS := $(filter %.c, \ - $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \ - $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \ -@@ -69,10 +69,9 @@ - ##### local rules ##### - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) - --include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG) -+include/%.h: $(UNURANDIRI)/%.h - cp $< $@ - --$(UNURANDEP): $(UNRCFG) - $(UNRS): $(UNURANETAG) - - $(UNURANETAG): $(UNRSRCS) -@@ -125,12 +124,12 @@ - GNUMAKE=$(MAKE) ./configure CC="$$ACC" \ - CFLAGS="$$ACFLAGS"); - --$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \ -+$(UNURANLIB): $(UNURANO) $(UNURANDO) $(ORDER_) \ - $(MAINLIBS) $(UNURANLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libUnuran.$(SOEXT) $@ \ - "$(UNURANO) $(UNURANDO)" \ -- "$(UNURANLIBEXTRA) $(UNRO)" -+ "$(UNURANLIBEXTRA) -lunuran" - - $(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP) - $(MAKEDIR) diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch deleted file mode 100644 index 85d6dea76..000000000 --- a/sci-physics/root/files/root-5.32.00-dotfont.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.000000000 +0400 -+++ root/html/src/TClassDocOutput.cxx 2012-05-29 21:36:53.813593012 +0400 -@@ -625,7 +625,7 @@ - << "size=\"8,10\";" << endl - << "ratio=auto;" << endl - << "margin=0;" << endl -- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl -+ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl - << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl; - - std::stringstream ssDep; -@@ -704,7 +704,7 @@ - outdot << ";" << endl; - } else if (writeAndMoreFor) { - outdot << " \"...andmore" << writeAndMoreFor->GetName() -- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl; -+ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl; - } - } - if (!levelExists) break; -@@ -733,7 +733,7 @@ - << "ranksep=0.1;" << endl - << "nodesep=0;" << endl - << "margin=0;" << endl; -- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl; -+ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl; - - std::stringstream ssDep; - const int numColumns = 3; -@@ -939,7 +939,7 @@ - << "ranksep=0;" << endl - << "nodesep=0;" << endl - << "size=\"8,10\";" << endl -- << "node [fontsize=20,shape=plaintext];" << endl; -+ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl; - - for (std::list<std::string>::iterator iFile = listFilesToParse.begin(); - iFile != listFilesToParse.end(); ++iFile) { -@@ -999,7 +999,8 @@ - << "ranksep=0.7;" << endl - << "nodesep=0.3;" << endl - << "size=\"8,8\";" << endl -- << "ratio=compress;" << endl; -+ << "ratio=compress;" << endl -+ << "node [fontname=\"DejaVu Serif\"];" << endl; - - TString libs(fCurrentClass->GetSharedLibs()); - outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl; -@@ -1109,7 +1110,8 @@ - - dotout << "digraph G {" << endl - << "ratio=auto;" << endl -- << "rankdir=RL;" << endl; -+ << "rankdir=RL;" << endl -+ << "node [fontname=\"DejaVu Serif\"];" << endl; - - // loop on all classes - TClassDocInfo* cdi = 0; diff --git a/sci-physics/root/files/root-5.32.00-explicit-functions.patch b/sci-physics/root/files/root-5.32.00-explicit-functions.patch deleted file mode 100644 index 570d61e68..000000000 --- a/sci-physics/root/files/root-5.32.00-explicit-functions.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- root/io/io/Module.mk.orig 2012-02-29 19:46:38.000000000 +0400 -+++ root/io/io/Module.mk 2012-03-09 02:29:19.905665572 +0400 -@@ -67,15 +67,5 @@ - distclean:: distclean-$(MODNAME) - - ##### extra rules ###### --#ifeq ($(GCC_VERS_FULL),gcc-4.4.0) --ifeq ($(GCC_VERS),gcc-4.4) --ifneq ($(filter -O%,$(OPT)),) - $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION --endif --endif --ifeq ($(GCC_VERS),gcc-4.5) --ifneq ($(filter -O%,$(OPT)),) - $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION --endif --endif -- diff --git a/sci-physics/root/files/root-5.32.00-htmldoc.patch b/sci-physics/root/files/root-5.32.00-htmldoc.patch deleted file mode 100644 index 3b80b39cd..000000000 --- a/sci-physics/root/files/root-5.32.00-htmldoc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- root/html/src/THtml.cxx.orig 2012-05-25 16:18:10.000000000 +0400 -+++ root/html/src/THtml.cxx 2012-05-29 19:22:40.810563296 +0400 -@@ -1913,6 +1913,9 @@ - void THtml::CreateStyleSheet() const { - // Write the default ROOT style sheet. - CopyFileFromEtcDir("ROOT.css"); -+ CopyFileFromEtcDir("info.png"); -+ CopyFileFromEtcDir("root-banner.png"); -+ CopyFileFromEtcDir("rootdrawing-logo.png"); - CopyFileFromEtcDir("shadowAlpha.png"); - CopyFileFromEtcDir("shadow.gif"); - } diff --git a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch b/sci-physics/root/files/root-5.32.00-nobyte-compile.patch deleted file mode 100644 index 179e5790c..000000000 --- a/sci-physics/root/files/root-5.32.00-nobyte-compile.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur root.as-needed/Makefile root/Makefile ---- root.as-needed/Makefile 2011-07-10 10:42:49.758191296 +0400 -+++ root/Makefile 2011-07-10 10:43:21.493339703 +0400 -@@ -1167,10 +1167,7 @@ - if test "x$(RFLX_GRFLXPY)" != "x"; then \ - rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ - fi; \ -- if test "x$(RFLX_GRFLXPYC)" != "x"; then \ -- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ -- fi; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(RFLX_GRFLXDD:lib/=); \ - while test "x$${dir}" != "x" && \ - test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ -diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk ---- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 -+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 -@@ -48,8 +48,6 @@ - ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) - $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ - endif --ROOTPYC := $(ROOTPY:.py=.pyc) --ROOTPYO := $(ROOTPY:.py=.pyo) - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) -@@ -68,10 +66,8 @@ - include/%.h: $(PYROOTDIRI)/%.h - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - --$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ -+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ - $(ROOTLIBSDEP) $(PYTHONLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ -@@ -113,7 +109,7 @@ - - distclean-$(MODNAME): clean-$(MODNAME) - @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ -- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ -+ $(ROOTPY) $(PYROOTMAP) \ - $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) - - distclean:: distclean-$(MODNAME) -diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules ---- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400 -+++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400 -@@ -691,10 +691,6 @@ - -X$(SYSCONFDIR)/root/system.rootauthrc \ - -X$(SYSCONFDIR)/root/system.rootdaemonrc \ - -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \ - -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \ - -X$(PREFIX)/include/root/Minuit2 - # $(foreach i, \ -diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk ---- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400 -+++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -31,10 +31,6 @@ - CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) - $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ - endif --ifneq ($(BUILDPYTHON),no) --CINTEXPYC := $(CINTEXPY:.py=.pyc) --CINTEXPYO := $(CINTEXPY:.py=.pyo) --endif - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) -@@ -86,8 +82,6 @@ - fi) - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - - $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ - $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) -diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk ---- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -48,9 +48,6 @@ - RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) - RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) - RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) --ifneq ($(BUILDPYTHON),no) --RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) --endif - - RFLX_LIBDIR = $(LIBDIR) - -@@ -92,7 +89,7 @@ - - ALLEXECS += $(RFLX_GENMAPX) - --POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+POSTBIN += $(RFLX_GRFLXPY) - - ##### local rules ##### - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ -@@ -122,8 +119,6 @@ - mkdir -p lib/python/genreflex; fi ) - cp $< $@ - --$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py -- @python -c 'import py_compile; py_compile.compile( "$<" )' - - $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap - -@@ -149,7 +144,7 @@ - $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ - -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) - --all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) - - clean-genreflex: - @rm -rf lib/python/genreflex -diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt ---- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400 -@@ -15,7 +15,7 @@ - ##################### sources #################### - - FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) --SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) -+SET(GENREFLEX_SCRIPT PARENT_SCOPE) - - ##################### gccxmlpath #################### - diff --git a/sci-physics/root/files/root-5.32.00-rmkdepend.patch b/sci-physics/root/files/root-5.32.00-rmkdepend.patch deleted file mode 100644 index 6658660e1..000000000 --- a/sci-physics/root/files/root-5.32.00-rmkdepend.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- root/build/rmkdepend/main.c.orig 2012-05-09 15:00:06.000000000 +0400 -+++ root/build/rmkdepend/main.c 2013-12-22 01:58:44.939245160 +0400 -@@ -52,18 +52,6 @@ - #else - #include <io.h> - #endif --#if !defined(__hpux) --# if defined(__APPLE__) --# include <AvailabilityMacros.h> --# if !defined(MAC_OS_X_VERSION_10_4) --extern int fchmod(int, int); --# endif --# elif defined(__CYGWIN__) --extern int fchmod(int, mode_t); --#else --extern int fchmod(int, int); --# endif --#endif - - #ifdef MINIX - #define USE_CHMOD 1 diff --git a/sci-physics/root/files/root-5.32.00-rusage.patch b/sci-physics/root/files/root-5.32.00-rusage.patch deleted file mode 100644 index 992370c55..000000000 --- a/sci-physics/root/files/root-5.32.00-rusage.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- root/core/unix/src/TUnixSystem.cxx.orig 2012-05-09 14:59:38.000000000 +0400 -+++ root/core/unix/src/TUnixSystem.cxx 2013-12-22 02:35:01.983262490 +0400 -@@ -4882,8 +4882,8 @@ - - //---- System, CPU and Memory info --------------------------------------------- - --#if defined(R__MACOSX) - #include <sys/resource.h> -+#if defined(R__MACOSX) - #include <mach/mach.h> - #include <mach/mach_error.h> - diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch deleted file mode 100644 index ec67a1588..000000000 --- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur root.as-needed/Makefile root/Makefile ---- a/Makefile.orig 2013-02-15 02:27:56.000000000 +0400 -+++ b/Makefile 2013-02-23 02:22:14.556465852 +0400 -@@ -1258,10 +1258,7 @@ - for lib in $(RFLX_GRFLXPY); do \ - rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ - done; \ -- for lib in $(RFLX_GRFLXPYC); do \ -- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ -- done; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(subst lib/,,$(RFLX_GRFLXDD)); \ - while test "x$${dir}" != "x" && \ - test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ -diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk ---- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 -+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 -@@ -48,8 +48,6 @@ - ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) - $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ - endif --ROOTPYC := $(ROOTPY:.py=.pyc) --ROOTPYO := $(ROOTPY:.py=.pyo) - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) -@@ -68,10 +66,8 @@ - include/%.h: $(PYROOTDIRI)/%.h - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - --$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ -+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ - $(ROOTLIBSDEP) $(PYTHONLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ -@@ -113,7 +109,7 @@ - - distclean-$(MODNAME): clean-$(MODNAME) - @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ -- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ -+ $(ROOTPY) $(PYROOTMAP) \ - $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) - - distclean:: distclean-$(MODNAME) -diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules ---- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400 -+++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400 -@@ -691,10 +691,6 @@ - -X$(SYSCONFDIR)/root/system.rootauthrc \ - -X$(SYSCONFDIR)/root/system.rootdaemonrc \ - -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \ - -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \ - -X$(PREFIX)/include/root/Minuit2 - # $(foreach i, \ -diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk ---- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400 -+++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -31,10 +31,6 @@ - CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) - $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ - endif --ifneq ($(BUILDPYTHON),no) --CINTEXPYC := $(CINTEXPY:.py=.pyc) --CINTEXPYO := $(CINTEXPY:.py=.pyo) --endif - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) -@@ -86,8 +82,6 @@ - fi) - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - - $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ - $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) -diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk ---- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -48,9 +48,6 @@ - RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) - RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) - RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) --ifneq ($(BUILDPYTHON),no) --RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) --endif - - RFLX_LIBDIR = $(LIBDIR) - -@@ -92,7 +89,7 @@ - - ALLEXECS += $(RFLX_GENMAPX) - --POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+POSTBIN += $(RFLX_GRFLXPY) - - ##### local rules ##### - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ -@@ -122,8 +119,6 @@ - mkdir -p lib/python/genreflex; fi ) - cp $< $@ - --$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py -- @python -c 'import py_compile; py_compile.compile( "$<" )' - - $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap - -@@ -149,7 +144,7 @@ - $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ - -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) - --all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) - - clean-genreflex: - @rm -rf lib/python/genreflex -diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt ---- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400 -@@ -15,7 +15,7 @@ - ##################### sources #################### - - FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) --SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) -+SET(GENREFLEX_SCRIPT PARENT_SCOPE) - - ##################### gccxmlpath #################### - diff --git a/sci-physics/root/files/root-5.34.13-pythia8.patch b/sci-physics/root/files/root-5.34.13-pythia8.patch deleted file mode 100644 index 07f62bb8c..000000000 --- a/sci-physics/root/files/root-5.34.13-pythia8.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/montecarlo/pythia8/Module.mk b/montecarlo/pythia8/Module.mk -index b3d0ee4..86fb3d5 100644 ---- a/montecarlo/pythia8/Module.mk -+++ b/montecarlo/pythia8/Module.mk -@@ -50,7 +50,7 @@ $(PYTHIA8LIB): $(PYTHIA8O) $(PYTHIA8DO) $(ORDER_) $(MAINLIBS) $(PYTHIA8LIBDEP) - $(PYTHIA8DS): $(PYTHIA8H) $(PYTHIA8L) $(ROOTCINTTMPDEP) - $(MAKEDIR) - @echo "Generating dictionary $@..." -- $(ROOTCINTTMP) -f $@ -c -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L) -+ $(ROOTCINTTMP) -f $@ -c -p -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L) - - $(PYTHIA8MAP): $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L) - $(RLIBMAP) -o $@ -l $(PYTHIA8LIB) \ diff --git a/sci-physics/root/files/root-9999-dotfont.patch b/sci-physics/root/files/root-6.00.01-dotfont.patch index 6c765f75a..6c765f75a 100644 --- a/sci-physics/root/files/root-9999-dotfont.patch +++ b/sci-physics/root/files/root-6.00.01-dotfont.patch diff --git a/sci-physics/root/files/root-6.00.01-geocad.patch b/sci-physics/root/files/root-6.00.01-geocad.patch new file mode 100644 index 000000000..2742a74bd --- /dev/null +++ b/sci-physics/root/files/root-6.00.01-geocad.patch @@ -0,0 +1,15 @@ +diff --git a/geom/geocad/inc/TGeoToOCC.h b/geom/geocad/inc/TGeoToOCC.h +index 892f225..86eb9e1 100644 +--- a/geom/geocad/inc/TGeoToOCC.h ++++ b/geom/geocad/inc/TGeoToOCC.h +@@ -13,8 +13,10 @@ + #define ROOT_TGeoToOCC + + //Cascade ++#define Printf Printf_opencascade + #include <TopoDS_Shape.hxx> + #include <TopoDS_Wire.hxx> ++#undef Printf + + //Root + #ifndef ROOT_TGeoXtru diff --git a/sci-physics/root/files/root-6.00.01-llvm.patch b/sci-physics/root/files/root-6.00.01-llvm.patch new file mode 100644 index 000000000..c6abb353e --- /dev/null +++ b/sci-physics/root/files/root-6.00.01-llvm.patch @@ -0,0 +1,13 @@ +diff --git a/interpreter/llvm/src/Makefile.config.in b/interpreter/llvm/src/Makefile.config.in +index 7633be2..c8756b1 100644 +--- a/interpreter/llvm/src/Makefile.config.in ++++ b/interpreter/llvm/src/Makefile.config.in +@@ -170,6 +170,8 @@ CXXFLAGS += @CXXFLAGS@ + + # Linker flags. + LDFLAGS += @LDFLAGS@ ++NOUNDEF := -Wl,--no-undefined ++LDFLAGS := $(filter-out $(NOUNDEF),$(LDFLAGS)) + + # Path to the library archiver program. + AR_PATH = @AR@ diff --git a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch b/sci-physics/root/files/root-6.00.01-nobyte-compile.patch new file mode 100644 index 000000000..aa58f2068 --- /dev/null +++ b/sci-physics/root/files/root-6.00.01-nobyte-compile.patch @@ -0,0 +1,33 @@ +diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk +--- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 ++++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 +@@ -48,8 +48,6 @@ + ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) + $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ + endif +-ROOTPYC := $(ROOTPY:.py=.pyc) +-ROOTPYO := $(ROOTPY:.py=.pyo) + + # used in the main Makefile + ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) +@@ -68,10 +66,8 @@ + include/%.h: $(PYROOTDIRI)/%.h + cp $< $@ + +-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' +-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' + +-$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ ++$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ + $(ROOTLIBSDEP) $(PYTHONLIBDEP) + @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ + "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ +@@ -113,7 +109,7 @@ + + distclean-$(MODNAME): clean-$(MODNAME) + @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ +- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ ++ $(ROOTPY) $(PYROOTMAP) \ + $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) + + distclean:: distclean-$(MODNAME) diff --git a/sci-physics/root/files/root-5.32.00-prop-flags.patch b/sci-physics/root/files/root-6.00.01-prop-flags.patch index 7dfeb1cc3..3a1002478 100644 --- a/sci-physics/root/files/root-5.32.00-prop-flags.patch +++ b/sci-physics/root/files/root-6.00.01-prop-flags.patch @@ -1,6 +1,8 @@ ---- root/config/Makefile.in.orig 2013-01-21 22:04:43.011452938 +0400 -+++ root/config/Makefile.in 2013-01-21 22:04:18.027352209 +0400 -@@ -25,9 +25,9 @@ +diff --git a/config/Makefile.in b/config/Makefile.in +index dd89044..4fc7de3 100644 +--- a/config/Makefile.in ++++ b/config/Makefile.in +@@ -64,9 +64,9 @@ HOST := @host@ USECONFIG := @useconfig@ MKLIBOPTIONS := @mkliboption@ @@ -10,6 +12,6 @@ +EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS) +EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS) +EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) + WERROR := @werror@ WINRTDEBUG := @winrtdebug@ - - GLBPATCHFLAGS := @glbpatchcflags@ + CTORSINITARRAY := @ctorsinitarray@ |