Skip to content

Commit

Permalink
updated to latest 6.08.00 with many new fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kgizdov committed Nov 15, 2016
1 parent 8a2e72e commit 6c277f6
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 144 deletions.
21 changes: 9 additions & 12 deletions .SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = root
pkgdesc = C++ data analysis framework and interpreter from CERN.
pkgver = 6.06.08
pkgdesc = C++ data analysis framework and interpreter from CERN with extra features enabled.
pkgver = 6.08.00
pkgrel = 2
url = http://root.cern.ch
arch = i686
Expand All @@ -10,6 +10,7 @@ pkgbase = root
depends = cfitsio
depends = fftw
depends = ftgl
depends = gl2ps
depends = glew
depends = graphviz
depends = gsl
Expand All @@ -19,31 +20,27 @@ pkgbase = root
depends = libiodbc
depends = libmysqlclient
depends = postgresql-libs
depends = pythia
depends = pythia8
depends = python
depends = sqlite
depends = tex-gyre-fonts
depends = unixodbc
depends = unuran
depends = xmlrpc-c
depends = xrootd-abi0
optdepends = gcc-fortran: Enable the Fortran components of ROOT
optdepends = tcsh: Legacy CSH support
options = !emptydirs
source = https://root.cern.ch/download/root_v6.06.08.source.tar.gz
source = call_PyErr_Clear_if_no_such_attribute.patch
source = disable-gcc-abi-check.diff
source = python3.diff
source = https://root.cern.ch/download/root_v6.08.00.source.tar.gz
source = root.sh
source = root.xml
source = rootd
source = settings.cmake
sha256sums = 7cb836282014cce822ef589cad27811eb7a86d7fad45a871fa6b0e6319ec201a
sha256sums = 437ed0fb2c46d5ca8e37cc689f87dfe12429f6a243d4e5cf2d395a177de7e90f
sha256sums = e03fff4accf7cee4e7329b305f1e0df7bf804dbced08d52566af789bc77ea0b0
sha256sums = d566bc44f0df1915ac81c41b8ef7eff0d9fec8728533b00b9e654a2a4eff9af1
sha256sums = 388b4158c6e5706418031060c52c4e6b89cd8856ba06bf11c550eeb1759615d9
sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
sha256sums = b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32
sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
sha256sums = 55be51afce766acca6ddd8123518af47a5d43c826233a2267c2404b68b662aee
sha256sums = e5e236ab8ec21136d97d696648ce8f2448b196f40a2f90bbfd450bc186df94c2

pkgname = root

59 changes: 23 additions & 36 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,81 +1,65 @@
# Maintainer: Konstantin Gizdov <kgizdov@gmail.com>
# Contributor: Frank Siegert <frank.siegert@googlemail.com>
# Contributor: Scott Lawrence <bytbox@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Sebastian Voecking <voeck@web.de>
# Maintainer: Konstantin Gizdov < kgizdov at gmail dot com >
# Contributor: Frank Siegert < frank.siegert at googlemail dot com >
# Contributor: Scott Lawrence < bytbox at gmail dot com >
# Contributor: Thomas Dziedzic < gostrc at gmail dot com >
# Contributor: Sebastian Voecking < voeck at web dot de >

