[arch-commits] Commit in root/trunk (8351.patch PKGBUILD nbman-for-arch.patch)

[Konstantin Gizdov]

    Date: Tuesday, March 8, 2022 @ 16:12:14
  Author: kgizdov
Revision: 1145489

upgpkg: root 6.26.00-1: upgpkg: root 6.26.00-1

Modified:
  root/trunk/PKGBUILD
  root/trunk/nbman-for-arch.patch
Deleted:
  root/trunk/8351.patch

----------------------+
 8351.patch           |   29 -----------------------------
 PKGBUILD             |   10 ++++------
 nbman-for-arch.patch |   27 +++++++++++++++------------
 3 files changed, 19 insertions(+), 47 deletions(-)

Deleted: 8351.patch
===================================================================
--- 8351.patch	2022-03-08 16:09:14 UTC (rev 1145488)
+++ 8351.patch	2022-03-08 16:12:14 UTC (rev 1145489)
@@ -1,29 +0,0 @@
-From 87a0caf0c8b2b4158a6f35e948087ae64c4c06a7 Mon Sep 17 00:00:00 2001
-From: Enrico Guiraud <enrico.guiraud at cern.ch>
-Date: Mon, 7 Jun 2021 11:02:48 +0200
-Subject: [PATCH] [io] Avoid nullptr deref when printing warning in
- TStreamerInfo
-
----
- io/io/src/TStreamerInfo.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/io/io/src/TStreamerInfo.cxx b/io/io/src/TStreamerInfo.cxx
-index d545ab7be8e3..a02663589066 100644
---- a/io/io/src/TStreamerInfo.cxx
-+++ b/io/io/src/TStreamerInfo.cxx
-@@ -1109,12 +1109,12 @@ void TStreamerInfo::BuildCheck(TFile *file /* = 0 */, Bool_t load /* = kTRUE */)
-                              fClassVersion, GetName(), GetName(), GetName(), fClassVersion);
-                   } else {
-                      Warning("BuildCheck", "\n\
--   The StreamerInfo from %s does not match existing one (%s:%d)\n\
-+   The StreamerInfo does not match existing one (%s:%d)\n\
-    The existing one has not been used yet and will be discarded.\n\
-    Reading should work properly, however writing object of\n\
-    type %s will not work properly.  Most likely the version number\n\
-    of the class was not properly updated [See ClassDef(%s,%d)].",
--                             file->GetName(), GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
-+                             GetName(), fClassVersion, GetName(), GetName(), fClassVersion);
-                   }
-                }
-             }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-08 16:09:14 UTC (rev 1145488)
+++ PKGBUILD	2022-03-08 16:12:14 UTC (rev 1145489)
@@ -6,8 +6,8 @@
 
 pkgbase=root
 pkgname=('root' 'root-cuda')
-pkgver=6.24.06
-pkgrel=15
+pkgver=6.26.00
+pkgrel=1
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
@@ -96,10 +96,9 @@
     'settings-cuda.cmake'
     'jupyter_notebook_config.py'
     'nbman-for-arch.patch'
-    '8351.patch'
     'thisroot.fail'
 )
