Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19290
Modified Files:
root5-devel.info root5-devel.patch
Log Message:
New upstream version, switching to python 2.6, and using fink's libftgl instead
of the built-in one.
Index: root5-devel.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/root5-devel.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- root5-devel.info 14 Oct 2008 10:48:35 -0000 1.18
+++ root5-devel.info 3 Dec 2008 12:36:17 -0000 1.19
@@ -1,6 +1,6 @@
Info3: <<
Package: root5-devel%type_pkg[-cernlib]%type_pkg[-geant4]%type_pkg[-qt]
-Version: 5.21.04
+Version: 5.21.06
Revision: 11
Type: <<
-cernlib (boolean),
@@ -17,16 +17,17 @@
BuildDepends: <<
fink (>= 0.28),
x11-dev,
+ libftgl1,
libjpeg,
libpng3,
libtiff,
- libungif | giflib,
+ giflib (>= 4.1.6-1),
mysql15-dev (>= 5.0.16-1001) | mysql-ssl15-dev,
libxml2,
fftw3,
pcre,
gsl (>= 1.8),
- python25,
+ python26,
(%type_pkg[-geant4]) geant4.9 |
(%type_pkg[-geant4]) geant4.9-cernlib-gfortran |
(%type_pkg[-geant4]) geant4.9-cernlib-g77,
@@ -78,16 +79,16 @@
root5-devel-qt,
<<
Source: ftp://root.cern.ch/root/root_v%v.source.tar.gz
-Source-MD5: 7e70ef5f6f1237a98af747faebf95719
-Source2: http://www-d0.fnal.gov/~mommsen/fink/root_qtgui_20081014.tar.gz
-Source2-MD5: a62a108423fc48fdccdd6e4bc861cc2d
+Source-MD5: e7885d79342a6018edd3a084bd562639
+Source2: http://www-d0.fnal.gov/~mommsen/fink/root_qtgui_20081202.tar.gz
+Source2-MD5: 5f23e1e8b5d8139fc060bff3e410bd6a
SourceDirectory: root
PatchFile: %{ni}.patch
-PatchFile-MD5: c729df175d4397bb498739a78062ea63
+PatchFile-MD5: f40e13d78b43f577fab537f667071cae
PatchScript: <<
#!/bin/sh -ev
/usr/bin/sed "s:@PREFIX@:%p:" %{PatchFile} | /usr/bin/patch -p0
- /usr/bin/sed -i '.bak' "s:python -c:%p/bin/python2.5 -c:" configure
+ /usr/bin/sed -i '.bak' "s:python -c:%p/bin/python2.6 -c:" configure
/usr/bin/sed -i '.bak' "s:ruby -rrbconfig:/usr/bin/ruby -rrbconfig:" configure
/usr/bin/sed -i '.bak' "s:-Iinclude:-Iinclude -I/usr/X11R6/include:"
config/Makefile.in
/usr/bin/sed -i '.bak' "s/-lfreetype/\`freetype-config --libs\`/"
config/root-config.in
@@ -105,7 +106,7 @@
--with-fftw3-incdir=%p/include --with-fftw3-libdir=%p/lib \
--with-clhep-incdir=%p/include \
--disable-builtin-zlib --disable-builtin-pcre \
- --disable-builtin-freetype --enable-builtin_ftgl \
+ --disable-builtin-freetype --disable-builtin_ftgl \
--enable-soversion --enable-rpath \
--disable-afs \
--enable-roofit \
@@ -157,6 +158,7 @@
./stressFit Minuit2 || exit 2
./stressGeometry || exit 2
./stressGraphics || exit 2
+ ./stressHistogram || exit 2
./stressIterators || exit 2
./stressLinear || exit 2
./stressMathCore || exit 2
@@ -233,6 +235,9 @@
!%p/lib/root/libXrdOfs.dylib
!%p/lib/root/libXrdRootd.dylib
!%p/lib/root/libXrdSec.dylib
+ !%p/lib/root/libXrdSecgsi.dylib
+ !%p/lib/root/libXrdSecgsiGMAPLDAP.dylib
+ !%p/lib/root/libXrdSecsss.dylib
!%p/lib/root/libXrdSeckrb5.dylib
!%p/lib/root/libXrdSecpwd.dylib
!%p/lib/root/libXrdSecunix.dylib
@@ -275,10 +280,11 @@
<<
Depends: <<
x11-shlibs,
+ libftgl1-shlibs,
libjpeg-shlibs,
libpng3-shlibs,
libtiff-shlibs,
- giflib-shlibs | libungif-shlibs,
+ giflib-shlibs (>= 4.1.6-1),
mysql15-shlibs (>= 5.0.16-1001) | mysql-ssl15-shlibs,
libxml2-shlibs,
fftw3-shlibs,
@@ -314,8 +320,6 @@
lib/root/libEve.5.dylib
lib/root/libFFTW.5.21.dylib
lib/root/libFFTW.5.dylib
- lib/root/libFTGL.5.21.dylib
- lib/root/libFTGL.5.dylib
lib/root/libFitPanel.5.21.dylib
lib/root/libFitPanel.5.dylib
lib/root/libFoam.5.21.dylib
@@ -504,7 +508,6 @@
(%type_pkg[-cernlib]) %p/lib/root/libEGPythia8.5.dylib 5.0.0 %n
(>=5.19.04-1)
%p/lib/root/libEve.5.dylib 5.0.0 %n (>=5.17.06-1)
%p/lib/root/libFFTW.5.dylib 5.0.0 %n (>=5.11.02-1)
- %p/lib/root/libFTGL.5.dylib 5.0.0 %n (>=5.16.00-1)
%p/lib/root/libFitPanel.5.dylib 5.0.0 %n (>=5.13.06-1)
%p/lib/root/libFoam.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libFumili.5.dylib 5.0.0 %n (>=5.02.00-1)
Index: root5-devel.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/root5-devel.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- root5-devel.patch 14 Oct 2008 10:48:35 -0000 1.14
+++ root5-devel.patch 3 Dec 2008 12:36:17 -0000 1.15
@@ -1,8 +1,17 @@
Index: configure
===================================================================
---- configure (revision 25663)
+--- configure (revision 26467)
+++ configure (working copy)
-@@ -2839,21 +2839,21 @@
+@@ -1794,7 +1794,7 @@
+ result "ok"
+ ftglincdir=`pkg-config --cflags-only-I ftgl | sed 's/-I//g'`
+ ftgllibs=`pkg-config --libs-only-l ftgl`
+- ftgllibdir=`pkg-config --libs-only-L ftgl | sed 's/-L//g'`
++ ftgllibdir=`pkg-config --libs-only-L ftgl`
+ enable_builtin_ftgl=no
+ else
+ enable_builtin_ftgl=yes
+@@ -2845,21 +2845,21 @@
# for a system library, then see if we have various headers needed.
if test "x$enable_builtin_afterimage" = "xyes" ; then
check_header "jpeglib.h" "" $ASIMAGE $ASIMAGE/include \
@@ -28,7 +37,7 @@
asgifincdir=$found_dir
asextralib=""
-@@ -2871,7 +2871,7 @@
+@@ -2877,7 +2877,7 @@
fi
for k in $aslibs ; do
check_library $k "$enable_shared" "" \
@@ -39,37 +48,37 @@
found_dirz=$found_dir
Index: tutorials/pyroot/rootmarks.py
===================================================================
---- tutorials/pyroot/rootmarks.py (revision 25663)
+--- tutorials/pyroot/rootmarks.py (revision 26467)
+++ tutorials/pyroot/rootmarks.py (working copy)
@@ -2,7 +2,7 @@
# The ROOTMARK number printed is by reference to a Pentium IV 2.4 Ghz
# (with 512 MBytes memory and 120 GBytes IDE disk)
# taken by definition as 600 ROOTMARKS in batch mode in executing
-# python benchmarks.py
-+# python2.5 benchmarks.py
++# python2.6 benchmarks.py
#
import os
Index: tutorials/pyroot/demo.py
===================================================================
---- tutorials/pyroot/demo.py (revision 25663)
+--- tutorials/pyroot/demo.py (revision 26467)
+++ tutorials/pyroot/demo.py (working copy)
@@ -1,7 +1,7 @@
import os, sys
import ROOT
-# To run, do an "execfile( '<path-to>/demo.py' )" or "python
<path-to>/demo.py"
-+# To run, do an "execfile( '<path-to>/demo.py' )" or "python2.5
<path-to>/demo.py"
++# To run, do an "execfile( '<path-to>/demo.py' )" or "python2.6
<path-to>/demo.py"
# enable running from another directory than the one where demo.py resides
workdir = os.path.dirname( sys.argv[0] )
Index: core/base/src/TSystem.cxx
===================================================================
---- core/base/src/TSystem.cxx (revision 25663)
+--- core/base/src/TSystem.cxx (revision 26467)
+++ core/base/src/TSystem.cxx (working copy)
-@@ -29,6 +29,7 @@
- #include <stdlib.h>
+@@ -30,6 +30,7 @@
#include <errno.h>
+ #include <algorithm>
+#include "RConfigure.h"
#include "Riostream.h"
@@ -77,7 +86,7 @@
#include "TApplication.h"
Index: bindings/pyroot/Module.mk
===================================================================
---- bindings/pyroot/Module.mk (revision 25663)
+--- bindings/pyroot/Module.mk (revision 26467)
+++ bindings/pyroot/Module.mk (working copy)
@@ -3,6 +3,11 @@
#
@@ -86,7 +95,7 @@
+# Hack to link against fink's python
+PYTHONLIBDIR :=
+PYTHONLIB :=
-+PYROOTLIBDEPM := @PREFIX@/lib/python2.5/config/libpython2.5.dylib
++PYROOTLIBDEPM := @PREFIX@/lib/python2.6/config/libpython2.6.dylib
+
MODNAME := pyroot
MODDIR := bindings/$(MODNAME)
@@ -97,14 +106,14 @@
-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )'
-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )'
-+%.pyc: %.py; python2.5 -c 'import py_compile; py_compile.compile( "$<" )'
-+%.pyo: %.py; python2.5 -O -c 'import py_compile; py_compile.compile( "$<"
)'
++%.pyc: %.py; python2.6 -c 'import py_compile; py_compile.compile( "$<" )'
++%.pyo: %.py; python2.6 -O -c 'import py_compile; py_compile.compile( "$<"
)'
$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
$(ROOTLIBSDEP)
Index: cint/ROOT/cintdlls.mk
===================================================================
---- cint/ROOT/cintdlls.mk (revision 25663)
+--- cint/ROOT/cintdlls.mk (revision 26467)
+++ cint/ROOT/cintdlls.mk (working copy)
@@ -158,6 +158,11 @@
$(CINTDLLS): MAKELIB := $(subst -x,,$(MAKELIB))
@@ -120,45 +129,45 @@
$(CINTDLLDIRSTL)/%.dll: $(CINTDLLDIRDLLSTL)/G__cpp_%.o
Index: cint/reflex/python/genreflex/Makefile.am
===================================================================
---- cint/reflex/python/genreflex/Makefile.am (revision 25663)
+--- cint/reflex/python/genreflex/Makefile.am (revision 26467)
+++ cint/reflex/python/genreflex/Makefile.am (working copy)
@@ -23,11 +23,11 @@
if PLATFORM_IS_WINDOWS
SCRIPT_TXT_L1 = "@echo off"
-SCRIPT_TXT_L2 = "python $(pkgpyexecdir)/genreflex.py %*"
-+SCRIPT_TXT_L2 = "python2.5 $(pkgpyexecdir)/genreflex.py %*"
++SCRIPT_TXT_L2 = "python2.6 $(pkgpyexecdir)/genreflex.py %*"
SCRIPT_NAME = "$(bindir)/genreflex.bat"
else
SCRIPT_TXT_L1 = "\#!/bin/csh -f"
-SCRIPT_TXT_L2 = "python $(pkgpyexecdir)/genreflex.py $$""*"
-+SCRIPT_TXT_L2 = "python2.5 $(pkgpyexecdir)/genreflex.py $$""*"
++SCRIPT_TXT_L2 = "python2.6 $(pkgpyexecdir)/genreflex.py $$""*"
SCRIPT_NAME = "$(bindir)/genreflex"
endif
Index: cint/reflex/Module.mk
===================================================================
---- cint/reflex/Module.mk (revision 25663)
+--- cint/reflex/Module.mk (revision 26467)
+++ cint/reflex/Module.mk (working copy)
@@ -119,7 +119,7 @@
cp $< $@
$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
- @python -c 'import py_compile; py_compile.compile( "$<" )'
-+ @python2.5 -c 'import py_compile; py_compile.compile( "$<" )'
++ @python2.6 -c 'import py_compile; py_compile.compile( "$<" )'
$(RFLX_GENMAPO) : $(RFLX_GENMAPS)
$(CXX) $(OPT) $(CXXFLAGS) -Iinclude -I$(REFLEXDIRS)/genmap -c $<
$(CXXOUT)$@
Index: cint/cintex/Module.mk
===================================================================
---- cint/cintex/Module.mk (revision 25663)
+--- cint/cintex/Module.mk (revision 26467)
+++ cint/cintex/Module.mk (working copy)
@@ -66,7 +66,7 @@
endif
endif
-GENREFLEX_CMD2 = python ../../../../lib/python/genreflex/genreflex.py
-+GENREFLEX_CMD2 = python2.5 ../../../../lib/python/genreflex/genreflex.py
++GENREFLEX_CMD2 = python2.6 ../../../../lib/python/genreflex/genreflex.py
CINTEXTESTD = $(CINTEXDIR)/test
CINTEXTESTDICTD = $(CINTEXTESTD)/dict
@@ -168,14 +177,14 @@
-%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )'
-%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )'
-+%.pyc: %.py; python2.5 -c 'import py_compile; py_compile.compile( "$<" )'
-+%.pyo: %.py; python2.5 -O -c 'import py_compile; py_compile.compile( "$<"
)'
++%.pyc: %.py; python2.6 -c 'import py_compile; py_compile.compile( "$<" )'
++%.pyo: %.py; python2.6 -O -c 'import py_compile; py_compile.compile( "$<"
)'
$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
$(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
Index: Makefile
===================================================================
---- Makefile (revision 25663)
+--- Makefile (revision 26467)
+++ Makefile (working copy)
@@ -174,7 +174,7 @@
MODULES += graf2d/qt gui/qtroot
@@ -197,7 +206,7 @@
cint/cint7 roofit/roofitcore roofit/roofit roofit/roostats \
Index: net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile
===================================================================
---- net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile (revision 25663)
+--- net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile (revision 26467)
+++ net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile (working copy)
@@ -88,7 +88,7 @@
$(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP)
@@ -210,7 +219,7 @@
fi
Index: net/xrootd/src/xrootd/src/XrdClient/GNUmakefile
===================================================================
---- net/xrootd/src/xrootd/src/XrdClient/GNUmakefile (revision 25663)
+--- net/xrootd/src/xrootd/src/XrdClient/GNUmakefile (revision 26467)
+++ net/xrootd/src/xrootd/src/XrdClient/GNUmakefile (working copy)
@@ -155,7 +155,7 @@
@echo Creating shared library $(LIBSHARED)
@@ -223,7 +232,7 @@
fi
Index: net/xrootd/src/xrootd/config/GNUmake.rules.macos
===================================================================
---- net/xrootd/src/xrootd/config/GNUmake.rules.macos (revision 25663)
+--- net/xrootd/src/xrootd/config/GNUmake.rules.macos (revision 26467)
+++ net/xrootd/src/xrootd/config/GNUmake.rules.macos (working copy)
@@ -20,11 +20,11 @@
TYPELINK = -undefined dynamic_lookup -multiply_defined suppress
@@ -242,7 +251,7 @@
TYPELDDY = $(TYPELINK) -dynamiclib -single_module
Index: net/xrootd/Module.mk
===================================================================
---- net/xrootd/Module.mk (revision 25663)
+--- net/xrootd/Module.mk (revision 26467)
+++ net/xrootd/Module.mk (working copy)
@@ -29,7 +29,7 @@
endif
@@ -255,7 +264,7 @@
endif
Index: build/unix/makelib.sh
===================================================================
---- build/unix/makelib.sh (revision 25663)
+--- build/unix/makelib.sh (revision 26467)
+++ build/unix/makelib.sh (working copy)
@@ -34,7 +34,7 @@
if [ $PLATFORM = "macosx" ]; then
@@ -266,7 +275,7 @@
else
soext="dylib"
fi
-@@ -209,7 +209,7 @@
+@@ -210,7 +210,7 @@
ln -fs $SONAME.$MAJOR $LIB
elif [ -f $LIBVERS ]; then
# Versioned library has format foo.3.05.so
@@ -277,17 +286,17 @@
LIBNOMINOR=`echo $LIB|sed 's,\.'$MINOR',,'`
Index: config/genreflex-rootcint.in
===================================================================
---- config/genreflex-rootcint.in (revision 25663)
+--- config/genreflex-rootcint.in (revision 26467)
+++ config/genreflex-rootcint.in (working copy)
@@ -1,2 +1,2 @@
#!/bin/sh
-python @libdir@/python/genreflex/genreflex-rootcint.py "$@"
-+python2.5 @libdir@/python/genreflex/genreflex-rootcint.py "$@"
++python2.6 @libdir@/python/genreflex/genreflex-rootcint.py "$@"
Index: config/rootrc.in
===================================================================
---- config/rootrc.in (revision 25663)
+--- config/rootrc.in (revision 26467)
+++ config/rootrc.in (working copy)
-@@ -512,3 +512,7 @@
+@@ -519,3 +519,7 @@
# This overrides the default specified above for a generic application.
# Color 5 is yellow.
Rint.Canvas.HighLightColor: 5
@@ -297,7 +306,7 @@
++Plugin.TGuiFactory: qt TQtRootGuiFactory QtRoot
"TQtRootGuiFactory()"
Index: config/Makefile.macosx64
===================================================================
---- config/Makefile.macosx64 (revision 25663)
+--- config/Makefile.macosx64 (revision 26467)
+++ config/Makefile.macosx64 (working copy)
@@ -74,7 +74,7 @@
endif
@@ -325,15 +334,15 @@
endif
Index: config/genreflex.in
===================================================================
---- config/genreflex.in (revision 25663)
+--- config/genreflex.in (revision 26467)
+++ config/genreflex.in (working copy)
@@ -1,2 +1,2 @@
#!/bin/sh
-python @libdir@/python/genreflex/genreflex.py "$@"
-+python2.5 @libdir@/python/genreflex/genreflex.py "$@"
++python2.6 @libdir@/python/genreflex/genreflex.py "$@"
Index: config/Makefile.macosx
===================================================================
---- config/Makefile.macosx (revision 25663)
+--- config/Makefile.macosx (revision 26467)
+++ config/Makefile.macosx (working copy)
@@ -89,7 +89,7 @@
endif
@@ -360,7 +369,7 @@
Index: config/Makefile.depend
===================================================================
---- config/Makefile.depend (revision 25663)
+--- config/Makefile.depend (revision 26467)
+++ config/Makefile.depend (working copy)
@@ -83,6 +83,7 @@
KRB5AUTHLIBDEPM = $(RAUTHLIB) $(NETLIB)
@@ -370,15 +379,15 @@
FITPANELLIBDEPM = $(GUILIB) $(GPADLIB) $(HISTLIB) $(GRAFLIB)
$(TREELIB) \
$(MATHCORELIB)
RFIOLIBDEPM = $(IOLIB)
-@@ -174,6 +175,7 @@
+@@ -177,6 +178,7 @@
KRB5AUTHLIBDEP = $(KRB5AUTHLIBDEPM)
SRVAUTHLIBDEP = $(SRVAUTHLIBDEPM)
QTGSILIBDEP = $(QTGSILIBDEPM)
+QTGUILIBDEP = $(QTGUILIBDEPM)
FITPANELLIBDEP = $(FITPANELLIBDEPM)
RFIOLIBDEP = $(RFIOLIBDEPM)
- SQLLIBDEP = $(SQLLIBDEPM)
-@@ -337,98 +339,111 @@
+ DCACHELIBDEP = $(DCACHELIBDEPM)
+@@ -347,101 +349,116 @@
MATRIXLIBEXTRA = -Llib -lMathCore
HISTLIBEXTRA = -Llib -lMatrix -lMathCore
GRAFLIBEXTRA = -Llib -lHist -lMatrix -lRIO -lMathCore
@@ -506,11 +515,11 @@
ROOFITCORELIBEXTRA = -Llib -lHist -lGraf -lMatrix -lTree -lMinuit -lRIO \
- -lMathCore
-ROOFITLIBEXTRA = -Llib -lRooFitCore -lTree -lRIO -lMatrix -lMathCore
--ROOSTATSLIBEXTRA = -Llib -lRooFit -lRooFitCore -lTree -lRIO -lMatrix \
-- -lHist -lMathCore
+ -lMathCore -lNet -lThread
+ROOFITLIBEXTRA = -Llib -lRooFitCore -lTree -lRIO -lMatrix \
+ -lHist -lMathCore -lGraf -lMinuit -lNet -lThread
+ ROOSTATSLIBEXTRA = -Llib -lRooFit -lRooFitCore -lTree -lRIO -lMatrix \
+ -lHist -lMathCore -lGraf -lGpad
CINT7LIBEXTRA = -Llib -lReflex
CINTEXLIBEXTRA = -Llib -lReflex
REFLEXDICTLIBEXTRA = -Llib -lReflex
@@ -527,6 +536,9 @@
+FITPANELLIBEXTRA = -Llib -lGui -lGpad -lHist -lGraf -lTree -lMathCore
-lRIO \
+ -lMatrix -lNet -lThread
RFIOLIBEXTRA = -Llib -lRIO
+ DCACHELIBEXTRA = -Llib -lRIO
+ CHIRPLIBEXTRA = -Llib -lRIO
+ GFALLIBEXTRA = -Llib -lRIO
-SQLLIBEXTRA = -Llib -lNet -lRIO
-ODBCLIBEXTRA = -Llib -lNet -lRIO
-NETXLIBEXTRA = -Llib -lNet -lRIO -lThread
@@ -554,21 +566,21 @@
RECLIBEXTRA = -Llib -lGui -lRIO -lTree -lThread
Index: tmva/test/TMVAnalysis.py
===================================================================
---- tmva/test/TMVAnalysis.py (revision 25663)
+--- tmva/test/TMVAnalysis.py (revision 26467)
+++ tmva/test/TMVAnalysis.py (working copy)
@@ -15,13 +15,13 @@
# The methods to be used can be switched on and off via the prompt command,
for #
# example:
#
#
#
-# python TMVAnalysis.py --methods Fisher,Likelihood
#
-+# python2.5 TMVAnalysis.py --methods Fisher,Likelihood
#
++# python2.6 TMVAnalysis.py --methods Fisher,Likelihood
#
#
#
# The output file "TMVA.root" can be analysed with the use of dedicated
#
# macros (simply say: root -l <../macros/macro.C>), which can be conveniently
#
# invoked through a GUI that will appear at the end of the run of this macro.
#
#
#
-# for help type "python TMVAnalysis.py --help"
#
-+# for help type "python2.5 TMVAnalysis.py --help"
#
++# for help type "python2.6 TMVAnalysis.py --help"
#
#
------------------------------------------------------------------------------ #
# --------------------------------------------
@@ -577,20 +589,20 @@
def usage():
print " "
- print "Usage: python %s [options]" % sys.argv[0]
-+ print "Usage: python2.5 %s [options]" % sys.argv[0]
++ print "Usage: python2.6 %s [options]" % sys.argv[0]
print " -m | --methods : gives methods to be run (default: all
methods)"
print " -i | --inputfile : name of input ROOT file (default: '%s')" %
DEFAULT_INFNAME
print " -o | --outputfile : name of output ROOT file containing results
(default: '%s')" % DEFAULT_OUTFNAME
Index: tmva/test/TMVApplication.py
===================================================================
---- tmva/test/TMVApplication.py (revision 25663)
+--- tmva/test/TMVApplication.py (revision 26467)
+++ tmva/test/TMVApplication.py (working copy)
@@ -8,7 +8,7 @@
# This macro provides a simple example on how to use the trained classifiers
#
# within an analysis module
#
#
#
-# for help type "python TMVApplication.py --help"
#
-+# for help type "python2.5 TMVApplication.py --help"
#
++# for help type "python2.6 TMVApplication.py --help"
#
#
------------------------------------------------------------------------------ #
# --------------------------------------------
@@ -599,240 +611,7 @@
def usage():
print " "
- print "Usage: python %s [options]" % sys.argv[0]
-+ print "Usage: python2.5 %s [options]" % sys.argv[0]
++ print "Usage: python2.6 %s [options]" % sys.argv[0]
print " -m | --methods : gives methods to be run (default: all
methods)"
print " -i | --inputfile : name of input ROOT file (default: '%s')" %
DEFAULT_INFNAME
print " -o | --outputfile : name of output ROOT file containing results
(default: '%s')" % DEFAULT_OUTFNAME
---- graf2d/qt/src/TGQt.cxx 2008-10-02 13:06:15.000000000 +0200
-+++ graf2d/qt/src/TGQt.cxx 2008-10-14 11:32:15.000000000 +0200
-@@ -157,37 +159,63 @@
- // class TQtFeedBackWidget to back the TCanvas FeedBack mode
-
//______________________________________________________________________________
- class TQtFeedBackWidget : public QFrame {
-+ // QPixmap is much faster then QImage but X11 doesn't accept QPixmap yet.
VF
-+#ifdef R__WIN32
- QPixmap *fPixBuffer;
-+#else
-+ QImage *fPixBuffer;
-+#endif
-+ bool fFirst;
-+ QPixmap *fGrabBuffer;
- protected:
- virtual void paintEvent(QPaintEvent *event) {
- if (fPixBuffer) {
- QRect rect = event->rect();
-- {
-+ {
- QPainter p(this);
- p.setClipRect(rect);
-- p.drawPixmap(0,0,*fPixBuffer);
-- }
-+#ifdef R__WIN32
-+ p.drawPixmap(0,0,*fPixBuffer);
-+#else
-+ p.drawImage(0,0,*fPixBuffer);
-+#endif
-+ }
- ClearBuffer();
-- } else {
-- QFrame::paintEvent(event);
-+ } else if (fGrabBuffer) {
-+ QRect rect = event->rect();
-+ QPainter p(this);
-+ p.setClipRect(rect);
-+ p.drawPixmap(rect,*fGrabBuffer);
- }
-+ QFrame::paintEvent(event);
- }
- public:
-- TQtFeedBackWidget(QWidget *parent=0, Qt::WindowFlags f=0) :
QFrame(parent,f),fPixBuffer(0)
-- {
-+ TQtFeedBackWidget(QWidget *parent=0, Qt::WindowFlags f=0) :
QFrame(parent,f)
-+ ,fPixBuffer(0),fFirst(true),fGrabBuffer(0)
-+ {
-+// TQtFeedBackWidget(QWidget *parent=0, Qt::WindowFlags
f=Qt::WStyle_StaysOnTop | Qt::WStyle_Customize | Qt::WStyle_NoBorder |
Qt::WStyle_Tool | Qt::WX11BypassWM)
-+ // Create the feedback widget
- setAttribute(Qt::WA_NoSystemBackground);
-+ setDisabled(true);
- setBackgroundRole(QPalette::Window);
- setAutoFillBackground(false);
- QPalette p = palette();
- p.setBrush(QPalette::Window, Qt::transparent);
- setPalette(p);
- }
-- virtual ~TQtFeedBackWidget() {delete fPixBuffer; fPixBuffer = 0;}
-- void hide() {
-+ virtual ~TQtFeedBackWidget()
-+ {
- delete fPixBuffer; fPixBuffer = 0;
-+ delete fGrabBuffer; fGrabBuffer = 0;
-+ }
-+ void hide() {
-+ // hide the feedback widget and remove the buffer
-+ delete fPixBuffer; fPixBuffer = 0;
-+ delete fGrabBuffer; fGrabBuffer = 0;
- QFrame::hide();
- }
-- QPixmap *PixBuffer() {
-+ QPaintDevice *PixBuffer() {
-+ // Create the feedback buffer if needed
- QWidget *canvasWidget = parentWidget();
- if (canvasWidget ) {
- // resize the feedback
-@@ -195,32 +223,63 @@
- setGeometry(QRect(QPoint(0,0),canvasSize));
- if ( !fPixBuffer || (fPixBuffer->size() != canvasSize) ) {
- delete fPixBuffer;
-- fPixBuffer = new QPixmap(canvasSize);
-+#ifdef R__WIN32
-+ fPixBuffer = new QPixmap(canvasSize);
-+#else
-+ fPixBuffer = new
QImage(canvasSize,QImage::Format_ARGB32_Premultiplied);
-+#endif
- ClearBuffer();
- }
- }
- return fPixBuffer;
- }
-- void ClearBuffer() {
-+ QPaintDevice *GrabBuffer(QSize &s) {
-+ // Create the feedback buffer to grab the parent TPad image
-+ QWidget *canvasWidget = parentWidget();
-+ if (canvasWidget ) {
-+ // resize the feedback
-+ if ( !fPixBuffer || (fPixBuffer->size() != s) ) {
-+ delete fPixBuffer;
-+#ifdef R__WIN32
-+ fPixBuffer = new QPixmap(s);
-+#else
-+ fPixBuffer = new QImage(s,QImage::Format_ARGB32_Premultiplied);
-+#endif
-+ ClearBuffer();
-+ }
-+ }
-+ return fPixBuffer;
-+ }
-+ void ClearBuffer() {
-+ // Fill the feedback buffer with the transparent background
- #ifdef R__WIN32
- fPixBuffer->fill(Qt::transparent);
- #else
- // X11 workaround. I did not find the good solution yet.
-- QColor q(Qt::lightGray);
-- QPainter p(fPixBuffer);
-- p.fillRect(0,0,fPixBuffer->width()-1, fPixBuffer->height()-1,q);
-+ fPixBuffer->fill(0);
-+ fFirst = true;
- #endif
- }
-- void SetGeometry(int x1,int y2,int w, int h)
-+ void SetGeometry(int x,int y, int w, int h, TQtWidget *src=0)
- {
-- // Set the feedback widget postion and geometry
-- if (isHidden() ) {
-+ // Set the feedback widget position and geometry
-+ if (isHidden() && src ) {
- // grab the parent window and move the feedback
-- // To be done yet !!!
-+ delete fGrabBuffer; fGrabBuffer = 0;
-+ QPixmap *canvas = src->GetOffScreenBuffer();
-+ if (canvas && w > 4 && h > 4 ) {
-+ fGrabBuffer = new QPixmap(canvas->copy(x,y,w,h));
-+ }
- }
-- setGeometry(x1,y2,w, h);
-+ setGeometry(x,y,w,h);
- }
--
-+#ifndef R__WIN32
-+ bool IsFirst() {
-+ bool c = fFirst;
-+ fFirst = false;
-+ return c;
-+ }
-+#endif
- };
-
-
//______________________________________________________________________________
-@@ -240,8 +299,12 @@
- // Save the current painter
- fSavePainter = fGQt->fQPainter;
- fGQt->fQPainter = &fFeedBackPainter;
-- fFeedBackPainter.begin(fGQt->fFeedBackWidget->PixBuffer());
-- fFeedBackPainter.setPen(Qt::darkGray);
-+ fFeedBackPainter.begin(fGQt->fFeedBackWidget->PixBuffer());
-+#ifndef R__WIN32
-+ if (!fGQt->fFeedBackWidget->IsFirst() )
-+
fFeedBackPainter.setCompositionMode(QPainter::CompositionMode_Xor);
-+#endif
-+ fFeedBackPainter.setPen(QColor(128,128,128,128));// Qt::white);//
darkGray);
- fGQt->fFeedBackWidget->show();
- }
- }
-@@ -252,6 +315,10 @@
- fFeedBackPainter.end();
- fGQt->fQPainter = fSavePainter;
- fGQt->fFeedBackWidget->update();
-+#ifndef R__WIN32
-+ // X11 needs "repaint" operation to be forced by some reason
-+// QCoreApplication::processEvents(QEventLoop::ExcludeUserInput |
QEventLoop::ExcludeSocketNotifiers, 200);
-+#endif
- }
- }
- };
-@@ -972,7 +992,10 @@
- if (qtdirHandle) {
- TString incpath = " -I"; incpath+=qtdir;
- while(const char *nextQtInclude =
gSystem->GetDirEntry(qtdirHandle)) {
-- incpath += " -I"; incpath+=qtdir; incpath+=nextQtInclude;
-+ // Skip the hidden directories including the current "." and
parent ".."
-+ if (nextQtInclude[0] != '.') {
-+ incpath += " -I"; incpath+=qtdir; incpath+=nextQtInclude;
-+ }
- }
- gSystem->FreeDirectory(qtdirHandle);
- gSystem->AddIncludePath((const char*)incpath);
-@@ -1214,7 +1224,6 @@
- if (fSelectedWindow->devType() == QInternal::Widget) {
- TQtWidget *canvasWidget = dynamic_cast<TQtWidget *>(fSelectedWindow);
- if (canvasWidget) {
-- canvasWidget->setDisabled(true);
- canvasWidget->ResetCanvas();
- }
- QWidget *wrapper = 0;
-@@ -1360,7 +1369,7 @@
- #endif
- TQtLock lock;
- if ( (fSelectedWindow->devType() == QInternal::Widget) && fFeedBackMode
&& fFeedBackWidget) {
-- fFeedBackWidget->SetGeometry(x1,y2,x2-x1,y1-y2);
-+ fFeedBackWidget->SetGeometry(x1,y2,x2-x1,y1-y2,(TQtWidget
*)fSelectedWindow);
- if (fFeedBackWidget->isHidden() ) fFeedBackWidget->show();
- return;
- }
-@@ -2756,23 +2750,10 @@
-
- if (fSelectedWindow && mode != 2 ) {
- ((TQtWidget *)fSelectedWindow)->paintFlag();
--#if 1
- ((TQtWidget *)fSelectedWindow)->repaint();
--
-- //bool hasBufferOn = w->IsDoubleBuffered();
-- //if (hasBufferOn) w->SetDoubleBuffer(FALSE);
-- //Begin();End();
-- //((TQtWidget *)fSelectedWindow)->repaint();
-- //if (hasBufferOn) w->SetDoubleBuffer(TRUE);
--#else
--// ((TQtWidget *)fSelectedWindow)->update();
-- End();
-- TQtWidget *w = (TQtWidget *)fSelectedWindow;
-- bool hasBufferOn = w->IsDoubleBuffered();
-- if (hasBufferOn) w->SetDoubleBuffer(FALSE);
-- Begin();End();
-- ((TQtWidget *)fSelectedWindow)->repaint();
-- if (hasBufferOn) w->SetDoubleBuffer(TRUE);
-+#ifndef R__WIN32
-+ // X11 needs "repaint" operation to be forced by some reason
-+ QCoreApplication::processEvents(QEventLoop::ExcludeUserInput |
QEventLoop::ExcludeSocketNotifiers, 200);
- #endif
- }
- }
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
