diff options
| author | Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> | 2023-11-28 15:33:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 07:33:48 -0700 |
| commit | 6f08daf67020289e6a5ed1df9783ac5b2919e477 (patch) | |
| tree | 08c7a7f0a46bd05396b818c583c1f785710905bf | |
| parent | c2d29ca38c774b0885b8ee3ee6a23b623c415301 (diff) | |
| download | spack-6f08daf67020289e6a5ed1df9783ac5b2919e477.tar.gz spack-6f08daf67020289e6a5ed1df9783ac5b2919e477.tar.bz2 spack-6f08daf67020289e6a5ed1df9783ac5b2919e477.tar.xz spack-6f08daf67020289e6a5ed1df9783ac5b2919e477.zip | |
root: add a webgui patch (#41289)
* root: add a webgui patch
* Update var/spack/repos/builtin/packages/root/package.py
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
* Add also the versions that don't need the webgui patch
* Fix hash
---------
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/root/webgui.patch | 25 |
2 files changed, 30 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 6d03b1155d..a055778a47 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -34,11 +34,14 @@ class Root(CMakePackage): # Development version (when more recent than production). # Production version + version("6.30.02", sha256="51a09c86ffa94089abac76daa3adc20812efc6c93b427697b843b12d73e145de") version("6.30.00", sha256="0592c066954cfed42312957c9cb251654456064fe2d8dabdcb8826f1c0099d71") + version("6.28.10", sha256="fc6a2d6c7cba853b0cfd6bd9514c90e9df50e1743899bc1db0472ee6f4e65a0a") version("6.28.06", sha256="af3b673b9aca393a5c9ae1bf86eab2672aaf1841b658c5c6e7a30ab93c586533") version("6.28.04", sha256="70f7f86a0cd5e3f2a0befdc59942dd50140d990ab264e8e56c7f17f6bfe9c965") version("6.28.02", sha256="6643c07710e68972b00227c68b20b1016fec16f3fba5f44a571fa1ce5bb42faa") version("6.28.00", sha256="afa1c5c06d0915411cb9492e474ea9ab12b09961a358e7e559013ed63b5d8084") + version("6.26.12", sha256="229daa0749e3e31b6e0dedc58b6838dbfc1180b4aba4741883b617b0b4fbc966") version("6.26.10", sha256="8e56bec397104017aa54f9eb554de7a1a134474fe0b3bb0f43a70fc4fabd625f") version("6.26.08", sha256="4dda043e7918b40743ad0299ddd8d526b7078f0a3822fd06066df948af47940e") version("6.26.06", sha256="b1f73c976a580a5c56c8c8a0152582a1dfc560b4dd80e1b7545237b65e6c89cb") @@ -106,6 +109,8 @@ class Root(CMakePackage): when="@6.26:6.26.06 +root7 ^nlohmann-json@3.11:", ) + patch("webgui.patch", level=0, when="@6.26.00:6.26.10,6.28.00:6.28.08,6.30.00 +webgui") + if sys.platform == "darwin": # Resolve non-standard use of uint, _cf_ # https://sft.its.cern.ch/jira/browse/ROOT-7886. diff --git a/var/spack/repos/builtin/packages/root/webgui.patch b/var/spack/repos/builtin/packages/root/webgui.patch new file mode 100644 index 0000000000..932bb1023f --- /dev/null +++ b/var/spack/repos/builtin/packages/root/webgui.patch @@ -0,0 +1,25 @@ +--- config/rootrc.in_ORIG 2023-11-28 08:32:42.696061390 +0100 ++++ config/rootrc.in 2023-11-28 08:32:47.672727920 +0100 +@@ -217,7 +217,7 @@ + # Type of tree viewer: TTreeViewer or RTreeViewer + TreeViewer.Name: TTreeViewer + # Type of Browser: TRootBrowser or TRootBrowserLite +-Browser.Name: @root_browser_class@ ++Browser.Name: TRootBrowser + # Browser Options (plugins) + # F: File browser E: Text Editor H: HTML browser + # C: Canvas I: I/O redirection P: Proof G: GL viewer + +--- config/rootrc.in_ORIG 2023-11-28 08:18:11.686085190 +0100 ++++ config/rootrc.in 2023-11-28 08:18:15.839418409 +0100 +@@ -247,8 +247,8 @@ + WebGui.HttpPortMax: 9800 + # Exact IP iddress to bind bind http server (default - empty) + WebGui.HttpBind: +-# Use only loopback address to bind http server (default - no) +-WebGui.HttpLoopback: no ++# Use only loopback address to bind http server (default - yes) ++WebGui.HttpLoopback: yes + # Use https protocol for the http server (default - no) + WebGui.UseHttps: no + WebGui.ServerCert: rootserver.pem
\ No newline at end of file |