updated to 6.08.00

1 files changed, 15 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ee9653b63c75..49fd0874ff3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: Konstantin Gizdov <arch@kge.pw>
-# 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 < arch at kge dot pw >
+# 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-extra
 _pkgname=root
-pkgver=6.06.08
-pkgrel=2
+pkgver=6.08.00
+pkgrel=1
 provides=('root')
 conflicts=('root')
 pkgdesc='C++ data analysis framework and interpreter from CERN with extra features enabled.'
@@ -18,6 +18,7 @@ makedepends=('cmake')
 depends=('cfitsio'
 'fftw'
 'ftgl'
+'gl2ps'
 'glew'
 'graphviz'
 'gsl'
@@ -32,6 +33,7 @@ depends=('cfitsio'
 'sqlite'
 'tex-gyre-fonts'  # solve the pixelized font problem as per Arch Wiki
 'unixodbc'
+'unuran'
 'xmlrpc-c'
 'xrootd-abi0'
 )
@@ -40,41 +42,27 @@ optdepends=('gcc-fortran: Enable the Fortran components of ROOT'
 )
 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'
-            'd9fea8991d42a78cd694f9798615274e96a185cbbd6608b4b80c76d5e43982a6'
-            '51dbcf86d9973e7b7204fc20ff0c3c3aacea01ee126e14e2fb3c9f33825cc558'
+sha256sums=('388b4158c6e5706418031060c52c4e6b89cd8856ba06bf11c550eeb1759615d9'
             '9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
             'b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32'
             '6a4ef7b32710d414ee47d16310b77b95e4cf1d3550209cf8a41d38a945d05e5f'
-            'b0aaf22cc5f4865f4c603fd66d8299cd86ebb29d79ca7b4de3bdf99d2113a87a')
+            '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
 
+    CXXFLAGS="${CXXFLAGS} -pthread" \
     CFLAGS="${CFLAGS} -pthread" \
-    CXXFLAGS="${CXXFLAGS} -pthread -D_GLIBCXX_USE_CXX11_ABI=0" \
     LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \
     cmake -C ${srcdir}/settings.cmake ${srcdir}/${_pkgname}-${pkgver}
 
@@ -98,6 +86,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