File tree Expand file tree Collapse file tree 4 files changed +43
-10
lines changed Expand file tree Collapse file tree 4 files changed +43
-10
lines changed Original file line number Diff line number Diff line change 11pkgbase = root
22 pkgdesc = C++ data analysis framework and interpreter from CERN with extra features enabled.
3- pkgver = 6.08.00
4- pkgrel = 3
3+ pkgver = 6.08.02
4+ pkgrel = 1
55 url = http://root.cern.ch
6+ install = root.install
67 arch = i686
78 arch = x86_64
89 license = LGPL2.1
@@ -28,17 +29,20 @@ pkgbase = root
2829 depends = unuran
2930 depends = xmlrpc-c
3031 depends = xrootd-abi0
32+ optdepends = blas: Optional extensions to TMVA
3133 optdepends = gcc-fortran: Enable the Fortran components of ROOT
3234 optdepends = tcsh: Legacy CSH support
3335 options = !emptydirs
34- source = https://root.cern.ch/download/root_v6.08.00 .source.tar.gz
36+ source = https://root.cern.ch/download/root_v6.08.02 .source.tar.gz
3537 source = JupyROOT_fix.patch
38+ source = root.install
3639 source = root.sh
3740 source = root.xml
3841 source = rootd
3942 source = settings.cmake
40- sha256sums = 388b4158c6e5706418031060c52c4e6b89cd8856ba06bf11c550eeb1759615d9
43+ sha256sums = 131c50a81e72a1cd2b2825c66dbe3916c23b28006e84f5a028baed4c72d86014
4144 sha256sums = a17309295f998ed826dcbf1b5d04de7ed44d64c35221806c75b775796578783d
45+ sha256sums = f1796729b0403026382bca43329692f5356c8ec46fc2c09f799a8b3d12d49a6f
4246 sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
4347 sha256sums = b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32
4448 sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
Original file line number Diff line number Diff line change 1+ diff -aur root-6.08.00_old/bindings/pyroot/JupyROOT/utils.py root-6.08.00/bindings/pyroot/JupyROOT/utils.py
2+ --- root-6.08.00_old/bindings/pyroot/JupyROOT/utils.py 2016-11-17 09:04:38.877776779 +0000
3+ +++ root-6.08.00/bindings/pyroot/JupyROOT/utils.py 2016-11-17 09:09:08.511122309 +0000
4+ @@ -289,8 +289,8 @@
5+ out = self.ioHandler.GetStdout()
6+ err = self.ioHandler.GetStderr()
7+ if not transformers:
8+ - self.nbOutStream.write(out)
9+ - self.nbErrStream.write(err)
10+ + self.nbOutStream.write(out.decode(sys.stdout.encoding))
11+ + self.nbErrStream.write(err.decode(sys.stderr.encoding))
12+ else:
13+ for t in transformers:
14+ (out, err, otype) = t(out, err)
Original file line number Diff line number Diff line change 55# Contributor: Sebastian Voecking < voeck at web dot de >
66
77pkgname=root
8- pkgver=6.08.00
9- pkgrel=3
8+ pkgver=6.08.02
9+ pkgrel=1
1010pkgdesc=' C++ data analysis framework and interpreter from CERN with extra features enabled.'
1111arch=(' i686' ' x86_64' )
1212url=' http://root.cern.ch'
@@ -34,27 +34,32 @@ depends=('cfitsio'
3434' xmlrpc-c'
3535' xrootd-abi0'
3636)
37- optdepends=(' gcc-fortran: Enable the Fortran components of ROOT'
37+ optdepends=(' blas: Optional extensions to TMVA'
38+ ' gcc-fortran: Enable the Fortran components of ROOT'
3839 ' tcsh: Legacy CSH support'
3940)
4041options=(' !emptydirs' )
42+ install=root.install
4143source=(" https://root.cern.ch/download/root_v${pkgver} .source.tar.gz"
4244' JupyROOT_fix.patch'
45+ ' root.install'
4346' root.sh'
4447' root.xml'
4548' rootd'
4649' settings.cmake' )
47- sha256sums=(' 388b4158c6e5706418031060c52c4e6b89cd8856ba06bf11c550eeb1759615d9 '
50+ sha256sums=(' 131c50a81e72a1cd2b2825c66dbe3916c23b28006e84f5a028baed4c72d86014 '
4851 ' a17309295f998ed826dcbf1b5d04de7ed44d64c35221806c75b775796578783d'
52+ ' f1796729b0403026382bca43329692f5356c8ec46fc2c09f799a8b3d12d49a6f'
4953 ' 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
5054 ' b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32'
5155 ' 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
5256 ' 40503aebd8a0ab5380a24d69145cf7d93d483d4d9330e4c23fb04e55c9ed2caf' )
5357prepare (){
5458 cd ${pkgname} -${pkgver}
5559
56- # Fix JupyROOT inheritance
57- patch -p1 -i ${srcdir} /JupyROOT_fix.patch
60+ # Fix JupyROOT issues until upstream releases arrive
61+ # patch -p1 -i ${srcdir}/JupyROOT_fix.patch
62+ # patch -p1 -i ${srcdir}/JupyROOT_encoding.patch
5863
5964 2to3 -w etc/dictpch/makepch.py 2>&1 > /dev/null
6065}
Original file line number Diff line number Diff line change 1+ post_install () {
2+ echo "Optional packages/features will only be activated"
3+ echo "if the optional dependencies are installed before"
4+ echo "the package compilation has started. Please reco-"
5+ echo "mpile as needed."
6+ }
7+
8+ post_upgrade () {
9+ post_install
10+ }
You can’t perform that action at this time.
0 commit comments