Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
path: root/sci-physics/root/files
diff options
context:
space:
mode:
Diffstat (limited to 'sci-physics/root/files')
-rw-r--r--sci-physics/root/files/root-5.32.00-dotfont.patch58
-rw-r--r--sci-physics/root/files/root-5.34.05-nobyte-compile.patch137
2 files changed, 0 insertions, 195 deletions
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.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 ####################
-