From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 8OZsJaMtSGWKTQAAauVa8A:P1 (envelope-from ) for ; Mon, 06 Nov 2023 01:04:51 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8OZsJaMtSGWKTQAAauVa8A (envelope-from ) for ; Mon, 06 Nov 2023 01:04:51 +0100 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 2AE7B44CB6 for ; Mon, 6 Nov 2023 01:04:51 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; 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-Seal: i=1; s=key1; d=yhetil.org; t=1699229091; a=rsa-sha256; cv=none; b=qnP5xu9dZjw2Qa67iTP0l5EzjSUIAjKOp6YjfBlO3/z3Prqwt1E10oiTNVFaUKfhIc94Or 0Z2izb/409y/Jnw4RKQP2yZAeTSqqSiaJV40PUa1Wz3CpHPUhw50ZhPl4ubqxWpviW8pYY F0n+mFOeeK8KjCznrS28adYuVNc2qye3d1DUZHk/tpCcUSU9HJTQXtk5kveYzWDsMgHkXB SjGkVd0UQBpz+nwkqlOI7ErnN0d5myqpLOQm67wmfYEqJ349o0kKRCKOLGAu/Lbj4gdWne ts+3h4N4sa9RhhKgwSPvzRsYLjdrrqtBHv8bUaFZt0o/z7kMVnnu8s2ofjmARw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699229091; 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; bh=io8KO4QTFDFs0CJVGTYfUL32M3KtSKvopoAYBQExm1w=; b=m1FWcxDZCLQgN5YjRuWsDvX2NeY/5s2XYUZW3RFew06juaB9uVboPlfcjSvNpA3WU+CxUy TOR+U14mlyb8OwJh4gJTeboVq29diG7SXzcjIX5A1mpaurfsb5RJdG5eJaMTOd/wLUjrDs 0Ib16K+gRb153ySTnts24ppOtq9jIXm2Q0qOBNBOi0fPqxudf56ffw6BVvDZ4wNZDxPrfb 7+a5oSr18xGiSat44R/pTmyEUDA8xg+Yy+r8NsfrDN/miMGfIT5Fuifp3nhwNWZ1FhDPXr CZ2TAWi7EF4UVMoHgMmVGsUon+CAJII1nS5Uswn1ntm8I/8nzkOxaXCC+ArliA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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 localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6T-0004jq-EB; Sun, 05 Nov 2023 19:04:29 -0500 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 1qzn6R-0004iZ-PM for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 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 1qzn6R-0000Rg-Hh for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn72-0008Vj-HT for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 6/8] gnu: scilab: Update to 2024.0.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908932634 (code B ref 65853); Mon, 06 Nov 2023 00:05:04 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:49 +0000 Received: from localhost ([127.0.0.1]:38408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6m-0008UC-Vf for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:49 -0500 Received: from 6.mo550.mail-out.ovh.net ([46.105.43.205]:36207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6h-0008T6-JP for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:44 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.16.164]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 346AF227BC for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:05 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zngbm (unknown [10.108.16.207]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E84021FD48; Mon, 6 Nov 2023 00:04:04 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-zngbm with ESMTPSA id xfs6NHQtSGW4AQAAKLfG7A (envelope-from ); Mon, 06 Nov 2023 00:04:04 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Mon, 6 Nov 2023 00:51:49 +0100 Message-ID: <20231106000354.32423-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3275524304019579618 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfffhtdejffetgeehteffteduudelhedvveevjefhkeevveetledvuddvleefgeevnecuffhomhgrihhnpegrrhgthhhlihhnuhigrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht 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-Scanner: mx11.migadu.com X-Spam-Score: -4.61 X-Migadu-Queue-Id: 2AE7B44CB6 X-Migadu-Spam-Score: -4.61 X-TUID: MZqdU56Uulnv Change-Id: Ie1af4dc620cee644388f6b8acf88ea50c4148b65 --- gnu/packages/maths.scm | 16 +++-- .../patches/scilab-hdf5-1.8-api.patch | 71 ------------------- 2 files changed, 11 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/scilab-hdf5-1.8-api.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e3045f4fee..ce0b5a8949 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -104,6 +104,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -9525,7 +9526,7 @@ (define-public optizelle (define-public scilab (package (name "scilab") - (version "2023.1.0") + (version "2024.0.0") (source (origin (method git-fetch) @@ -9535,10 +9536,9 @@ (define-public scilab (file-name (git-file-name name version)) (sha256 (base32 - "0hbqsnc67b4f8zc690kl79bwhjaasykjlmqbln8iymnjcn3l5ypd")) + "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) (modules '((guix build utils) (ice-9 ftw))) - (patches (search-patches "scilab-hdf5-1.8-api.patch")) (snippet #~(begin ;; Delete everything except for scilab itself: @@ -9593,7 +9593,7 @@ (define-public scilab "modules/ast/src/cpp/parse/parsescilab.cpp")))))) (build-system gnu-build-system) (native-inputs - (list autoconf + (list autoconf-2.71 autoconf-archive automake bison @@ -9610,8 +9610,9 @@ (define-public scilab curl fftw gettext-minimal - hdf5-1.14 + hdf5-1.10 lapack + libarchive libx11 libxml2 matio @@ -9656,6 +9657,11 @@ (define-public scilab "modules/scicos/src/translator/makefile.mak" "modules/scicos/src/modelica_compiler/makefile.mak") (("nums\\.cmx?a") "")))) + (add-after 'unpack 'fix-linking + (lambda _ + (substitute* "modules/Makefile.am" + (("libscilab_cli_la_LDFLAGS = .*\\)" all) + (string-append all " -lcurl"))))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop diff --git a/gnu/packages/patches/scilab-hdf5-1.8-api.patch b/gnu/packages/patches/scilab-hdf5-1.8-api.patch deleted file mode 100644 index 8b453e4720..0000000000 --- a/gnu/packages/patches/scilab-hdf5-1.8-api.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch fixes the compilation with hdf5 version >= 1.10. Adapted from -https://aur.archlinux.org/cgit/aur.git/plain/hdf5_18_api.patch?h=scilab-git. - -diff -ur a/scilab/modules/hdf5/includes/HDF5Objects.h b/scilab/modules/hdf5/includes/HDF5Objects.h ---- a/scilab/modules/hdf5/includes/HDF5Objects.h -+++ b/scilab/modules/hdf5/includes/HDF5Objects.h -@@ -16,14 +16,12 @@ - #ifndef __HDF5OBJECTS_H__ - #define __HDF5OBJECTS_H__ - --#define H5_NO_DEPRECATED_SYMBOLS - #undef H5_USE_16_API -+#define H5_USE_18_API - --#define H5Eset_auto_vers 2 - #include - #include - --#undef H5_NO_DEPRECATED_SYMBOLS - - //#define __HDF5OBJECTS_DEBUG__ - //#define __HDF5ERROR_PRINT__ -diff -ur a/scilab/modules/hdf5/Makefile.am b/scilab/modules/hdf5/Makefile.am ---- a/scilab/modules/hdf5/Makefile.am -+++ b/scilab/modules/hdf5/Makefile.am -@@ -104,8 +104,7 @@ - -DH5Gopen_vers=2 \ - -DH5Tget_array_dims_vers=2 \ - -DH5Acreate_vers=2 \ -- -DH5Rdereference_vers=2 \ -- -DNO_DEPRECATED_SYMBOLS -+ -DH5Rdereference_vers=2 - - - libscihdf5_la_CPPFLAGS = \ -diff -ur a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp ---- a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp -+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp -@@ -13,6 +13,8 @@ - * - */ - -+#define H5_USE_18_API -+ - #include - #include "function.hxx" - #include "string.hxx" -diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile.c b/scilab/modules/hdf5/src/c/h5_readDataFromFile.c ---- a/scilab/modules/hdf5/src/c/h5_readDataFromFile.c -+++ b/scilab/modules/hdf5/src/c/h5_readDataFromFile.c -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include -diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c b/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c ---- a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c -+++ b/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include -- 2.41.0