diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rw-r--r-- | call_PyErr_Clear_if_no_such_attribute.patch | 16 | ||||
| -rw-r--r-- | disable-gcc-abi-check.diff | 19 | ||||
| -rw-r--r-- | param.diff | 10 | ||||
| -rw-r--r-- | python3.diff | 33 | ||||
| -rw-r--r-- | settings.cmake | 5 |
7 files changed, 27 insertions, 113 deletions
@@ -1,7 +1,7 @@ pkgbase = root-extra pkgdesc = C++ data analysis framework and interpreter from CERN with extra features enabled. - pkgver = 6.06.08 - pkgrel = 2 + pkgver = 6.08.00 + pkgrel = 1 url = http://root.cern.ch arch = i686 arch = x86_64 @@ -10,6 +10,7 @@ pkgbase = root-extra depends = cfitsio depends = fftw depends = ftgl + depends = gl2ps depends = glew depends = graphviz depends = gsl @@ -24,6 +25,7 @@ pkgbase = root-extra 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 @@ -31,22 +33,16 @@ pkgbase = root-extra provides = root conflicts = root 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 = d9fea8991d42a78cd694f9798615274e96a185cbbd6608b4b80c76d5e43982a6 - sha256sums = 51dbcf86d9973e7b7204fc20ff0c3c3aacea01ee126e14e2fb3c9f33825cc558 + sha256sums = 388b4158c6e5706418031060c52c4e6b89cd8856ba06bf11c550eeb1759615d9 sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7 sha256sums = b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32 sha256sums = 6a4ef7b32710d414ee47d16310b77b95e4cf1d3550209cf8a41d38a945d05e5f - sha256sums = b0aaf22cc5f4865f4c603fd66d8299cd86ebb29d79ca7b4de3bdf99d2113a87a + sha256sums = e5e236ab8ec21136d97d696648ce8f2448b196f40a2f90bbfd450bc186df94c2 pkgname = root-extra @@ -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 diff --git a/call_PyErr_Clear_if_no_such_attribute.patch b/call_PyErr_Clear_if_no_such_attribute.patch deleted file mode 100644 index c1c401562a01..000000000000 --- a/call_PyErr_Clear_if_no_such_attribute.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/bindings/pyroot/src/Utility.cxx b/bindings/pyroot/src/Utility.cxx -index ffeae8e..d3ba063 100644 ---- a/bindings/pyroot/src/Utility.cxx -+++ b/bindings/pyroot/src/Utility.cxx -@@ -219,8 +219,10 @@ Bool_t PyROOT::Utility::AddToClass( - Bool_t PyROOT::Utility::AddToClass( PyObject* pyclass, const char* label, const char* func ) - { - PyObject* pyfunc = PyObject_GetAttrString( pyclass, const_cast< char* >( func ) ); -- if ( ! pyfunc ) -+ if ( ! pyfunc ) { -+ PyErr_Clear(); - return kFALSE; -+ } - - Bool_t isOk = PyObject_SetAttrString( pyclass, const_cast< char* >( label ), pyfunc ) == 0; - diff --git a/disable-gcc-abi-check.diff b/disable-gcc-abi-check.diff deleted file mode 100644 index 3d0300d4f1a8..000000000000 --- a/disable-gcc-abi-check.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -rupN {old,root-*}/cmake/modules/CheckCompiler.cmake ---- old/cmake/modules/CheckCompiler.cmake 2016-07-06 18:36:49.000000000 +0200 -+++ root-6.06.06/cmake/modules/CheckCompiler.cmake 2016-08-05 14:28:00.218968142 +0200 -@@ -51,15 +51,6 @@ if (CMAKE_COMPILER_IS_GNUCXX) - endif() - message(STATUS "Found GCC. Major version ${GCC_MAJOR}, minor version ${GCC_MINOR}") - set(COMPILER_VERSION gcc${GCC_MAJOR}${GCC_MINOR}${GCC_PATCH}) -- CHECK_CXX_SOURCE_COMPILES(" -- #include <string> -- #if _GLIBCXX_USE_CXX11_ABI -- #error \"cling does not support GCC 5 ABI.\" -- #endif -- int main() {}" CXX_SUPPORTS_OLD_ABI) -- if(NOT CXX_SUPPORTS_OLD_ABI) -- message(FATAL_ERROR "Found GCC compiler with new ABI. Cling does not support the GCC 5 ABI yet") -- endif() - else() - set(GCC_MAJOR 0) - set(GCC_MINOR 0) diff --git a/param.diff b/param.diff deleted file mode 100644 index e2ae611d289e..000000000000 --- a/param.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/core/utils/src/rootcling.cxx b/core/utils/src/rootcling.cxx -index 324578c..6b0c38e 100644 ---- a/core/utils/src/rootcling.cxx -+++ b/core/utils/src/rootcling.cxx -@@ -3739,4 +3739,4 @@ int ShouldIgnoreClingArgument(const std::string& argument) -- if (ROOT::TMetaUtils::BeginsWith(argument,"--")) return false; -+ if (ROOT::TMetaUtils::BeginsWith(argument,"--") and !ROOT::TMetaUtils::BeginsWith(argument,"--param")) return false; - return true; - } - diff --git a/python3.diff b/python3.diff deleted file mode 100644 index 34ad10dfab17..000000000000 --- a/python3.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -rupN old/tmva/pymva/inc/TMVA/PyMethodBase.h root-6.06.06/tmva/pymva/inc/TMVA/PyMethodBase.h ---- old/tmva/pymva/inc/TMVA/PyMethodBase.h 2016-07-06 18:36:49.000000000 +0200 -+++ root-6.06.06/tmva/pymva/inc/TMVA/PyMethodBase.h 2016-08-05 13:56:31.839179271 +0200 -@@ -81,7 +81,7 @@ namespace TMVA { - // default destructur - virtual ~PyMethodBase(); - //basic python related function -- static void PyInitialize(); -+ static void *PyInitialize(); - static int PyIsInitialized(); - static void PyFinalize(); - static void PySetProgramName(TString name); -diff -rupN old/tmva/pymva/src/PyMethodBase.cxx root-6.06.06/tmva/pymva/src/PyMethodBase.cxx ---- old/tmva/pymva/src/PyMethodBase.cxx 2016-07-06 18:36:49.000000000 +0200 -+++ root-6.06.06/tmva/pymva/src/PyMethodBase.cxx 2016-08-05 14:07:21.225701275 +0200 -@@ -82,7 +82,7 @@ PyObject *PyMethodBase::Eval(TString cod - } - - //_______________________________________________________________________ --void PyMethodBase::PyInitialize() -+void *PyMethodBase::PyInitialize() - { - TMVA::MsgLogger Log; - if (!PyIsInitialized()) { -@@ -149,7 +149,7 @@ void PyMethodBase::PyInitialize() - Py_DECREF(pName); - Py_DECREF(pDict); - -- -+ return NULL; - } - - //_______________________________________________________________________ diff --git a/settings.cmake b/settings.cmake index e705cbd7f542..7b884aefb8a8 100644 --- a/settings.cmake +++ b/settings.cmake @@ -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) @@ -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) @@ -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) @@ -45,6 +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) |