From unknown Sat Sep 06 09:27:34 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66201] [PATCH 0/2] Update scilab and remove suitesparse-3. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Sep 2023 21:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66201@debbugs.gnu.org Cc: David Elsing X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169567576721556 (code B ref -1); Mon, 25 Sep 2023 21:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2023 21:02:47 +0000 Received: from localhost ([127.0.0.1]:46775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksj8-0005bb-Lx for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:02:46 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksj3-0005bM-I7 for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:02:44 -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 1qksij-0005EV-DU for guix-patches@gnu.org; Mon, 25 Sep 2023 17:02:23 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qksih-0002AN-9S for guix-patches@gnu.org; Mon, 25 Sep 2023 17:02:21 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C4574240103 for ; Mon, 25 Sep 2023 23:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695675735; bh=WgCIE1n6XbeaDrKelr9C4BXcTST4KMcTVM2LbSDEhvI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=eHS7j6ciHEm1UuCZkbp8NAJV314hBRnUIzHaL9dux+oQEM8a54T7hNGno7cjRcCUS ORIamTwOJheH8srlevSwvo0sHljJLFlZXVNwzggaj9dULZ6mVqhk9RcKv7B4Qy+G7x j6NBB3NlzZu5z78l50D2wkw9gGHQI7OcJWiLOvr0UA8KPEWd/uB8wFh75jI/aHNmRF oN1RXzXjUJOFLhUAlsCFPmm/A6W5Qe48IO+jp+Jfc19xHx+Z0dEceSXOWVs+Map6DB ymOWQc7CKNKk1eJcmhWVol7LGrDLFx81aVrTXqn9pefvhlE++oim0wCpym01vUHeau VTNvD6rJk05rg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Rvb0l2FsKz9s08; Mon, 25 Sep 2023 23:02:15 +0200 (CEST) From: David Elsing Date: Mon, 25 Sep 2023 21:00:59 +0000 Message-ID: <20230925210126.8730-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=david.elsing@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) There are a lot of autogenerated files, so the snippet became rather large. As the Java parts depend on some libraries not packaged in Guix (such as jogl or saxon), I kept them disabled. David Elsing (2): gnu: scilab: Update to 2023.1.0. gnu: Remove suitesparse-3. gnu/packages/maths.scm | 345 +++++++++--------- .../patches/scilab-hdf5-1.8-api.patch | 71 ++++ 2 files changed, 236 insertions(+), 180 deletions(-) create mode 100644 gnu/packages/patches/scilab-hdf5-1.8-api.patch -- 2.41.0 From unknown Sat Sep 06 09:27:34 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66201] [PATCH 1/2] gnu: scilab: Update to 2023.1.0. References: <20230925210126.8730-1-david.elsing@posteo.net> In-Reply-To: <20230925210126.8730-1-david.elsing@posteo.net> Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Sep 2023 21:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66201@debbugs.gnu.org Cc: David Elsing Received: via spool by 66201-submit@debbugs.gnu.org id=B66201.169567644722639 (code B ref 66201); Mon, 25 Sep 2023 21:15:01 +0000 Received: (at 66201) by debbugs.gnu.org; 25 Sep 2023 21:14:07 +0000 Received: from localhost ([127.0.0.1]:46783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksu5-0005t4-VV for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:14:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkstz-0005sF-UL for 66201@debbugs.gnu.org; Mon, 25 Sep 2023 17:14:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1A630240101 for <66201@debbugs.gnu.org>; Mon, 25 Sep 2023 23:13:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695676421; bh=PfSurJbseia7WWYc3V9shB/UZpGL02AR5H9eaRREhGQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Ov3aWsMh6pwzWWZTFkfdpNCQ/bh8b5dBEYfIRcWVFW5R6QOQl5Ww8S2PnlVtW61Gn JMN0bzCLbeGFmqN11Y7gQLK/YF7HvmIUHDlWZUqqdT/s9pURehtLRV5rJEecDLRtzC Pt8k2t6v3MtfOnojqMGvCn7FUH09H9XFqWbH6KcFLcFYso1c+/ZE3XM8C94NV+qSVY iiBT+10ZfQ4fcsJ7RWYnFv5R3Zjapt9RZ3FAjQim92kuikCmKZ/ddAgFxIyPnrZeuA swPsuvjlu1jitrltbTsn17a/b6QObHxt1tLL3nq0/2ti/E3/iakYQ9yEBZAmyeFc3N 5ymo/0PdTE8WQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RvbFw466Nz9ryV; Mon, 25 Sep 2023 23:13:40 +0200 (CEST) From: David Elsing Date: Mon, 25 Sep 2023 21:13:12 +0000 Message-ID: <20230925211319.9698-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (scilab): Update to 2023.1.0. [source] Use git-fetch. : Add (guix build utils) and (ice-9 ftw). : Add patch for hdf5 >= 1.10. : Move contents of the "scilab" directory to its parents. Remove the other files and autogenerated files. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, eigen, flex, libtool, ocaml and ocaml-findlib. [inputs]: Add ocaml-num, replace hdf5-1.8 by hdf5-1.14 and suitesparse-3 by suitesparse. [arguments]: Remove quasiquote. Add --enable-build-parser, --with-eigen-include=..., OCAMLC=... and OCAMLOPT=... to #:configure-flags. <#:phases>: Add fix-ocaml-num, remove-desktop-files, bootstrap-dynamic_link-scripts and build-parsers phases. Remove fixes for compilation and linker errors from the pre-build phase. [home-page]: Update URL. [description]: Add two spaces between sentences. [license]: Update to gpl2 and bsd-3. --- gnu/packages/maths.scm | 256 +++++++++++------- .../patches/scilab-hdf5-1.8-api.patch | 71 +++++ 2 files changed, 236 insertions(+), 91 deletions(-) create mode 100644 gnu/packages/patches/scilab-hdf5-1.8-api.patch diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 62d4adfbd1..ff50a99599 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2023 Jake Leporte ;;; Copyright © 2023 Camilo Q.S. (Distopico) +;;; Copyright © 2023 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -8422,112 +8423,185 @@ (define-public optizelle (define-public scilab (package (name "scilab") - (version "5.5.2") + (version "2023.1.0") (source (origin - (method url-fetch) - (uri - (string-append "https://www.scilab.org/download/" - version "/scilab-" version "-src.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/scilab/scilab") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0phg9pn24yw98hbh475ik84dnikf1225b2knh7qbhdbdx6fm2d57")))) + (base32 + "0hbqsnc67b4f8zc690kl79bwhjaasykjlmqbln8iymnjcn3l5ypd")) + (modules '((guix build utils) + (ice-9 ftw))) + (patches (search-patches "scilab-hdf5-1.8-api.patch")) + (snippet + #~(begin + (for-each + (lambda (file) + (unless (member file '("." ".." "scilab")) + (delete-file-recursively file))) + (scandir ".")) + (for-each + (lambda (file) + (unless (member file '("." "..")) + (rename-file (string-append "scilab/" file) file))) + (scandir "scilab")) + (delete-file-recursively "scilab") + (delete-file "aclocal.m4") + (for-each + delete-file + (find-files "." "^Makefile\\.in$")) + (delete-file-recursively "config") + (delete-file "configure") + (delete-file-recursively "libs/GetWindowsVersion") + (delete-file "m4/ax_cxx_compile_stdcxx.m4") + (delete-file "m4/lib-ld.m4") + (delete-file "m4/libtool.m4") + (delete-file "m4/ltoptions.m4") + (delete-file "m4/ltsugar.m4") + (delete-file "m4/ltversion.m4") + (delete-file "m4/lt~obsolete.m4") + (delete-file "m4/pkg.m4") + (for-each + (lambda (file) + (delete-file + (string-append "modules/dynamic_link/src/scripts/" file))) + '("aclocal.m4" + "configure" + "compile" + "config.guess" + "config.sub" + "ltmain.sh" + "depcomp" + "install-sh" + "missing")) + (delete-file-recursively "modules/dynamic_link/src/scripts/m4") + (delete-file "modules/ast/src/cpp/parse/scanscilab.cpp") + (delete-file "modules/ast/src/cpp/parse/bison/parsescilab.output") + (delete-file "modules/ast/includes/parse/parsescilab.hxx") + (delete-file "modules/ast/src/cpp/parse/parsescilab.cpp"))))) (build-system gnu-build-system) - (native-inputs (list pkg-config gfortran)) - (inputs (list libxml2 - `(,pcre "bin") + (native-inputs + (list autoconf + autoconf-archive + automake + bison + eigen + flex + gfortran + libtool + ocaml + ocaml-findlib + pkg-config)) + (inputs (list `(,pcre "bin") `(,pcre "out") - readline - hdf5-1.8 - curl - openblas - lapack + libxml2 arpack-ng + curl fftw gettext-minimal - suitesparse-3 - tcl - tk + hdf5-1.14 + lapack libx11 - matio)) + matio + ocaml-num + openblas + readline + suitesparse + tcl + tk)) (arguments - `(#:tests? #f - #:configure-flags - ,#~(list - "--enable-relocatable" - "--disable-static-system-lib" - ;; Disable all java code. - "--without-gui" - "--without-javasci" - "--disable-build-help" - "--with-external-scirenderer" - ;; Tcl and Tk library locations. - (string-append "--with-tcl-include=" - (string-drop-right - (search-input-file %build-inputs "include/tcl.h") - (string-length "/tcl.h"))) - (string-append "--with-tcl-library=" - (string-drop-right - (search-input-directory %build-inputs "lib/tcl8") - (string-length "/tcl8"))) - (string-append "--with-tk-include=" - (string-drop-right - (search-input-file %build-inputs "include/tk.h") - (string-length "/tk.h"))) - (string-append "--with-tk-library=" - (string-drop-right - (search-input-directory %build-inputs "lib/tk8.6") - (string-length "/tk8.6"))) - ;; There are some 2018-fortran errors that are ignored - ;; with this fortran compiler flag. - "FFLAGS=-fallow-argument-mismatch") - #:phases - ,#~(modify-phases %standard-phases - (add-before 'build 'pre-build - (lambda _ - ;; Fix scilab script. - (substitute* "bin/scilab" - (("\\/bin\\/ls") - (which "ls"))) - ;; Fix core.start. - (substitute* "modules/core/etc/core.start" - (("'SCI/modules") - "SCI+'/modules")) - ;; Fix fortran compilation error. - (substitute* - "modules/differential_equations/src/fortran/twodq.f" - (("node\\(10\\),node1\\(10\\),node2\\(10\\),coef") - "node(9),node1(9),node2(9),coef")) - ;; Fix C compilation errors. - ;; remove & - (substitute* "modules/hdf5/src/c/h5_readDataFromFile_v1.c" - (("(H5Rdereference\\(_iDatasetId, H5R_OBJECT, )&(.*)\\);$" - all common ref) - (string-append common ref))) - ;; fix multiple definitions - (substitute* "modules/tclsci/src/c/TCL_Command.h" - (("^__thread") - "extern __thread")) - (substitute* "modules/tclsci/src/c/InitTclTk.c" - (("BOOL TK_Started = FALSE;" all) - (string-append all "\n" - "__threadId TclThread;" "\n" - "__threadSignal InterpReady;" "\n" - "__threadSignalLock InterpReadyLock;" - "\n"))) - ;; Fix CPP compilation errors. - (substitute* "modules/output_stream/src/cpp/diary_manager.cpp" - (("if \\(array_size > 0\\)") - "if (*array_size > 0)")) - ;; Set SCIHOME to /tmp before macros compilation. - (setenv "SCIHOME" "/tmp")))))) - (home-page "https://scilab.org") + (list + ;; The tests require java code. + #:tests? #f + #:configure-flags + #~(list + "--enable-relocatable" + "--disable-static-system-lib" + "--enable-build-parser" + ;; Disable all java code. + "--without-gui" + "--without-javasci" + "--disable-build-help" + "--with-external-scirenderer" + ;; Tcl and Tk library locations. + (string-append "--with-tcl-include=" + (string-drop-right + (search-input-file %build-inputs "include/tcl.h") + (string-length "/tcl.h"))) + (string-append "--with-tcl-library=" + (string-drop-right + (search-input-directory %build-inputs "lib/tcl8") + (string-length "/tcl8"))) + (string-append "--with-tk-include=" + (string-drop-right + (search-input-file %build-inputs "include/tk.h") + (string-length "/tk.h"))) + (string-append "--with-tk-library=" + (string-drop-right + (search-input-directory %build-inputs "lib/tk8.6") + (string-length "/tk8.6"))) + (string-append "--with-eigen-include=" + #$(this-package-native-input "eigen") + "/include/eigen3") + ;; Find and link to the OCaml Num package + "OCAMLC=ocamlfind ocamlc -package num" + "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg" + ;; There are some 2018-fortran errors that are ignored + ;; with this fortran compiler flag. + "FFLAGS=-fallow-argument-mismatch") + #:phases + #~(modify-phases %standard-phases + ;; The Num library is specified with the OCAMLC and + ;; OCAMLOPT variables above. + (add-after 'unpack 'fix-ocaml-num + (lambda _ + (substitute* + '("modules/scicos/Makefile.modelica.am" + "modules/scicos/src/translator/makefile.mak" + "modules/scicos/src/modelica_compiler/makefile.mak") + (("nums\\.cmx?a") "")))) + ;; Install only scilab-cli.desktop + (add-after 'unpack 'remove-desktop-files + (lambda _ + (substitute* "desktop/Makefile.am" + (("desktop_DATA =") + "desktop_DATA = scilab-cli.desktop\nDUMMY =")))) + ;; These generated files are assumed to be present during + ;; the build. + (add-after 'bootstrap 'bootstrap-dynamic_link-scripts + (lambda _ + (with-directory-excursion "modules/dynamic_link/src/scripts" + (invoke "autoreconf" "-i")))) + (add-before 'build 'pre-build + (lambda _ + ;; Fix scilab script. + (substitute* "bin/scilab" + (("\\/bin\\/ls") + (which "ls"))) + ;; Fix core.start. + (substitute* "modules/core/etc/core.start" + (("'SCI/modules") + "SCI+'/modules")) + ;; Set SCIHOME to /tmp before macros compilation. + (setenv "SCIHOME" "/tmp"))) + ;; Prevent race condition + (add-after 'pre-build 'build-parsers + (lambda _ + (with-directory-excursion "modules/ast" + (invoke "make" "src/cpp/parse/parsescilab.cpp" + "src/cpp/parse/scanscilab.cpp"))))))) + (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab -software for engineers and scientists. Scilab is used for signal processing, +software for engineers and scientists. Scilab is used for signal processing, statistical analysis, image enhancement, fluid dynamics simulations, numerical optimization, and modeling, simulation of explicit and implicit dynamical systems and symbolic manipulations.") - (license license:cecill))) ;CeCILL v2.1 + (license (list license:gpl2 license:bsd-3)))) (define-public ruy (let ((commit "caa244343de289f913c505100e6a463d46c174de") diff --git a/gnu/packages/patches/scilab-hdf5-1.8-api.patch b/gnu/packages/patches/scilab-hdf5-1.8-api.patch new file mode 100644 index 0000000000..8b453e4720 --- /dev/null +++ b/gnu/packages/patches/scilab-hdf5-1.8-api.patch @@ -0,0 +1,71 @@ +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 From unknown Sat Sep 06 09:27:34 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66201] [PATCH 2/2] gnu: Remove suitesparse-3. References: <20230925210126.8730-1-david.elsing@posteo.net> In-Reply-To: <20230925210126.8730-1-david.elsing@posteo.net> Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Sep 2023 21:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66201@debbugs.gnu.org Cc: David Elsing Received: via spool by 66201-submit@debbugs.gnu.org id=B66201.169567645022649 (code B ref 66201); Mon, 25 Sep 2023 21:15:02 +0000 Received: (at 66201) by debbugs.gnu.org; 25 Sep 2023 21:14:10 +0000 Received: from localhost ([127.0.0.1]:46785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksu9-0005tF-W4 for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:14:10 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksu1-0005sI-Dz for 66201@debbugs.gnu.org; Mon, 25 Sep 2023 17:14:05 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 35B87240101 for <66201@debbugs.gnu.org>; Mon, 25 Sep 2023 23:13:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695676423; bh=rUTYOt2jTqtd6LmLlYT/A3H2BTiar7mkdEJC8o61jb8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=L0hg90028OsDE/fZBLT6vxtDy3Quf8kZP1My+l00JW+BKXydXBS3z1spsuBlnngRi I7AjZHg4BhjGpvONxd16IyuuDkZC40433hntZsVz/pThqbidCSR3/+jkz5EVg/svJY zMlJFixQhHTto2xV3qJigE4wOOjkwWvGwbsOOS//LAGMeSIariSZ6mVn2KadfUwsyN taySEQrxhylQcRJIMQ4pXLwzkm5nYR7wKIpCYZvtdHt+PzTHShsWZV9g4uUJXtnNxa m3WN0OSQ1xQ4GtS3MqRTAd+Z64eEgW4aJl4nbEo7T6fpHPTzF7pLSjXT+k6MECv9eG tYz16gzw7bCxw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RvbFy5hmGz9ryV; Mon, 25 Sep 2023 23:13:42 +0200 (CEST) From: David Elsing Date: Mon, 25 Sep 2023 21:13:13 +0000 Message-ID: <20230925211319.9698-2-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/maths.scm (suitesparse-3): Delete variable. --- gnu/packages/maths.scm | 89 ------------------------------------------ 1 file changed, 89 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ff50a99599..b2446f23c9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4965,95 +4965,6 @@ (define-public suitesparse ;; GPUQREngine, RBio, SuiteSparse_GPURuntime, SuiteSparseQR, UMFPACK (license (list license:gpl2+ license:lgpl2.1+)))) - -;; This outdated version is used to build the scilab package. -(define-public suitesparse-3 - (package - (inherit suitesparse) - (name "suitesparse") - (version "3.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DrTimothyAldenDavis/SuiteSparse") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0wxk755nzps0c9la24zqknqkzjp6rcj5q9jhd973mff1pqja3clz")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ;no "check" target - #:make-flags - ,#~(list - (string-append "CC=gcc") - "AR=gcc -shared -o" - "RANLIB=touch" - "CFLAGS=-O3 -fPIC -I../Include" - "TBB=-ltbb" - - ;; Disable metis@4 (nonfree) support. - "CHOLMOD_CONFIG=-DNPARTITION" - "METIS=" - "METIS_PATH=" - - ;; The default is to link against netlib lapack. Use OpenBLAS - ;; instead. - "BLAS=-lopenblas" "LAPACK=-lopenblas" - - (string-append "INSTALL_LIB=" - (assoc-ref %outputs "out") "/lib") - (string-append "INSTALL_INCLUDE=" - (assoc-ref %outputs "out") "/include") - "library") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'correct-build-configuration - (lambda _ - ;; Invert build order: CHOLMOD before KLU. - (substitute* "Makefile" - (("\t\\( cd CHOLMOD ; \\$\\(MAKE\\) \\)\n$") - "") - (("\\( cd KLU ; \\$\\(MAKE\\) \\)") - (string-append "( cd CHOLMOD ; $(MAKE) )\n\t" - "( cd KLU ; $(MAKE) )"))) - ;; Build shared libraries. - (substitute* (find-files "." "akefile$") - (("lib([a-z]+)\\.a" all libname) - (string-append "lib" libname ".so"))) - ;; Delete broken KLU Demo step. - (substitute* "KLU/Makefile" - (("\\( cd Demo ; \\$\\(MAKE\\) \\)") - "")))) - (replace 'install - (lambda _ - ;; Install libraries. - (for-each - (lambda (x) - (install-file - x - (string-append (assoc-ref %outputs "out") "/lib"))) - (find-files "." "\\.so$")) - ;; Install header files. - (for-each - (lambda (x) - (install-file - x - (string-append (assoc-ref %outputs "out") "/include"))) - (find-files "." "\\.h$")))) - ,@(if (target-riscv64?) - ;; GraphBLAS FTBFS on riscv64-linux - `((add-after 'unpack 'skip-graphblas - (lambda _ - (substitute* "Makefile" - ((".*cd GraphBLAS.*") "") - (("metisinstall gbinstall moninstall") - "moninstall"))))) - '()) - (delete 'configure)))) ;no configure script - (inputs - (list tbb openblas gmp mpfr)))) - (define-public atlas (package (name "atlas") -- 2.41.0 From unknown Sat Sep 06 09:27:34 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: David Elsing Subject: bug#66201: closed (Re: [bug#66201] [PATCH 1/2] gnu: scilab: Update to 2023.1.0.) Message-ID: References: <20230925210126.8730-1-david.elsing@posteo.net> X-Gnu-PR-Message: they-closed 66201 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 66201@debbugs.gnu.org Date: Wed, 04 Oct 2023 15:02:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1696431722-24382-1" This is a multi-part message in MIME format... ------------=_1696431722-24382-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #66201: [PATCH 0/2] Update scilab and remove suitesparse-3. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 66201@debbugs.gnu.org. --=20 66201: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D66201 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1696431722-24382-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 66201-done) by debbugs.gnu.org; 4 Oct 2023 15:01:06 +0000 Received: from localhost ([127.0.0.1]:45161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo3N3-0006Jy-MA for submit@debbugs.gnu.org; Wed, 04 Oct 2023 11:01:06 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:60692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo3My-00067b-5a for 66201-done@debbugs.gnu.org; Wed, 04 Oct 2023 11:01:05 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso420267966b.1 for <66201-done@debbugs.gnu.org>; Wed, 04 Oct 2023 08:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696431636; x=1697036436; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=zBilmuhnTCwZHp0oStM8Wmdc0KHflKdrzqb3xQ4FIfI=; b=WwNSWxoK0Vo/jcY04b7V/8Dzi+YUi78dhoa996QvksBNj8DtWqMzUDoDsUaf3tNvWf 8dyR0wURcQ/HYAY21jZheDdNQ512WbNJycaBP0IwzHcLc/JEoOMt+qbR23KupA/5puyr u6ExXj4S4JwfsOehp4Ircj+5TJxVwTG0RI7TivTD52WGvzcE8za2d2DtpzCRTbW/+ZHB PyNwVwVwBsMBO3utQDLrabMNIH7mO1/MNM5cNqt9aQTDJSMVyps08ojbz8nZauxsUTgn W+d5jsIEoHaqh5+17ho6BS08BezFbztt6dd84+jiMRr5GUy08ZiULBRSl6KKCqPXC072 Xj9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696431636; x=1697036436; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zBilmuhnTCwZHp0oStM8Wmdc0KHflKdrzqb3xQ4FIfI=; b=sqbPb8EJeYPf5KOF8ifTHv5XGoB3MfR09h5jvbeSSSng1cJkSNZJcYigMihIOZa7un BqLueF0NFbEX7+7NTaHZhuALWrklbaquCPCMGjDcCHKNJAosH/sGOrujmUXPVPXYchGo YsdQgjEwOkjRXUYvAgzmCc7pYwXGMDqIONXKAdnvKHrYy9kUYYYHU1dRywhZmBrNzOh7 nmQJzQ3lPC9/wPakadIcxleqM2L4uRUIrNrgOtWyWdc7Ous0zy4JeN+De1cVQu4GeGrj a7qtpEzRd3LAb4aKC+ItHK0xfQfjJ2PifMvpRTXBcBiygB3j2Ol5xzmki46Je8FE/6zb fmKQ== X-Gm-Message-State: AOJu0YxWAtj7Ih5gzUvnpWVMzaDrkmHBi8PuIi2wars60OR9M4exvExK Y3L/jSrogdt+qzIhZV2iw0tWb47zcqnRug== X-Google-Smtp-Source: AGHT+IEdimTHcRDS14QezeZu6Mpmq3SSorhb23W53h008e3Rf7P/rSKr8OX3Xnoz3hKMV94avSU8mw== X-Received: by 2002:a17:906:51d1:b0:9ae:4843:66ee with SMTP id v17-20020a17090651d100b009ae484366eemr2108751ejk.36.1696431636306; Wed, 04 Oct 2023 08:00:36 -0700 (PDT) Received: from localhost ([2a02:ed3:916:6300:c3db:b80e:a694:a54f]) by smtp.gmail.com with ESMTPSA id m4-20020a170906258400b0099cd1c0cb21sm2891955ejb.129.2023.10.04.08.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 08:00:35 -0700 (PDT) Date: Wed, 4 Oct 2023 18:00:34 +0300 From: Efraim Flashner To: David Elsing Subject: Re: [bug#66201] [PATCH 1/2] gnu: scilab: Update to 2023.1.0. Message-ID: Mail-Followup-To: Efraim Flashner , David Elsing , 66201-done@debbugs.gnu.org References: <20230925210126.8730-1-david.elsing@posteo.net> <20230925211319.9698-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="012WnWYmSxVZoU7+" Content-Disposition: inline In-Reply-To: <20230925211319.9698-1-david.elsing@posteo.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 66201-done Cc: 66201-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --012WnWYmSxVZoU7+ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks. Patch pushed, with a couple of comments below: On Mon, Sep 25, 2023 at 09:13:12PM +0000, David Elsing wrote: > * gnu/packages/maths.scm (scilab): Update to 2023.1.0. > [source] Use git-fetch. > : Add (guix build utils) and (ice-9 ftw). > : Add patch for hdf5 >=3D 1.10. > : Move contents of the "scilab" directory to its parents. Remove > the other files and autogenerated files. > [native-inputs]: Add autoconf, autoconf-archive, automake, bison, eigen, = flex, > libtool, ocaml and ocaml-findlib. > [inputs]: Add ocaml-num, replace hdf5-1.8 by hdf5-1.14 and suitesparse-3 = by > suitesparse. > [arguments]: Remove quasiquote. Add --enable-build-parser, > --with-eigen-include=3D..., OCAMLC=3D... and OCAMLOPT=3D... to #:configur= e-flags. > <#:phases>: Add fix-ocaml-num, remove-desktop-files, > bootstrap-dynamic_link-scripts and build-parsers phases. Remove fixes for > compilation and linker errors from the pre-build phase. > [home-page]: Update URL. > [description]: Add two spaces between sentences. > [license]: Update to gpl2 and bsd-3. > --- > gnu/packages/maths.scm | 256 +++++++++++------- > .../patches/scilab-hdf5-1.8-api.patch | 71 +++++ > 2 files changed, 236 insertions(+), 91 deletions(-) > create mode 100644 gnu/packages/patches/scilab-hdf5-1.8-api.patch >=20 > diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm > index 62d4adfbd1..ff50a99599 100644 > --- a/gnu/packages/maths.scm > +++ b/gnu/packages/maths.scm > @@ -61,6 +61,7 @@ > ;;; Copyright =C2=A9 2022 Roman Scherer > ;;; Copyright =C2=A9 2023 Jake Leporte > ;;; Copyright =C2=A9 2023 Camilo Q.S. (Distopico) > +;;; Copyright =C2=A9 2023 David Elsing > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -8422,112 +8423,185 @@ (define-public optizelle > (define-public scilab > (package > (name "scilab") > - (version "5.5.2") > + (version "2023.1.0") > (source > (origin > - (method url-fetch) > - (uri > - (string-append "https://www.scilab.org/download/" > - version "/scilab-" version "-src.tar.gz")) > + (method git-fetch) > + (uri (git-reference > + (url "https://gitlab.com/scilab/scilab") > + (commit version))) > + (file-name (git-file-name name version)) > (sha256 > - (base32 "0phg9pn24yw98hbh475ik84dnikf1225b2knh7qbhdbdx6fm2d57"))= )) > + (base32 > + "0hbqsnc67b4f8zc690kl79bwhjaasykjlmqbln8iymnjcn3l5ypd")) > + (modules '((guix build utils) > + (ice-9 ftw))) > + (patches (search-patches "scilab-hdf5-1.8-api.patch")) > + (snippet Wow, that is a big snippet. I added some comments and grouped up some repetitive commands with a for-each. > + #~(begin > + (for-each > + (lambda (file) > + (unless (member file '("." ".." "scilab")) > + (delete-file-recursively file))) > + (scandir ".")) > + (for-each > + (lambda (file) > + (unless (member file '("." "..")) > + (rename-file (string-append "scilab/" file) file))) > + (scandir "scilab")) > + (delete-file-recursively "scilab") > + (delete-file "aclocal.m4") > + (for-each > + delete-file > + (find-files "." "^Makefile\\.in$")) > + (delete-file-recursively "config") > + (delete-file "configure") > + (delete-file-recursively "libs/GetWindowsVersion") > + (delete-file "m4/ax_cxx_compile_stdcxx.m4") > + (delete-file "m4/lib-ld.m4") > + (delete-file "m4/libtool.m4") > + (delete-file "m4/ltoptions.m4") > + (delete-file "m4/ltsugar.m4") > + (delete-file "m4/ltversion.m4") > + (delete-file "m4/lt~obsolete.m4") > + (delete-file "m4/pkg.m4") > + (for-each > + (lambda (file) > + (delete-file > + (string-append "modules/dynamic_link/src/scripts/" file)= )) > + '("aclocal.m4" > + "configure" > + "compile" > + "config.guess" > + "config.sub" > + "ltmain.sh" > + "depcomp" > + "install-sh" > + "missing")) > + (delete-file-recursively "modules/dynamic_link/src/scripts/m= 4") > + (delete-file "modules/ast/src/cpp/parse/scanscilab.cpp") > + (delete-file "modules/ast/src/cpp/parse/bison/parsescilab.ou= tput") > + (delete-file "modules/ast/includes/parse/parsescilab.hxx") > + (delete-file "modules/ast/src/cpp/parse/parsescilab.cpp"))))) > (build-system gnu-build-system) > - (native-inputs (list pkg-config gfortran)) > - (inputs (list libxml2 > - `(,pcre "bin") > + (native-inputs > + (list autoconf > + autoconf-archive > + automake > + bison > + eigen > + flex > + gfortran > + libtool > + ocaml > + ocaml-findlib > + pkg-config)) > + (inputs (list `(,pcre "bin") > `(,pcre "out") > - readline > - hdf5-1.8 > - curl > - openblas > - lapack > + libxml2 > arpack-ng > + curl > fftw > gettext-minimal > - suitesparse-3 > - tcl > - tk > + hdf5-1.14 > + lapack > libx11 > - matio)) > + matio > + ocaml-num > + openblas > + readline > + suitesparse > + tcl > + tk)) > (arguments > - `(#:tests? #f > - #:configure-flags > - ,#~(list > - "--enable-relocatable" > - "--disable-static-system-lib" > - ;; Disable all java code. > - "--without-gui" > - "--without-javasci" > - "--disable-build-help" > - "--with-external-scirenderer" > - ;; Tcl and Tk library locations. > - (string-append "--with-tcl-include=3D" > - (string-drop-right > - (search-input-file %build-inputs "include/tcl= =2Eh") > - (string-length "/tcl.h"))) > - (string-append "--with-tcl-library=3D" > - (string-drop-right > - (search-input-directory %build-inputs "lib/tc= l8") > - (string-length "/tcl8"))) > - (string-append "--with-tk-include=3D" > - (string-drop-right > - (search-input-file %build-inputs "include/tk.= h") > - (string-length "/tk.h"))) > - (string-append "--with-tk-library=3D" > - (string-drop-right > - (search-input-directory %build-inputs "lib/tk= 8.6") > - (string-length "/tk8.6"))) > - ;; There are some 2018-fortran errors that are ignored > - ;; with this fortran compiler flag. > - "FFLAGS=3D-fallow-argument-mismatch") > - #:phases > - ,#~(modify-phases %standard-phases > - (add-before 'build 'pre-build > - (lambda _ > - ;; Fix scilab script. > - (substitute* "bin/scilab" > - (("\\/bin\\/ls") > - (which "ls"))) > - ;; Fix core.start. > - (substitute* "modules/core/etc/core.start" > - (("'SCI/modules") > - "SCI+'/modules")) > - ;; Fix fortran compilation error. > - (substitute* > - "modules/differential_equations/src/fortran/twodq.f" > - (("node\\(10\\),node1\\(10\\),node2\\(10\\),coef") > - "node(9),node1(9),node2(9),coef")) > - ;; Fix C compilation errors. > - ;; remove & > - (substitute* "modules/hdf5/src/c/h5_readDataFromFile_v1.= c" > - (("(H5Rdereference\\(_iDatasetId, H5R_OBJECT, )&(.*)\\= );$" > - all common ref) > - (string-append common ref))) > - ;; fix multiple definitions > - (substitute* "modules/tclsci/src/c/TCL_Command.h" > - (("^__thread") > - "extern __thread")) > - (substitute* "modules/tclsci/src/c/InitTclTk.c" > - (("BOOL TK_Started =3D FALSE;" all) > - (string-append all "\n" > - "__threadId TclThread;" "\n" > - "__threadSignal InterpReady;" "\n" > - "__threadSignalLock InterpReadyLock;" > - "\n"))) > - ;; Fix CPP compilation errors. > - (substitute* "modules/output_stream/src/cpp/diary_manage= r.cpp" > - (("if \\(array_size > 0\\)") > - "if (*array_size > 0)")) > - ;; Set SCIHOME to /tmp before macros compilation. > - (setenv "SCIHOME" "/tmp")))))) > - (home-page "https://scilab.org") > + (list > + ;; The tests require java code. > + #:tests? #f > + #:configure-flags > + #~(list > + "--enable-relocatable" > + "--disable-static-system-lib" > + "--enable-build-parser" > + ;; Disable all java code. > + "--without-gui" > + "--without-javasci" > + "--disable-build-help" > + "--with-external-scirenderer" > + ;; Tcl and Tk library locations. > + (string-append "--with-tcl-include=3D" Here I've used dirname, so the following 3 lines become: (dirname (search-input-file %build-inputs "include/tcl.h")) > + (string-drop-right > + (search-input-file %build-inputs "include/tcl.h= ") > + (string-length "/tcl.h"))) > + (string-append "--with-tcl-library=3D" > + (string-drop-right > + (search-input-directory %build-inputs "lib/tcl8= ") > + (string-length "/tcl8"))) > + (string-append "--with-tk-include=3D" > + (string-drop-right > + (search-input-file %build-inputs "include/tk.h") > + (string-length "/tk.h"))) > + (string-append "--with-tk-library=3D" > + (string-drop-right > + (search-input-directory %build-inputs "lib/tk8.= 6") > + (string-length "/tk8.6"))) > + (string-append "--with-eigen-include=3D" While I was at it I changed this one to also use search-input-directory, so we can replace eigen if desired (--with-input=3Deigen=3Dmy-eigen) and still keep the flag working. > + #$(this-package-native-input "eigen") > + "/include/eigen3") > + ;; Find and link to the OCaml Num package > + "OCAMLC=3Docamlfind ocamlc -package num" > + "OCAMLOPT=3Docamlfind ocamlopt -package num -linkpkg" > + ;; There are some 2018-fortran errors that are ignored > + ;; with this fortran compiler flag. > + "FFLAGS=3D-fallow-argument-mismatch") > + #:phases > + #~(modify-phases %standard-phases > + ;; The Num library is specified with the OCAMLC and > + ;; OCAMLOPT variables above. > + (add-after 'unpack 'fix-ocaml-num > + (lambda _ > + (substitute* > + '("modules/scicos/Makefile.modelica.am" > + "modules/scicos/src/translator/makefile.mak" > + "modules/scicos/src/modelica_compiler/makefile.mak") > + (("nums\\.cmx?a") "")))) > + ;; Install only scilab-cli.desktop > + (add-after 'unpack 'remove-desktop-files > + (lambda _ > + (substitute* "desktop/Makefile.am" > + (("desktop_DATA =3D") > + "desktop_DATA =3D scilab-cli.desktop\nDUMMY =3D")))) > + ;; These generated files are assumed to be present during > + ;; the build. > + (add-after 'bootstrap 'bootstrap-dynamic_link-scripts > + (lambda _ > + (with-directory-excursion "modules/dynamic_link/src/script= s" I changed the invoke line to: ((assoc-ref %standard-phases 'bootstrap)) > + (invoke "autoreconf" "-i")))) > + (add-before 'build 'pre-build > + (lambda _ > + ;; Fix scilab script. > + (substitute* "bin/scilab" > + (("\\/bin\\/ls") > + (which "ls"))) I'm not sure if scilab can be cross-compiled, but we want to use search-input instead of (which "ls"), so we get the one for the correct architecture. > + ;; Fix core.start. > + (substitute* "modules/core/etc/core.start" > + (("'SCI/modules") > + "SCI+'/modules")) > + ;; Set SCIHOME to /tmp before macros compilation. > + (setenv "SCIHOME" "/tmp"))) > + ;; Prevent race condition > + (add-after 'pre-build 'build-parsers > + (lambda _ > + (with-directory-excursion "modules/ast" > + (invoke "make" "src/cpp/parse/parsescilab.cpp" > + "src/cpp/parse/scanscilab.cpp"))))))) In order to keep the make-flags (if there are any) this becomes: (lambda* (#:key (make-flags #~'()) #:allow-other-keys) (with-directory-excursion "modules/ast" (apply invoke "make" "src/cpp/parse/parsescilab.cpp" "src/cpp/parse/scanscilab.cpp" make-flags))))))) > + (home-page "https://www.scilab.org/") > (synopsis "Software for engineers and scientists") > (description "This package provides the non-graphical version of the= Scilab > -software for engineers and scientists. Scilab is used for signal process= ing, > +software for engineers and scientists. Scilab is used for signal proces= sing, > statistical analysis, image enhancement, fluid dynamics simulations, num= erical > optimization, and modeling, simulation of explicit and implicit dynamical > systems and symbolic manipulations.") > - (license license:cecill))) ;CeCILL v2.1 > + (license (list license:gpl2 license:bsd-3)))) > =20 > (define-public ruy > (let ((commit "caa244343de289f913c505100e6a463d46c174de") > diff --git a/gnu/packages/patches/scilab-hdf5-1.8-api.patch b/gnu/package= s/patches/scilab-hdf5-1.8-api.patch > new file mode 100644 > index 0000000000..8b453e4720 > --- /dev/null > +++ b/gnu/packages/patches/scilab-hdf5-1.8-api.patch > @@ -0,0 +1,71 @@ > +This patch fixes the compilation with hdf5 version >=3D 1.10. Adapted fr= om > +https://aur.archlinux.org/cgit/aur.git/plain/hdf5_18_api.patch?h=3Dscila= b-git. > + > +diff -ur a/scilab/modules/hdf5/includes/HDF5Objects.h b/scilab/modules/h= df5/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__ > +=20 > +-#define H5_NO_DEPRECATED_SYMBOLS > + #undef H5_USE_16_API > ++#define H5_USE_18_API > +=20 > +-#define H5Eset_auto_vers 2 > + #include > + #include > +=20 > +-#undef H5_NO_DEPRECATED_SYMBOLS > +=20 > + //#define __HDF5OBJECTS_DEBUG__ > + //#define __HDF5ERROR_PRINT__ > +diff -ur a/scilab/modules/hdf5/Makefile.am b/scilab/modules/hdf5/Makefil= e.am > +--- a/scilab/modules/hdf5/Makefile.am > ++++ b/scilab/modules/hdf5/Makefile.am > +@@ -104,8 +104,7 @@ > + -DH5Gopen_vers=3D2 \ > + -DH5Tget_array_dims_vers=3D2 \ > + -DH5Acreate_vers=3D2 \ > +- -DH5Rdereference_vers=3D2 \ > +- -DNO_DEPRECATED_SYMBOLS > ++ -DH5Rdereference_vers=3D2 > +=20 > +=20 > + libscihdf5_la_CPPFLAGS =3D \ > +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 @@ > + * > + */ > +=20 > ++#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/modu= les/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 @@ > + * > + */ > +=20 > +-#define H5_NO_DEPRECATED_SYMBOLS > ++#define H5_USE_18_API > +=20 > + #ifndef _MSC_VER > + #include > +diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c b/scilab/m= odules/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 @@ > + * > + */ > +=20 > +-#define H5_NO_DEPRECATED_SYMBOLS > ++#define H5_USE_18_API > +=20 > + #ifndef _MSC_VER > + #include > --=20 > 2.41.0 >=20 >=20 >=20 >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --012WnWYmSxVZoU7+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmUdfhIACgkQQarn3Mo9 g1EhIA/8C/I+lb/lS2pt3BUhIN1OfRi0wHC5OWiF/gZwKZUQJdbD4ZZdbur9xmGb bP5hm0pN02P6R5FN/kKK/I3pJuh5SVximgsiXhyfmasq/fy52DEdM4b7H8jTP6Qg 1xGrTED7tIvYrB3jke1owEt1TrkQDtrovdnsZEPYxtjU4gVD3AoaIOFNHwBOlQFn 7qdaxluebgGMEHbv68xs6HVsNREkkzEIVjahzKfW1CwBbd7u7IxaOq6oUETk/Ch3 RefJFEdo0CPk02v1TM0i9bZIdJPzwsUZiBKNwsChtGKliaAQjMHaOYLZuZ/WTsRN BmnTKkjVlyrvFO1TmhX0JFWO6FJPzZYKLsAHp3TRfHgsb2GU+jS9IGg5zYVS/0qW iUzqFXCIO9mTv05FyUo2QL/rReI9OtenZ7N2nVtnEx58sgyuODcsZoUD1aKj9H3T MJAzxreGetr6AdK0oCyFkOoAZ1I/xAbnDUk/QHtkxAGD4bHrsKxqhuWqeu0zzkmc e1dL/s0NzvGXK/Oef7YVMHpYE62rTSnQ3leXYf3X7qi3oDyXSNDadLC+YWQE4uFs FAyKCXqxjAdXNGYByFfF0T62HPizybf14G9CUrDv+c8Np76YH+2QWNp/JyN5R70T K5i0MFvKFjF2DseXcJCFs6Sgk86WXDHWo3GoHmdTL7I5+BHC3vo= =YM6O -----END PGP SIGNATURE----- --012WnWYmSxVZoU7+-- ------------=_1696431722-24382-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Sep 2023 21:02:47 +0000 Received: from localhost ([127.0.0.1]:46775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksj8-0005bb-Lx for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:02:46 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qksj3-0005bM-I7 for submit@debbugs.gnu.org; Mon, 25 Sep 2023 17:02:44 -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 1qksij-0005EV-DU for guix-patches@gnu.org; Mon, 25 Sep 2023 17:02:23 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qksih-0002AN-9S for guix-patches@gnu.org; Mon, 25 Sep 2023 17:02:21 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C4574240103 for ; Mon, 25 Sep 2023 23:02:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695675735; bh=WgCIE1n6XbeaDrKelr9C4BXcTST4KMcTVM2LbSDEhvI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=eHS7j6ciHEm1UuCZkbp8NAJV314hBRnUIzHaL9dux+oQEM8a54T7hNGno7cjRcCUS ORIamTwOJheH8srlevSwvo0sHljJLFlZXVNwzggaj9dULZ6mVqhk9RcKv7B4Qy+G7x j6NBB3NlzZu5z78l50D2wkw9gGHQI7OcJWiLOvr0UA8KPEWd/uB8wFh75jI/aHNmRF oN1RXzXjUJOFLhUAlsCFPmm/A6W5Qe48IO+jp+Jfc19xHx+Z0dEceSXOWVs+Map6DB ymOWQc7CKNKk1eJcmhWVol7LGrDLFx81aVrTXqn9pefvhlE++oim0wCpym01vUHeau VTNvD6rJk05rg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Rvb0l2FsKz9s08; Mon, 25 Sep 2023 23:02:15 +0200 (CEST) From: David Elsing To: guix-patches@gnu.org Subject: [PATCH 0/2] Update scilab and remove suitesparse-3. Date: Mon, 25 Sep 2023 21:00:59 +0000 Message-ID: <20230925210126.8730-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=david.elsing@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) There are a lot of autogenerated files, so the snippet became rather large. As the Java parts depend on some libraries not packaged in Guix (such as jogl or saxon), I kept them disabled. David Elsing (2): gnu: scilab: Update to 2023.1.0. gnu: Remove suitesparse-3. gnu/packages/maths.scm | 345 +++++++++--------- .../patches/scilab-hdf5-1.8-api.patch | 71 ++++ 2 files changed, 236 insertions(+), 180 deletions(-) create mode 100644 gnu/packages/patches/scilab-hdf5-1.8-api.patch -- 2.41.0 ------------=_1696431722-24382-1--