From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KDCgIMRf3GIMywAAbAwnHQ (envelope-from ) for ; Sat, 23 Jul 2022 22:53:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eFORIMRf3GIafQAA9RJhRA (envelope-from ) for ; Sat, 23 Jul 2022 22:53:24 +0200 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 3E9793E3BC for ; Sat, 23 Jul 2022 22:53:24 +0200 (CEST) Received: from localhost ([::1]:55612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFM7m-0002Ar-C9 for larch@yhetil.org; Sat, 23 Jul 2022 16:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFM7V-0001ho-84 for guix-patches@gnu.org; Sat, 23 Jul 2022 16:53:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFM7U-0007bc-Ur for guix-patches@gnu.org; Sat, 23 Jul 2022 16:53:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFM7U-0002xz-RR for guix-patches@gnu.org; Sat, 23 Jul 2022 16:53:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56729] [RFC PATCH 05/10] gnu: lcalc: Update to 2.0.5. Resent-From: vicvbcun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Jul 2022 20:53:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56729@debbugs.gnu.org Cc: vicvbcun Received: via spool by 56729-submit@debbugs.gnu.org id=B56729.165860957211317 (code B ref 56729); Sat, 23 Jul 2022 20:53:04 +0000 Received: (at 56729) by debbugs.gnu.org; 23 Jul 2022 20:52:52 +0000 Received: from localhost ([127.0.0.1]:46427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFM7H-0002wM-QC for submit@debbugs.gnu.org; Sat, 23 Jul 2022 16:52:52 -0400 Received: from mo4-p05-ob.smtp.rzone.de ([85.215.255.133]:38985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFM6z-0002uK-73 for 56729@debbugs.gnu.org; Sat, 23 Jul 2022 16:52:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1658609551; s=strato-dkim-0002; d=ikherbers.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=qKd14y+zRhToEHGIuZB42qscvXRbf9TKY3f7ZYGQXPE=; b=Bq5PsIqW32bttPkBXoHdo5z0Ae8112RtNWJuslBW/A9NHnp/Nx0yvOWn2NRdWczSyp yxErhr0UHvSxtKHgKZ/TxsBPyePeJRb3+mvmJPvDgihMuBsOmLKzCly0cIriUDDzMGMb lUgLQez9qHmTYcQxSMdPtIq5RAajS+Rk2GYds7iAYxOekzT6Sz+NxFnVShxGCdp189G4 NjDYHa1bbka0f3JkwGzpV8jqogWgl0QIeqUP48iVZ7DGv44QY8XXAxkSyEZofGWa+E7r 1g5HVJnHsA9dqpxLOflIr/GrbNb8oFYklKumepc6XPNe/GnLsNZNKPhtCev4yr3n21oS o7eQ== X-RZG-AUTH: ":IUwNfkitaf3qOWm2b/jA5tveVwUUcwH3PkiYp6DPxTDDEo4xO9KsAGjusLvh3llVxq3loQ==" X-RZG-CLASS-ID: mo05 Received: from lambda.localdomain by smtp.strato.de (RZmta 47.47.0 DYNA|AUTH) with ESMTPSA id Vdcb24y6NKqVD6f (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Sat, 23 Jul 2022 22:52:31 +0200 (CEST) From: vicvbcun Date: Sat, 23 Jul 2022 22:51:59 +0200 Message-Id: <8fad623072b4075781f6936fd1a324950886023c.1658595756.git.guix@ikherbers.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658609604; h=from:from:sender:sender: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=qKd14y+zRhToEHGIuZB42qscvXRbf9TKY3f7ZYGQXPE=; b=RY8TWMiS9RPx6rhJTaCOGBc6DGcglTkROlGMsJ89NCgbclEdKEy4bm5fLRXiscF2K+fU3B egNfIQEzLVPJ69T4Z43TOKr01N9rquyarRpSxIMvjSSYzCkEGbN2ib2OOhH5Uce4YAmM1H 6tZ94JwAFZzEMRqZvWIAWvumW7+on/xy0hsxlefgxqQZ7zzd2/2RK6i6zTraNoQlmhkIOP pkEO075NYAyVNGDjRwcM819ODGPC4hdk1opwFOSTPfYbVdBt/Rly5xd18ha9NnbGVx/aQT FItyZw+XrEC4kfTYLYNUqLnsl/NKMKzrqQGaFB0rKke3VgcUckdWBf2RUxLfCg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658609604; a=rsa-sha256; cv=none; b=qRZ1RKnKqX+ffTqCdoWX1bClBfl85PoME3VVDMlIUAtmsZw9QejnkzZvD+zADIxgWtBwNz 3ebBlqU149+e9jLNQCVouWw6k/huG5E4yJrFwbd84ZJmYlN8KJ5DYVUu78flUzGy+tf5QD 7Lz00H9RkQHM7meGpwg6SfS1nN3jnFA27UV0iXK+wcL3rY/RRxtqATlwyNBpC6YLs4/t5E +2cUfEks0fN8lyE7S+d+RPQYqxbSyTrohTy/Nv/8S4tfUkGtnRkrvnWPtchM/9+KwAOdA7 bxOJ1kgehRw/XkeTfslMbDcRunpSzmpO+I67EB0xsGSO0BfKzUkXAUhPo7ZjuQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ikherbers.com header.s=strato-dkim-0002 header.b=Bq5PsIqW; dmarc=none; 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" X-Migadu-Spam-Score: 2.07 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ikherbers.com header.s=strato-dkim-0002 header.b=Bq5PsIqW; dmarc=none; 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" X-Migadu-Queue-Id: 3E9793E3BC X-Spam-Score: 2.07 X-Migadu-Scanner: scn0.migadu.com X-TUID: cSZyQSuLsBtV * gnu/packages/sagemath.scm (lcalc): Update to 2.0.5. * gnu/packages/patches/lcalc-default-parameters-1.patch, gnu/packages/patches/lcalc-default-parameters-2.patch, gnu/packages/patches/lcalc-lcommon-h.patch, gnu/packages/patches/lcalc-using-namespace-std.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove here. --- gnu/local.mk | 4 -- .../patches/lcalc-default-parameters-1.patch | 26 ------- .../patches/lcalc-default-parameters-2.patch | 58 --------------- gnu/packages/patches/lcalc-lcommon-h.patch | 13 ---- .../patches/lcalc-using-namespace-std.patch | 43 ----------- gnu/packages/sagemath.scm | 71 ++++++------------- 6 files changed, 20 insertions(+), 195 deletions(-) delete mode 100644 gnu/packages/patches/lcalc-default-parameters-1.patch delete mode 100644 gnu/packages/patches/lcalc-default-parameters-2.patch delete mode 100644 gnu/packages/patches/lcalc-lcommon-h.patch delete mode 100644 gnu/packages/patches/lcalc-using-namespace-std.patch diff --git a/gnu/local.mk b/gnu/local.mk index 07e3497d10..84c88ea905 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1371,10 +1371,6 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-skip-test-449.patch \ %D%/packages/patches/laby-make-install.patch \ - %D%/packages/patches/lcalc-default-parameters-1.patch \ - %D%/packages/patches/lcalc-default-parameters-2.patch \ - %D%/packages/patches/lcalc-lcommon-h.patch \ - %D%/packages/patches/lcalc-using-namespace-std.patch \ %D%/packages/patches/ldns-drill-examples.patch \ %D%/packages/patches/leela-zero-gtest.patch \ %D%/packages/patches/less-hurd-path-max.patch \ diff --git a/gnu/packages/patches/lcalc-default-parameters-1.patch b/gnu/packages/patches/lcalc-default-parameters-1.patch deleted file mode 100644 index 19b0776320..0000000000 --- a/gnu/packages/patches/lcalc-default-parameters-1.patch +++ /dev/null @@ -1,26 +0,0 @@ -Patch taken from the Sage packaging system. - -diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h ---- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200 -@@ -43,7 +43,7 @@ - //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - template - Complex L_function :: --dirichlet_series(Complex s, long long N=-1) -+dirichlet_series(Complex s, long long N) - { - Complex z=0.; - long long m,n; -diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h ---- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200 -@@ -491,7 +491,7 @@ - - //#include "Ldirichlet_series.h" //for computing Dirichlet series - Complex partial_dirichlet_series(Complex s, long long N1, long long N2); -- Complex dirichlet_series(Complex s, long long N); -+ Complex dirichlet_series(Complex s, long long N=-1LL); - - //#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series - //void compute_taylor_series(int N, int K, Complex s_0, Complex *series); diff --git a/gnu/packages/patches/lcalc-default-parameters-2.patch b/gnu/packages/patches/lcalc-default-parameters-2.patch deleted file mode 100644 index 1d881ee0c4..0000000000 --- a/gnu/packages/patches/lcalc-default-parameters-2.patch +++ /dev/null @@ -1,58 +0,0 @@ -Patch taken from the Sage packaging system. - ---- lcalc-1.23/include/Lgamma.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23/include/Lgamma.h 2014-05-18 21:15:27.786889718 +0200 -@@ -77,7 +77,7 @@ - //n=0 should just give log_GAMMA(z)... thus making log_GAMMA - //code obsolete. But leave log_GAMMA intact anyways. - template --precise(ttype) log_GAMMA (ttype z,int n=0) -+precise(ttype) log_GAMMA (ttype z,int n) - { - int M; - precise(ttype) log_G,r,r2,y; -@@ -230,7 +230,7 @@ - //value exp_w which holds exp(-w) - //computes G(z,w), so there's an extra w^(-z) factor. - template --Complex inc_GAMMA (ttype z,ttype w, const char *method="temme", ttype exp_w = 0, bool recycle=false) -+Complex inc_GAMMA (ttype z,ttype w, const char *method, ttype exp_w, bool recycle) - { - - Complex G; -@@ -334,7 +334,7 @@ - - - template --ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w=0, bool recycle=false) //computes G(z,w) via continued fraction -+ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle) //computes G(z,w) via continued fraction - { - - ttype G; -@@ -424,7 +424,7 @@ - } - - template --ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w = 0, bool recycle=false) //computes G(z,w) via asymptotic series -+ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle) //computes G(z,w) via asymptotic series - { - - if(my_verbose>3) cout << "called asympt_GAMMA("< --ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w = 0, bool recycle=false) //computes g(z,w) -+ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w, bool recycle) //computes g(z,w) - { - - ttype g; -@@ -604,7 +604,7 @@ - } - - template --Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta=1, const char *method="temme") -+Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta, const char *method) - { - Complex SUM=0; - diff --git a/gnu/packages/patches/lcalc-lcommon-h.patch b/gnu/packages/patches/lcalc-lcommon-h.patch deleted file mode 100644 index 897956de64..0000000000 --- a/gnu/packages/patches/lcalc-lcommon-h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch taken from the Sage packaging system. - ---- src/include/Lcommon.h 2010-01-31 15:16:45.000000000 +0000 -+++ src/include/Lcommon.h 2011-03-08 21:19:11.849443238 +0000 -@@ -25,7 +25,7 @@ - #ifdef USE_MPFR - inline double lcalc_to_double(const double& x) { return x; } - #endif --//inline double lcalc_to_double(const long double& x) { return x; } -+inline double lcalc_to_double(const long double& x) { return x; } - inline double lcalc_to_double(const int& x) { return x; } - inline double lcalc_to_double(const long long& x) { return x; } - inline double lcalc_to_double(const short& x) { return x; } diff --git a/gnu/packages/patches/lcalc-using-namespace-std.patch b/gnu/packages/patches/lcalc-using-namespace-std.patch deleted file mode 100644 index 6e0075fdc8..0000000000 --- a/gnu/packages/patches/lcalc-using-namespace-std.patch +++ /dev/null @@ -1,43 +0,0 @@ -Patch taken from the Sage packaging system. - -diff --git a/include/Lcommon.h b/include/Lcommon.h -index 1b3be43..bf40532 100644 ---- a/include/Lcommon.h -+++ b/include/Lcommon.h -@@ -48,7 +48,7 @@ const bool outputSeries=true; // Whether to output the coefficients or just th - - // Loop i from m to n - // Useful in tidying up most for loops --#define loop(i,m,n) for(typeof(m) i=(m); i!=(n); i++) -+#define loop(i,m,n) for(auto i=(m); i!=(n); i++) - - // A class for calculations involving polynomials of small degree - // Not efficient enough for huge polynomials -diff --git a/include/Lcommon_ld.h b/include/Lcommon_ld.h -index 86ae4df..33c560c 100644 ---- a/include/Lcommon_ld.h -+++ b/include/Lcommon_ld.h -@@ -53,7 +53,7 @@ const bool outputSeries=true; // Whether to output the coefficients or just th - - // Loop i from m to n - // Useful in tidying up most for loops --#define loop(i,m,n) for(typeof(m) i=(m); i!=(n); i++) -+#define loop(i,m,n) for(auto i=(m); i!=(n); i++) - - // A class for calculations involving polynomials of small degree - // Not efficient enough for huge polynomials -diff --git a/include/Lglobals.h b/include/Lglobals.h -index 60002e4..ca2606c 100644 ---- a/include/Lglobals.h -+++ b/include/Lglobals.h -@@ -24,9 +24,9 @@ - #ifndef Lglobals_H - #define Lglobals_H - -+#include - using namespace std; - --#include - #ifdef USE_MPFR - #include "Lgmpfrxx.h" - typedef mpfr_class Double; diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index b29620a946..1237ff8e04 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -38,6 +38,7 @@ (define-module (gnu packages sagemath) #:use-module (gnu packages lisp) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz)) @@ -292,59 +293,27 @@ (define-public brial (define-public lcalc (package (name "lcalc") - (version "1.23") - ;; The original home page of the project has disappeared, as well as - ;; code hosted by the original author on Google Code. The latter has - ;; been copied to gitlab.com/sagemath and purportedly contains patches - ;; for a never released version 1.3, that supposedly follows 1.23. - ;; We use the tarball as well as the patches hosted inside the sage - ;; package system distributed with the sage tarball. - (source - (origin - (method url-fetch) - (uri (string-append "ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/" - "upstream/lcalc/lcalc-1.23.tar.bz2")) - (sha256 - (base32 - "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43")) - (patches (search-patches "lcalc-lcommon-h.patch" - "lcalc-default-parameters-1.patch" - "lcalc-default-parameters-2.patch" - "lcalc-using-namespace-std.patch")))) + (version "2.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sagemath/lcalc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rwyx292y3jbsp88wagn9nhl9z7wsnl2yrs5imxkbxq87pnrj5a7")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'prepare-build - (lambda* (#:key outputs #:allow-other-keys) - (chdir "src") - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("^INSTALL_DIR= /usr/local") - (string-append "INSTALL_DIR=" out)))) - #t)) - (add-before 'install 'make-output-dirs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (lib (string-append out "/lib")) - (include (string-append out "/include"))) - (mkdir-p bin) - (mkdir-p lib) - (mkdir-p include)) - #t))))) - ;; FIXME: - ;; We need to add pari-gp and probably pari related patches from the - ;; sage project, as well as uncomment the line setting PARI_DEFINE in - ;; the Makefile to get the full functionality of this package. - ;; For the time being, we hope that sage can be compiled without. - (synopsis "C++ library for L-functions") - (description "Lcalc computes L-functions, in particular the Riemann -zeta function and its twists by quadratic characters.") - (license license:gpl2+) - (home-page "https://gitlab.com/sagemath/sage"))) + (list #:configure-flags '(list "--with-pari"))) + (inputs (list pari-gp)) + (native-inputs (list autoconf automake libtool pkg-config gengetopt)) + (home-page "https://gitlab.com/sagemath/lcalc") + (synopsis "C++ library for with L-functions") + (description + "Lcalc computes L-functions, in particular the Riemann zeta function and its +twists by quadratic characters.") + (license license:gpl2+))) (define-public ratpoints (package -- 2.37.0