From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 72873@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#72873] [PATCH 1/4] gnu: scilab: Update to 2024.1.0.
Date: Thu, 29 Aug 2024 18:25:43 +0200 [thread overview]
Message-ID: <20240829162554.28746-1-ngraves@ngraves.fr> (raw)
In-Reply-To: <20240829150739.19497-1-ngraves@ngraves.fr>
* 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@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
next prev parent reply other threads:[~2024-08-29 16:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-29 15:06 [bug#72873] [PATCH 0/4] scilab: Update to 2024.1.0 Nicolas Graves via Guix-patches via
2024-08-29 16:25 ` Nicolas Graves via Guix-patches via [this message]
2024-08-29 16:25 ` [bug#72873] [PATCH 2/4] gnu: scilab: Cleanup more files Nicolas Graves via Guix-patches via
2024-08-29 16:25 ` [bug#72873] [PATCH 3/4] gnu: scilab: Fix the scilab build script Nicolas Graves via Guix-patches via
2024-08-29 16:25 ` [bug#72873] [PATCH 4/4] gnu: scilab: Add sanity-check phase Nicolas Graves via Guix-patches via
2024-10-04 19:28 ` bug#72873: [PATCH 0/4] scilab: Update to 2024.1.0 Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240829162554.28746-1-ngraves@ngraves.fr \
--to=guix-patches@gnu.org \
--cc=72873@debbugs.gnu.org \
--cc=ngraves@ngraves.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).