[arch-commits] Commit in root/trunk (PKGBUILD settings-cuda.cmake settings.cmake)

[Konstantin Gizdov]

    Date: Wednesday, April 21, 2021 @ 15:06:39
  Author: kgizdov
Revision: 920524

fix FS#70483; add openui5 dep, python-pygments

Modified:
  root/trunk/PKGBUILD
  root/trunk/settings-cuda.cmake
  root/trunk/settings.cmake

---------------------+
 PKGBUILD            |   12 +++++++++---
 settings-cuda.cmake |    2 ++
 settings.cmake      |    2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-21 15:03:51 UTC (rev 920523)
+++ PKGBUILD	2021-04-21 15:06:39 UTC (rev 920524)
@@ -7,7 +7,7 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.24.00
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
@@ -25,13 +25,16 @@
     'go'
     'libxml2'
     'libmariadbclient'
+    'nlohmann-json'
     'ocaml'
     'ocaml-ctypes'
     'openmp'
     'openmpi'
     'openssl'
+    'openui5'
     'postgresql-libs'
     'pythia8>=8.2.40-1'
+    'python-pygments'
     'qt5-webengine'
     'sqlite'
     'unuran'
@@ -68,11 +71,14 @@
     'cfitsio: Read images and data from FITS files'
     'libmariadbclient: MySQL support'
     'libxml2: XML parser interface'
+    'nlohmann-json: JSROOT support'
     'openmp: Support OpenMP extensions in Minuit2'
     'openmpi: Support OpenMPI extensions in Minuit2'
     'openssl: OpenSSL support'
+    'openui5: JSROOT support'
     'postgresql-libs: PostgreSQL support'
     'pythia8>=8.2.40-1: Pythia8 EG support'
+    'python-pygments: syntax highlighting in interactive console'
     'qt5-webengine: Support for WebGUI'
     'sqlite: SQLite support'
     'tcsh: Legacy CSH support'
@@ -96,8 +102,8 @@
             'af8f178fc9df66997d5495b271e38adcd1636aab4c8fc994c6600c2496127829d831250d73d3fc229b02dfe49b9867d0be979beacb959f2f3a05351b8118a4a6'
             '1fe6f4aa09d583d33f27cc766f4935510bb7ab6bbb8d4700baa1aaab92ea6c876500b67da1e4f6e0b510aa5616e4e193b860264b86925de85f2d9f558d75d5dc'
             '3c81d255a17b902ffac0187af1752847036137e16641a88b17eef0d9c944e6f0d3c954bc93307d6270603f43f6c23f2e04f98dc7a68f9d076dbaa8006a2527d6'
-            '8e40247d4531d690e4d2897de4672e9fb289d4787c55cd17e8ac8be693e9bedb20ee0f5bb471d22088f34ecea81fd8b0d2aa2f311403870fa71c2377bfbdeacd'
-            '324adbff951f5fd60307ce12591be2c6c583021bf4645c4d2043e37d3313cecb841f13997bf23587beac85158333b49359709b385592ec74cd006c37a170290e'
+            '4ef971eac7520d27fa88848c8d477243b1fc372e42122e3928092dc68ed2eea19ad0dea6203cf77b61406eea1da7a260a39d2bc116a19e59de99e99a51fb6bf5'
+            '99cfdd351f1ec1eaca84fffefa82d1f9f9af691e5d5dd8955b047aac324b8cb0ba2b657074d8e0a707e44f024d2f465a9a410bf7c729f12c0d84fcd17c63ca01'
             '1c905ee7a3f8f5f3f567d957f9be6b503a8631565d4d9b9bfea5e496ef86865c5a8be1a1f8c7842754029879cf0afd2465249f532a116cc43660aa2e460ae682'
             '12814f50b7016bd86d3f91e0e31c052783a0c0fa72b7d6a072d3ae6f86c2437323d585e531235377ebbfdd9cb76abd7da84d9631de821151547f1d4b13417e69'
             'ff555ac4db568affe139701907f86d919a2206f3e304f69dd317b756ea0904b5934d9364a524060778aa507809ce78448621619bb34039ba34c5a71af71a4a8c')

Modified: settings-cuda.cmake
===================================================================
--- settings-cuda.cmake	2021-04-21 15:03:51 UTC (rev 920523)
+++ settings-cuda.cmake	2021-04-21 15:06:39 UTC (rev 920524)
@@ -27,6 +27,8 @@
 set (builtin_glew OFF CACHE BOOL "" FORCE)
 set (builtin_gsl OFF CACHE BOOL "" FORCE)
 set (builtin_lzma OFF CACHE BOOL "" FORCE)
+set (builtin_nlohmannjson OFF CACHE BOOL "" FORCE)
+set (builtin_openui5 OFF CACHE BOOL "" FORCE)
 set (builtin_llvm ON CACHE BOOL "" FORCE)
 set (builtin_openssl OFF CACHE BOOL "" FORCE)
 set (builtin_pcre OFF CACHE BOOL "" FORCE)

Modified: settings.cmake
===================================================================
--- settings.cmake	2021-04-21 15:03:51 UTC (rev 920523)
+++ settings.cmake	2021-04-21 15:06:39 UTC (rev 920524)
@@ -27,6 +27,8 @@
 set (builtin_glew OFF CACHE BOOL "" FORCE)
 set (builtin_gsl OFF CACHE BOOL "" FORCE)
 set (builtin_lzma OFF CACHE BOOL "" FORCE)
+set (builtin_nlohmannjson OFF CACHE BOOL "" FORCE)
+set (builtin_openui5 OFF CACHE BOOL "" FORCE)
 set (builtin_llvm ON CACHE BOOL "" FORCE)
 set (builtin_openssl OFF CACHE BOOL "" FORCE)
 set (builtin_pcre OFF CACHE BOOL "" FORCE)