GNU bug report logs - #72873
[PATCH 0/4] scilab: Update to 2024.1.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72873 in the body.
You can then email your comments to 72873 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH 0/4] scilab: Update to 2024.1.0.
Date: Thu, 29 Aug 2024 17:06:18 +0200

This patch series includes an update and a few improvements to the
scilab building process.

Nicolas Graves (4):
  gnu: scilab: Update to 2024.1.0.
  gnu: scilab: Cleanup more files.
  gnu: scilab: Fix the scilab build script.
  gnu: scilab: Add sanity-check phase.

 gnu/packages/maths.scm                        | 24 ++++++++++----
 .../patches/scilab-tbx_build_help.patch       | 33 +++++++++----------
 2 files changed, 33 insertions(+), 24 deletions(-)

-- 
2.45.2

Message #8 received at 72873 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 72873 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH 1/4] gnu: scilab: Update to 2024.1.0.
Date: Thu, 29 Aug 2024 18:25:43 +0200

* gnu/packages/maths.scm (scilab): Update to 2024.1.0.
* gnu/packages/patches/scilab-tbx_build_help.patch: Update patch.

Change-Id: I79197822aefba698b2383e3aa30fbc511da6954c
---
 gnu/packages/maths.scm                        |  4 +--
 .../patches/scilab-tbx_build_help.patch       | 33 +++++++++----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 557d9acc48..8617ba7217 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -9832,7 +9832,7 @@ (define-public optizelle
 (define-public scilab
   (package
     (name "scilab")
-    (version "2024.0.0")
+    (version "2024.1.0")
     (source
      (origin
        (method git-fetch)
@@ -9842,7 +9842,7 @@ (define-public scilab
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7"))
+         "1qk0pf1cwcvdqjza9xqkynd90ywq0yh421bz59w5zjzbs40ijnrx"))
        (patches (search-patches "scilab-better-compiler-detection.patch"
                                 "scilab-tbx_build_help.patch"))
        (modules '((guix build utils)
diff --git a/gnu/packages/patches/scilab-tbx_build_help.patch b/gnu/packages/patches/scilab-tbx_build_help.patch
index d2a9b41357..34dbe7dfa4 100644
--- a/gnu/packages/patches/scilab-tbx_build_help.patch
+++ b/gnu/packages/patches/scilab-tbx_build_help.patch
@@ -1,38 +1,35 @@
-From c59d78c5a5c8c187450f157cf7f8480455e8e6a2 Mon Sep 17 00:00:00 2001
+From 24a9bc240729b7630e20a7b83b75f086024ae03d Mon Sep 17 00:00:00 2001
 From: Nicolas Graves <ngraves <at> ngraves.fr>
-Date: Wed, 3 Apr 2024 03:32:23 +0200
+Date: Wed, 21 Aug 2024 15:42:35 +0200
 Subject: [PATCH] scilab: tbx_build_help: Allow for some flexibility under
  -nwni.
 
 upstream reference: https://gitlab.com/scilab/scilab/-/merge_requests/818
-
 ---
- .../modules_manager/macros/tbx_build_help.sci        | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ scilab/modules/modules_manager/macros/tbx_build_help.sci | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/scilab/modules/modules_manager/macros/tbx_build_help.sci b/scilab/modules/modules_manager/macros/tbx_build_help.sci
-index 7862e33a868..5593ee3dc04 100644
+index ab06b3fa8dc..cbb1b4cadf8 100644
 --- a/scilab/modules/modules_manager/macros/tbx_build_help.sci
 +++ b/scilab/modules/modules_manager/macros/tbx_build_help.sci
-@@ -58,12 +58,12 @@ function tbx_build_help(moduletitle, path)
+@@ -57,8 +57,8 @@ function tbx_build_help(moduletitle, path)
  
      // Check scilab mode
      if and(getscilabmode() <> ["STD" "NW"]) then
 -        error(msprintf(gettext("%s: documentation cannot be built in this scilab mode: %s.\n"),"tbx_build_help",getscilabmode()));
+-    end
 +        msprintf(gettext("%s: documentation cannot be built in this scilab mode: %s.\n"),"tbx_build_help",getscilabmode());
 +    else
-+        directory_language = basename(path);
-+        default_language = "en_US"
-+
-+        xmltojar(path, moduletitle, directory_language, default_language);
-     end
  
--    directory_language = basename(path);
--    default_language = "en_US"
--
--    xmltojar(path, moduletitle, directory_language, default_language);
--
+     directory_language = basename(path);
+     default_language = "en_US"
+@@ -89,4 +89,5 @@ function tbx_build_help(moduletitle, path)
+         warning(_(".start file was not found, build of help pages using <scilab:image> tag may failed."));
+         xmltojar(path, moduletitle, directory_language, default_language);
+     end
++    end
  endfunction
 -- 
-2.41.0
+2.45.2
 
-- 
2.45.2

Message #11 received at 72873 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 72873 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH 3/4] gnu: scilab: Fix the scilab build script.
Date: Thu, 29 Aug 2024 18:25:45 +0200

* gnu/packages/maths.scm (scilab):
[arguments]<#:phases>: Reintroduce a manual patch for /bin/ls in phase
pre-build. This is necessary because the file is used when scilab
builds macros, even if it is discarded later.
[inputs]: Add coreutils-minimal.

Change-Id: I692fd6696273bfdce0e50b0f688a60e7dc289ce6
---
 gnu/packages/maths.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a211121375..48a22bb6a1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -9907,6 +9907,7 @@ (define-public scilab
            autoconf-archive
            automake
            bison
+           coreutils-minimal
            eigen
            flex
            gfortran
@@ -10014,6 +10015,10 @@ (define-public scilab
                     (("PROGNAME.*") "\n")))))
             (add-before 'build 'pre-build
               (lambda* (#:key inputs #:allow-other-keys)
+                ;; Fix scilab script.
+                (substitute* "bin/scilab"
+                  (("/bin/ls")
+                   (search-input-file inputs "bin/ls")))
                 ;; Fix core.start.
                 (substitute* "modules/core/etc/core.start"
                   (("'SCI/modules")
-- 
2.45.2

Message #14 received at 72873 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 72873 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH 2/4] gnu: scilab: Cleanup more files.
Date: Thu, 29 Aug 2024 18:25:44 +0200

* gnu/packages/maths.scm (scilab):
[source] Delete .bat files.

Change-Id: I6f9ae17dd5d689c3e5836bf0c9e54725ef381428
---
 gnu/packages/maths.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8617ba7217..a211121375 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -9866,7 +9866,8 @@ (define-public scilab
                         "libs/GetWindowsVersion"
                         "Visual-Studio-settings"))
             (for-each delete-file
-                      (cons* "aclocal.m4"
+                      (append
+                       (list "aclocal.m4"
                              "configure"
                              "m4/ax_cxx_compile_stdcxx.m4"
                              "m4/lib-ld.m4"
@@ -9876,8 +9877,9 @@ (define-public scilab
                              "m4/ltversion.m4"
                              "m4/lt~obsolete.m4"
                              "m4/pkg.m4"
-                             "Scilab.sln"
-                             (find-files "." "^Makefile\\.in$")))
+                             "Scilab.sln")
+                       (find-files "." "^Makefile\\.in$")
+                       (find-files "." "\\.bat$")))
 
             ;; And finally some files in the modules directory:
             (for-each
-- 
2.45.2

Message #17 received at 72873 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 72873 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH 4/4] gnu: scilab: Add sanity-check phase.
Date: Thu, 29 Aug 2024 18:25:46 +0200

* gnu/packages/maths.scm (scilab):
  [arguments]<#:phases>: Add sanity-check phase.

Change-Id: Idc6911511fd0bf7e779d4af026f0a6390eb3b079
---
 gnu/packages/maths.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 48a22bb6a1..577d9b87aa 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -10054,7 +10054,12 @@ (define (bin path) (string-append #$output "/bin/" path))
                     "\"${XDG_STATE_HOME:-$HOME/.local/state}/scilab/"
                     #$(package-version this-package) "\""))
                   (("export SCI=")
-                   "unset LANGUAGE\nexport SCI="))))))))
+                   "unset LANGUAGE\nexport SCI="))))
+            (add-after 'rewrap-scilab-cli 'sanity-check
+              (lambda _
+                (setenv "HOME" (getcwd))
+                (invoke (string-append #$output "/bin/scilab-cli")
+                        "-e" "\"quit;\"")))))))
     (home-page "https://www.scilab.org/")
     (synopsis "Software for engineers and scientists")
     (description "This package provides the non-graphical version of the Scilab
-- 
2.45.2

Message #22 received at 72873-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 72873-done <at> debbugs.gnu.org
Subject: Re: [bug#72873] [PATCH 0/4] scilab: Update to 2024.1.0.
Date: Fri, 04 Oct 2024 21:28:47 +0200

Hi,

Nicolas Graves <ngraves <at> ngraves.fr> skribis:

> This patch series includes an update and a few improvements to the
> scilab building process.
>
> Nicolas Graves (4):
>   gnu: scilab: Update to 2024.1.0.
>   gnu: scilab: Cleanup more files.
>   gnu: scilab: Fix the scilab build script.
>   gnu: scilab: Add sanity-check phase.

Finally applied, thanks!

Will push as soon as Savannah is in a better shape.

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.