[arch-commits] Commit in root/trunk (4 files)

[Konstantin Gizdov]

    Date: Thursday, September 12, 2019 @ 15:14:29
  Author: kgizdov
Revision: 509568

upgpkg: root 6.18.04-1

Added:
  root/trunk/add_missing_include_ROOT-10315.patch
Modified:
  root/trunk/PKGBUILD
  root/trunk/settings-cuda.cmake
  root/trunk/settings.cmake

--------------------------------------+
 PKGBUILD                             |   21 ++++++++++++++++-----
 add_missing_include_ROOT-10315.patch |   22 ++++++++++++++++++++++
 settings-cuda.cmake                  |    2 +-
 settings.cmake                       |    2 +-
 4 files changed, 40 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-12 14:09:34 UTC (rev 509567)
+++ PKGBUILD	2019-09-12 15:14:29 UTC (rev 509568)
@@ -6,7 +6,7 @@
 
 pkgbase=root
 pkgname=('root' 'root-cuda')
-pkgver=6.18.02
+pkgver=6.18.04
 pkgrel=1
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
@@ -85,12 +85,14 @@
         'root.xml'
         'rootd'
         'settings.cmake'
-        'settings-cuda.cmake')
-sha256sums=('50ffffdbf2585a536c77a03f54aa631926138275ffeee02e5a16dde87e978c1d'
+        'settings-cuda.cmake'
+        'add_missing_include_ROOT-10315.patch')
+sha256sums=('315a85fc8363f8eb1bffa0decbf126121258f79bd273513ed64795675485cfa4'
             '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
             '3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
-            '4214201976d25801aab9b3306984e8b523e9c0e7995766728484f241bcaef397'
-            '6dd2b669aa76e371475001ee603d699e49c155c21f97bf3da12e33c22bc98126')
+            'b3719aee5fbc576b7a1304a46485c74e44595b2a09318b448c505678199c3d51'
+            '0fe525254f38d911e15a1e5d11aba9ce67ba4354bcd03f0fbfb2d4bd4eccc2fd'
+            '1cb2654f22b5f1de7f8621434c76266968db77a1f300de857e47d0f4ad5da217')
 get_pyver () {
     python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
 }
@@ -97,6 +99,15 @@
 prepare() {
     # cd "${srcdir}/${pkgbase}-${pkgver}"
 
+    local src
+    for src in "${source[@]}"; do
+        src="${src%%::*}"
+        src="${src##*/}"
+        [[ $src = *.patch ]] || continue
+        echo "  -> Applying patch $src..."
+        patch -Np1 -i "../$src" -d "${srcdir}/${pkgbase}-${pkgver}"
+    done
+
     2to3 -w "${srcdir}/${pkgbase}-${pkgver}"/etc/dictpch/makepch.py 2>&1 > /dev/null
 
     # don't let ROOT play around with lib paths

Added: add_missing_include_ROOT-10315.patch
===================================================================
--- add_missing_include_ROOT-10315.patch	                        (rev 0)
+++ add_missing_include_ROOT-10315.patch	2019-09-12 15:14:29 UTC (rev 509568)
@@ -0,0 +1,22 @@
+From e31986c6523253f3160753b202e22a1c321e2b1a Mon Sep 17 00:00:00 2001
+From: Sergey Linev <S.Linev at gsi.de>
+Date: Thu, 12 Sep 2019 14:06:13 +0200
+Subject: [PATCH] [rbrowser] add missing include ROOT-10315
+
+---
+ gui/browserv7/inc/ROOT/RBrowserItem.hxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gui/browserv7/inc/ROOT/RBrowserItem.hxx b/gui/browserv7/inc/ROOT/RBrowserItem.hxx
+index b21bc87b4bf..e9ae97e90c0 100644
+--- a/gui/browserv7/inc/ROOT/RBrowserItem.hxx
++++ b/gui/browserv7/inc/ROOT/RBrowserItem.hxx
+@@ -17,6 +17,9 @@
+ #ifndef ROOT7_RBrowserItem
+ #define ROOT7_RBrowserItem
+ 
++#include <string>
++#include <vector>
++
+ namespace ROOT {
+ namespace Experimental {

Modified: settings-cuda.cmake
===================================================================
--- settings-cuda.cmake	2019-09-12 14:09:34 UTC (rev 509567)
+++ settings-cuda.cmake	2019-09-12 15:14:29 UTC (rev 509568)
@@ -75,7 +75,7 @@
 set (root7 ON CACHE BOOL "" FORCE)
 set (roottest OFF CACHE BOOL "" FORCE)
 set (rpath OFF CACHE BOOL "" FORCE)
-set (runtime_cxxmodules OFF CACHE BOOL "" FORCE)  # broken - circular dependency
+set (runtime_cxxmodules OFF CACHE BOOL "" FORCE)  # broken
 set (r OFF CACHE BOOL "" FORCE)  # requires r-rcpp
 set (shadowpw ON CACHE BOOL "" FORCE)
 set (shared ON CACHE BOOL "" FORCE)

Modified: settings.cmake
===================================================================
--- settings.cmake	2019-09-12 14:09:34 UTC (rev 509567)
+++ settings.cmake	2019-09-12 15:14:29 UTC (rev 509568)
@@ -75,7 +75,7 @@
 set (root7 ON CACHE BOOL "" FORCE)
 set (roottest OFF CACHE BOOL "" FORCE)
 set (rpath OFF CACHE BOOL "" FORCE)
-set (runtime_cxxmodules OFF CACHE BOOL "" FORCE)  # broken - circular dependency
+set (runtime_cxxmodules ON CACHE BOOL "" FORCE)
 set (r OFF CACHE BOOL "" FORCE)  # requires r-rcpp
 set (shadowpw ON CACHE BOOL "" FORCE)
 set (shared ON CACHE BOOL "" FORCE)