apply patch to fix JupyROOT

Author: kgizdov

.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = root
 	pkgdesc = C++ data analysis framework and interpreter from CERN with extra features enabled.
 	pkgver = 6.08.00
-	pkgrel = 2
+	pkgrel = 3
 	url = http://root.cern.ch
 	arch = i686
 	arch = x86_64
@@ -32,15 +32,17 @@ pkgbase = root
 	optdepends = tcsh: Legacy CSH support
 	options = !emptydirs
 	source = https://root.cern.ch/download/root_v6.08.00.source.tar.gz
+	source = JupyROOT_fix.patch
 	source = root.sh
 	source = root.xml
 	source = rootd
 	source = settings.cmake
 	sha256sums = 388b4158c6e5706418031060c52c4e6b89cd8856ba06bf11c550eeb1759615d9
+	sha256sums = a17309295f998ed826dcbf1b5d04de7ed44d64c35221806c75b775796578783d
 	sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
 	sha256sums = b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32
 	sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
-	sha256sums = e5e236ab8ec21136d97d696648ce8f2448b196f40a2f90bbfd450bc186df94c2
+	sha256sums = 40503aebd8a0ab5380a24d69145cf7d93d483d4d9330e4c23fb04e55c9ed2caf
 
 pkgname = root
 

JupyROOT_fix.patch

@@ -0,0 +1,33 @@
+diff -aur root-6.08.00_old/bindings/pyroot/JupyROOT/cppcompleter.py root-6.08.00/bindings/pyroot/JupyROOT/cppcompleter.py
+--- root-6.08.00_old/bindings/pyroot/JupyROOT/cppcompleter.py	2016-11-16 22:45:36.414079070 +0000
++++ root-6.08.00/bindings/pyroot/JupyROOT/cppcompleter.py	2016-11-16 22:47:02.314603898 +0000
+@@ -5,7 +5,7 @@
+ #  Author: Enric Tejedor <enric.tejedor.saavedra@cern.ch> CERN
+ #-----------------------------------------------------------------------------
+ 
+-import utils
++from JupyROOT import utils
+ import ROOT
+ 
+ # Jit a wrapper for the ttabcom
+diff -aur root-6.08.00_old/bindings/pyroot/JupyROOT/utils.py root-6.08.00/bindings/pyroot/JupyROOT/utils.py
+--- root-6.08.00_old/bindings/pyroot/JupyROOT/utils.py	2016-11-16 22:45:36.414079070 +0000
++++ root-6.08.00/bindings/pyroot/JupyROOT/utils.py	2016-11-16 22:47:33.781463543 +0000
+@@ -14,7 +14,7 @@
+ import itertools
+ import re
+ import fnmatch
+-import handlers
++from JupyROOT import handlers
+ import time
+ from hashlib import sha1
+ from contextlib import contextmanager
+@@ -24,7 +24,7 @@
+ from IPython.core.extensions import ExtensionManager
+ import IPython.display
+ import ROOT
+-import cppcompleter
++from JupyROOT import cppcompleter
+ 
+ # We want iPython to take over the graphics
+ ROOT.gROOT.SetBatch()

PKGBUILD

@@ -6,7 +6,7 @@
 
 pkgname=root
 pkgver=6.08.00
-pkgrel=2
+pkgrel=3
 pkgdesc='C++ data analysis framework and interpreter from CERN with extra features enabled.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
@@ -39,18 +39,23 @@ optdepends=('gcc-fortran: Enable the Fortran components of ROOT'
 )
 options=('!emptydirs')
 source=("https://root.cern.ch/download/root_v${pkgver}.source.tar.gz"
+'JupyROOT_fix.patch'
 'root.sh'
 'root.xml'
 'rootd'
 'settings.cmake')
 sha256sums=('388b4158c6e5706418031060c52c4e6b89cd8856ba06bf11c550eeb1759615d9'
+            'a17309295f998ed826dcbf1b5d04de7ed44d64c35221806c75b775796578783d'
             '9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
             'b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32'
             '3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
-            'e5e236ab8ec21136d97d696648ce8f2448b196f40a2f90bbfd450bc186df94c2')
+            '40503aebd8a0ab5380a24d69145cf7d93d483d4d9330e4c23fb04e55c9ed2caf')
 prepare(){
     cd ${pkgname}-${pkgver}
 
+    # Fix JupyROOT inheritance
+    patch -p1 -i ${srcdir}/JupyROOT_fix.patch
+
     2to3 -w etc/dictpch/makepch.py 2>&1 > /dev/null
 }
 

settings.cmake

@@ -10,12 +10,12 @@ 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_pcre OFF CACHE BOOL "" FORCE)
 set (builtin_tbb OFF CACHE BOOL "" FORCE)
 set (builtin_unuran OFF CACHE BOOL "" FORCE)
+set (builtin_zlib OFF CACHE BOOL "" FORCE)
 set (castor OFF CACHE BOOL "" FORCE)
 set (chirp OFF CACHE BOOL "" FORCE)
 set (cling ON CACHE BOOL "" FORCE)
@@ -31,6 +31,7 @@ set (glite OFF CACHE BOOL "" FORCE)
 set (gnuinstall ON CACHE BOOL "" FORCE)
 set (gsl_shared ON CACHE BOOL "" FORCE)
 set (hdfs OFF CACHE BOOL "" FORCE)
+set (http ON CACHE BOOL "" FORCE)
 set (mathmore ON CACHE BOOL "" FORCE)
 set (minuit2 ON CACHE BOOL "" FORCE)
 set (monalisa OFF CACHE BOOL "" FORCE)
@@ -50,6 +51,6 @@ 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 (x11 ON CACHE BOOL "" FORCE)
 set (xft ON CACHE BOOL "" FORCE)
 set (xrootd ON CACHE BOOL "" FORCE)
-set (x11 ON CACHE BOOL "" FORCE)