1 files changed, 22 insertions, 17 deletions
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 729d3377f..d277db4ec 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=root
 pkgver=5.32.00
-pkgrel=2
+pkgrel=3
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
@@ -16,25 +16,31 @@ options=('!emptydirs')
 source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
-        'root.xml')
+        'root.xml'
+        'fix-mathcore-generation-r42566.diff')
 md5sums=('1c30e4e6eeae62ff1ad5118cd1309679'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
-         'e2cf69b204192b5889ceb5b4dedc66f7')
+         'e2cf69b204192b5889ceb5b4dedc66f7'
+         '12877cabd620284f50ea16ef97a54aac')
 
 build() {
   cd root
 
+  # temporary workaround: remove on next patch release after 5.32.00
+  # bug reported at: https://savannah.cern.ch/bugs/?90906
+  patch -Np0 -i ${srcdir}/fix-mathcore-generation-r42566.diff
+
   if [ ${CARCH} == 'i686' ]; then
     TARGET=linux;
   else
     TARGET=linuxx8664gcc;
   fi
 
-  # python2 switch
-  find . -type f -exec sed -i -e 's_#!/usr/bin/env python_&2_' \
-                              -e 's/python -O/python2 -O/g' \
-                              -e 's/python -c/python2 -c/g' {} \;
+  msg 'python2 switch'
+  find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \
+                           -e 's/python -O/python2 -O/g' \
+                           -e 's/python -c/python2 -c/g' -i {} \;
   sed \
     -e 's/python 2/python2 2/g' \
     -i configure
@@ -45,15 +51,16 @@ build() {
     -e 's/python /python2 /' \
     -i config/genreflex.in config/genreflex-rootcint.in
 
+  local sys_libs=""
+  for sys_lib in ftgl freetype glew pcre zlib lzma; do
+    sys_libs+="--disable-builtin-${sys_lib} "
+  done
+  # move from aur if possible
+  #--disable-builtin-afterimage \
+
   ./configure \
     ${TARGET} \
     --prefix=/usr \
-    --disable-builtin-ftgl \
-    --disable-builtin-freetype \
-    --disable-builtin-glew \
-    --disable-builtin-pcre \
-    --disable-builtin-zlib \
-    --disable-builtin-lzma \
     --enable-gdml \
     --enable-gsl-shared \
     --enable-minuit2 \
@@ -61,10 +68,8 @@ build() {
     --enable-roofit \
     --enable-python \
     --with-python-incdir=/usr/include/python2.7 \
-    --with-python-libdir=/usr/lib
-
-    # move from aur
-    #--disable-builtin-afterimage \
+    --with-python-libdir=/usr/lib \
+    ${sys_libs}
 
   make
 }