-sha512sums=('356d6287df2900de9e831347d9513f444bf7cbd29c39fbb5841051ae877dac1e22dc255c64166cd3925b82aac860ae67ef6ce171732c16fd23d7919a47e7cb5a'
+sha512sums=('78428de6b7ba546263aed51df2e23f9493a8dc8112a320142a8e5187a88ed4d0c0402e453cec2dc79063da15ad28cb89ec154085aed2579f87c6657c77362f45'
             'af8f178fc9df66997d5495b271e38adcd1636aab4c8fc994c6600c2496127829d831250d73d3fc229b02dfe49b9867d0be979beacb959f2f3a05351b8118a4a6'
             '1fe6f4aa09d583d33f27cc766f4935510bb7ab6bbb8d4700baa1aaab92ea6c876500b67da1e4f6e0b510aa5616e4e193b860264b86925de85f2d9f558d75d5dc'
             '3c81d255a17b902ffac0187af1752847036137e16641a88b17eef0d9c944e6f0d3c954bc93307d6270603f43f6c23f2e04f98dc7a68f9d076dbaa8006a2527d6'
@@ -106,8 +105,7 @@
             '4ef971eac7520d27fa88848c8d477243b1fc372e42122e3928092dc68ed2eea19ad0dea6203cf77b61406eea1da7a260a39d2bc116a19e59de99e99a51fb6bf5'
             '99cfdd351f1ec1eaca84fffefa82d1f9f9af691e5d5dd8955b047aac324b8cb0ba2b657074d8e0a707e44f024d2f465a9a410bf7c729f12c0d84fcd17c63ca01'
             '1c905ee7a3f8f5f3f567d957f9be6b503a8631565d4d9b9bfea5e496ef86865c5a8be1a1f8c7842754029879cf0afd2465249f532a116cc43660aa2e460ae682'
-            '12814f50b7016bd86d3f91e0e31c052783a0c0fa72b7d6a072d3ae6f86c2437323d585e531235377ebbfdd9cb76abd7da84d9631de821151547f1d4b13417e69'
-            '870740fbbd678056dd71b275c5d96f9b0db503ca8e0e9e84f784c3115aae66bb28a1eb531f665c1c8306a52686e5ce484ef65b3194bef6cb0d631664ccb1e3f9'
+            '08037f68fa816debc4e9c16a26c862bc026c8e6ceaf2f5131d1493470599b4eb2b2efeef35249f15392aeff0c22bff59264e8a4ac6c73e4f195046be9d185724'
             '3b9e382480b28f60af0b096ac9a42e6ba611b899717988bdebffd5aeabab054e37a28a7421f4a0f39198638c31f56a657a8a9ccc3db54a87daf50d43d35b1ca9')
 
 get_pyver () {

Modified: nbman-for-arch.patch
===================================================================
--- nbman-for-arch.patch	2022-03-08 16:09:14 UTC (rev 1145488)
+++ nbman-for-arch.patch	2022-03-08 16:12:14 UTC (rev 1145489)
@@ -1,7 +1,7 @@
-diff --color -aur root-6.22.00-old/main/src/nbmain.cxx root-6.22.00-new/main/src/nbmain.cxx
---- root-6.22.00-old/main/src/nbmain.cxx	2020-07-20 15:26:53.983725609 +0300
-+++ root-6.22.00-new/main/src/nbmain.cxx	2020-07-20 15:29:53.940386060 +0300
-@@ -33,10 +33,6 @@
+diff --color -aur --color root-6.26.00-old/main/src/nbmain.cxx root-6.26.00-new/main/src/nbmain.cxx
+--- root-6.26.00-old/main/src/nbmain.cxx	2022-03-03 08:39:52.000000000 +0200
++++ root-6.26.00-new/main/src/nbmain.cxx	2022-03-08 17:36:29.881271963 +0200
+@@ -34,10 +34,6 @@
  #define NB_OPT             "notebook"
  #define JUPYTER_CONF_DIR_V "JUPYTER_CONFIG_DIR"
  #define JUPYTER_PATH_V     "JUPYTER_PATH"
@@ -9,10 +9,10 @@
 -#define ROOTNB_DIR         ".rootnb"
 -#define COMMIT_FILE        ".rootcommit"
 -#define JUPYTER_CONFIG     "jupyter_notebook_config.py"
-
+ 
  using namespace std;
-
-@@ -46,161 +46,12 @@
+ 
+@@ -50,164 +46,12 @@
  #endif
  
  ////////////////////////////////////////////////////////////////////////////////
@@ -98,13 +98,16 @@
 -   ofstream out(jupyconfig, ios::trunc);
 -   if (out.is_open()) {
 -      out << "import os" << endl;
+-#ifdef WIN32
+-      std::replace( rootbin.begin(), rootbin.end(), '\\', '/');
+-      std::replace( rootdata.begin(), rootdata.end(), '\\', '/');
 -      out << "rootbin = '" << rootbin << "'" << endl;
+-      string jsrootsys = rootdata + "/js/";
+-      out << "os.environ['PYTHONPATH']      = '%s' % rootbin + ';' + os.getenv('PYTHONPATH', '')" << endl;
+-      out << "os.environ['PATH']            = '%s;%s/bin' % (rootbin,rootbin) + ';' + os.getenv('PATH', '')" << endl;
+-#else
+-      out << "rootbin = '" << rootbin << "'" << endl;
 -      out << "rootlib = '" << rootlib << "'" << endl;
--#ifdef WIN32
--      string jsrootsys = rootdata + "\\js\\";
--      out << "os.environ['PYTHONPATH']      = '%s' % rootlib + ':' + os.getenv('PYTHONPATH', '')" << endl;
--      out << "os.environ['PATH']            = '%s:%s\\bin' % (rootbin,rootbin) + ':' + '%s' % rootlib + ':' + os.getenv('PATH', '')" << endl;
--#else
 -      string jsrootsys = rootdata + "/js/";
 -      out << "os.environ['PYTHONPATH']      = '%s' % rootlib + ':' + os.getenv('PYTHONPATH', '')" << endl;
 -      out << "os.environ['PATH']            = '%s:%s/bin' % (rootbin,rootbin) + ':' + os.getenv('PATH', '')" << endl;