pkgname=root
pkgver=6.06.08
pkgver=6.08.00
pkgrel=2
pkgdesc='C++ data analysis framework and interpreter from CERN.'
pkgdesc='C++ data analysis framework and interpreter from CERN with extra features enabled.'
arch=('i686' 'x86_64')
url='http://root.cern.ch'
license=('LGPL2.1')
makedepends=('cmake')
depends=('cfitsio' # for /usr/include/fitsio2.h and for /usr/lib/libcfitsio.so -- for fitsio=ON
depends=('cfitsio'
'fftw'
'ftgl' # also includes libgl, mesa, libldap
# 'gcc-fortran' # not needed
# 'giflib' # already included
'ftgl'
'gl2ps'
'glew'
'graphviz' # also includes giflib, for /usr/include/graphviz/gvc.h and for /usr/lib/libgvc.so -- for gviz=ON
'graphviz'
'gsl'
'hicolor-icon-theme'
'intel-tbb' # unlisted optional dependency -- for builtin_tbb=OFF and tbb=ON
'libafterimage' # for asimage=ON
# 'libgl' # already included for /usr/include/GL/gl.h and for /usr/lib/libGL.so -- for opengl=ON
'intel-tbb'
'libafterimage'
'libiodbc'
# 'libldap' # already included, for /usr/include/ldap.h and for /usr/lib/libldap.so -- for ldap=ON
'libmysqlclient'
# 'llvm' # for builtin_llvm=OFF, but currently not possible
'postgresql-libs'
'pythia' # for pythia8=ON
'pythia8'
'python'
'sqlite'
'tex-gyre-fonts' # nicer substitution as per Arch Wiki
'tex-gyre-fonts' # solve the pixelized font problem as per Arch Wiki
'unixodbc'
'unuran'
'xmlrpc-c'
'xrootd-abi0'
)
optdepends=('gcc-fortran: Enable the Fortran components of ROOT'
'tcsh: Legacy CSH support'
)
options=('!emptydirs')
source=("https://root.cern.ch/download/root_v${pkgver}.source.tar.gz"
'call_PyErr_Clear_if_no_such_attribute.patch'
'disable-gcc-abi-check.diff'
'python3.diff'
'root.sh'
'root.xml'
'rootd'
'settings.cmake')
sha256sums=('7cb836282014cce822ef589cad27811eb7a86d7fad45a871fa6b0e6319ec201a'
'437ed0fb2c46d5ca8e37cc689f87dfe12429f6a243d4e5cf2d395a177de7e90f'
'e03fff4accf7cee4e7329b305f1e0df7bf804dbced08d52566af789bc77ea0b0'
'd566bc44f0df1915ac81c41b8ef7eff0d9fec8728533b00b9e654a2a4eff9af1'
sha256sums=('388b4158c6e5706418031060c52c4e6b89cd8856ba06bf11c550eeb1759615d9'
'9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
'b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32'
'3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
'55be51afce766acca6ddd8123518af47a5d43c826233a2267c2404b68b662aee')
'e5e236ab8ec21136d97d696648ce8f2448b196f40a2f90bbfd450bc186df94c2')
prepare(){
## https://sft.its.cern.ch/jira/browse/ROOT-6924
cd ${pkgname}-${pkgver}

patch -p1 < ${srcdir}/python3.diff
2to3 -w etc/dictpch/makepch.py 2>&1 > /dev/null

## https://sft.its.cern.ch/jira/browse/ROOT-7640
patch -p1 < ${srcdir}/call_PyErr_Clear_if_no_such_attribute.patch

## disable check newly introduced in 6.06.06
patch -p1 < ${srcdir}/disable-gcc-abi-check.diff
}

build() {
[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
cd ${srcdir}/build

CFLAGS="${CFLAGS} -pthread" \
CXXFLAGS="${CXXFLAGS} -pthread -D_GLIBCXX_USE_CXX11_ABI=0" \
CXXFLAGS="${CXXFLAGS} -pthread" \
LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \
cmake -C ${srcdir}/settings.cmake ${srcdir}/${pkgname}-${pkgver}

Expand All @@ -99,6 +83,9 @@ package() {
# replace @prefix@ with /usr for the desktop
sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop

# fix python env call
sed -e 's/@python@/python/' -i ${pkgdir}/usr/lib/root/cmdLineUtils.py

install -D -m644 ${srcdir}/${pkgname}-${pkgver}/build/package/debian/root-system-bin.png \
${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png

Expand Down
16 changes: 0 additions & 16 deletions call_PyErr_Clear_if_no_such_attribute.patch

This file was deleted.

19 changes: 0 additions & 19 deletions disable-gcc-abi-check.diff

This file was deleted.

10 changes: 0 additions & 10 deletions param.diff

This file was deleted.

33 changes: 0 additions & 33 deletions python3.diff

This file was deleted.

18 changes: 0 additions & 18 deletions remove_explicit_csh_call.diff

This file was deleted.

6 changes: 6 additions & 0 deletions settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ set (asimage ON CACHE BOOL "" FORCE)
set (builtin_afterimage OFF CACHE BOOL "" FORCE)
set (builtin_ftgl OFF CACHE BOOL "" FORCE)
set (builtin_freetype OFF CACHE BOOL "" FORCE)
set (builtin_gl2ps OFF CACHE BOOL "" FORCE)
set (builtin_glew OFF CACHE BOOL "" FORCE)
set (builtin_pcre OFF CACHE BOOL "" FORCE)
set (builtin_zlib OFF CACHE BOOL "" FORCE)
set (builtin_lzma OFF CACHE BOOL "" FORCE)
set (builtin_llvm ON CACHE BOOL "" FORCE)
set (builtin_tbb OFF CACHE BOOL "" FORCE)
set (builtin_unuran OFF CACHE BOOL "" FORCE)
set (castor OFF CACHE BOOL "" FORCE)
set (chirp OFF CACHE BOOL "" FORCE)
set (cling ON CACHE BOOL "" FORCE)
Expand All @@ -24,6 +26,7 @@ set (fail-on-missing ON CACHE BOOL "" FORCE)
set (fitsio ON CACHE BOOL "" FORCE)
set (fortran ON CACHE BOOL "" FORCE)
set (gfal OFF CACHE BOOL "" FORCE)
set (gl2ps ON CACHE BOOL "" FORCE)
set (glite OFF CACHE BOOL "" FORCE)
set (gnuinstall ON CACHE BOOL "" FORCE)
set (gsl_shared ON CACHE BOOL "" FORCE)
Expand All @@ -34,6 +37,7 @@ set (monalisa OFF CACHE BOOL "" FORCE)
set (mt ON CACHE BOOL "" FORCE)
set (opengl ON CACHE BOOL "" FORCE)
set (oracle OFF CACHE BOOL "" FORCE)
set (python3 ON CACHE BOOL "" FORCE)
set (pythia6 OFF CACHE BOOL "" FORCE)
set (pythia6_nolink OFF CACHE BOOL "" FORCE)
set (pythia8 ON CACHE BOOL "" FORCE)
Expand All @@ -45,5 +49,7 @@ set (shared ON CACHE BOOL "" FORCE)
set (tbb ON CACHE BOOL "" FORCE)
set (testing OFF CACHE BOOL "" FORCE)
set (tmva ON CACHE BOOL "" FORCE)
set (unuran ON CACHE BOOL "" FORCE)
set (xft ON CACHE BOOL "" FORCE)
set (xrootd ON CACHE BOOL "" FORCE)
set (x11 ON CACHE BOOL "" FORCE)

0 comments on commit 6c277f6

Please sign in to comment.