From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CC3HDX+h0GZVtwAAe85BDQ:P1 (envelope-from ) for ; Thu, 29 Aug 2024 16:27:43 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CC3HDX+h0GZVtwAAe85BDQ (envelope-from ) for ; Thu, 29 Aug 2024 18:27:43 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=OLVLRCwa; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=ag3ux8LW; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1724948863; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=etuPphRgF+0pqo7rfG+J0x/YHiYJ/UA0JLoR4bX2u4U=; b=ijQXDexJofF9SY++mmdUTfsmU9jo20ryFeFrQjxY06s7zTFF/yS2S2aZxNbmI0yY/Lc/NZ 947tSFmmTIknssPAM/rK96CD3Sqwj9IWDM98b7W0O5sZI8V1LFtTxKJvvicefq+ZnQdAus Pq91OlpGRvvMCFvURdTGZ59adAorHBefWPVZ6vYZ5RRP1+oMAKvAWvSkSLQgf9fsSonIsx uE+0+3bOgyI8dS5OMXjwUXCzGI1JzpxWdTDfJeFVg1hsAcoQ/u+bXAKQm84NtCp/I+1F+q 3R/c9MSzvlBoxnjzfsrSLXPZGK52Ntoma9EdzBaZEs72FjQUtxAUUBMMbVwvvA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1724948863; a=rsa-sha256; cv=none; b=cPDUvfOE7rlrfNLNfLv3l7SwckLWFpoMY1wbKS1UabdYiiCq6WeU08XaGrNTNXFPtLLg0M QCS+H8UWJBABXCRqrFHT7jdizRIcCzcM1H8Ii7biu/ATuVKSoEney1hLTulN0YiL85v6Cm 3AWvgpnPzPuBah3QXjBg5MLgd6429UcxPJROtO9nrrUT6zG8fDfy1nfXzWT/bhvyZ3N8Sk I4HcDlpa6GD+yyXO5vpSYFbDIsyGjKZ1mnRFLh5a5az656m9mKU5QkxSy6wc/NQJRAb7XJ ctMuKd5ju2w7zWWqH0BV4YOkCcTykVgXvQtD6rp2kXXZqMur+VJBP7azQivT3Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=OLVLRCwa; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=ag3ux8LW; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5D7FA69361 for ; Thu, 29 Aug 2024 18:27:42 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjhzW-00059L-Ou; Thu, 29 Aug 2024 12:27:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sjhzG-00054W-BV for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sjhzG-0006Is-2T for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=etuPphRgF+0pqo7rfG+J0x/YHiYJ/UA0JLoR4bX2u4U=; b=OLVLRCwah/0R+JuOZfYFwldMKnfC4LoYgyH8gHF87kcY69fvbQwi1KPMFsiSDHTCYSHU9/25d66gaUliOoVUHBqzk08e4TpKwMOAj1v+m2sdGhtxR9X1KAwNG0pyGmBlmxy3Xa4BMF0J+DB4Hn7ljhdIu1lRQaMjnFhYUimgKtGHyiJkiPd66BpwzHrK4MLPrtsUZbY9yKF/rySg9L9wWMhjTg4G3ySOV6wSc7u4cel9Oi5mUufF2CVJqw3tsfp1BsDqbqzbS2WnwnxO3MJ1vI0nr+ThB4p4qzE9Te9H9rEPpTR6fjs8xHquzfTd7PFvFJ8PdbgjXqh8BCV39i+VbA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sji09-0005EU-IB for guix-patches@gnu.org; Thu, 29 Aug 2024 12:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72873] [PATCH 1/4] gnu: scilab: Update to 2024.1.0. References: <20240829150739.19497-1-ngraves@ngraves.fr> In-Reply-To: <20240829150739.19497-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Aug 2024 16:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72873@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 72873-submit@debbugs.gnu.org id=B72873.172494882320000 (code B ref 72873); Thu, 29 Aug 2024 16:28:01 +0000 Received: (at 72873) by debbugs.gnu.org; 29 Aug 2024 16:27:03 +0000 Received: from localhost ([127.0.0.1]:52058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzD-0005CL-5n for submit@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:03 -0400 Received: from 14.mo583.mail-out.ovh.net ([188.165.51.82]:48487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhz8-0005BQ-0H for 72873@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:01 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.2.21]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4WvmqX3Pl7z1WSs for <72873@debbugs.gnu.org>; Thu, 29 Aug 2024 16:26:00 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-hrr4r (unknown [10.111.174.38]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E935C1FD40; Thu, 29 Aug 2024 16:25:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-hrr4r with ESMTPSA id bk0RMBeh0GYCewcAx40tOA (envelope-from ); Thu, 29 Aug 2024 16:25:59 +0000 X-OVh-ClientIp: 80.214.77.241 Date: Thu, 29 Aug 2024 18:25:43 +0200 Message-ID: <20240829162554.28746-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 11608028043704394466 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrudefgedguddttdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeehgfffffdtkeevieehudduleefgfffteethfeuteetleeliedtudffgfduiefgleenucffohhmrghinhepghhithhlrggsrdgtohhmnecukfhppeduvdejrddtrddtrddupdektddrvddugedrjeejrddvgedupdefjedrheelrddugedvrdelheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedvkeejfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=etuPphRgF+0pqo7rfG+J0x/YHiYJ/UA0JLoR4bX2u4U=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1724948760; v=1; b=ag3ux8LW4xQWE5dM6gicwQ+y6Ik7yarsePI8HeiUb/1aD5+3hrqCT/BhCfKiB8aPT+sunSc7 IW6QkLHjyWi+SffhM8cXqRbxhF73xJm7jwqXu0vP0RZc3wcv5laImkjyllhBQnRrcPZg7yK9PAq saavN9X9fYcUHJzyH5nbJ8MXtAZc33Qb7m8wtXeXxBO8UdBK0TdwZvbw4SoBieWoin+As9uLSvi mAWIJiIsE1jkGl9BGa99FOXpI+C22nFNqnkvpLuXIz2z63gF+3sJLu9IMFkVMD4eK0uMPyCU9at +cu5mlnctJTpjLJDKOs5wYpWU0lEEKsBQeCG5/t1V5B7A== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 5D7FA69361 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.48 X-Spam-Score: -6.48 X-TUID: tVvQ7n2HN0We * 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 -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 tag may failed.")); + xmltojar(path, moduletitle, directory_language, default_language); + end ++ end endfunction -- -2.41.0 +2.45.2 -- 2.45.2