From patchwork Sun Sep 4 15:39:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 42209 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B03BA27BBEA; Sun, 4 Sep 2022 16:40:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9B1EE27BBE9 for ; Sun, 4 Sep 2022 16:40:30 +0100 (BST) Received: from localhost ([::1]:49942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUrjZ-0005qk-Nm for patchwork@mira.cbaines.net; Sun, 04 Sep 2022 11:40:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUrj8-0005oC-Av for guix-patches@gnu.org; Sun, 04 Sep 2022 11:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56762) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUrj8-0006HB-0X for guix-patches@gnu.org; Sun, 04 Sep 2022 11:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oUrj7-0004MH-Sh for guix-patches@gnu.org; Sun, 04 Sep 2022 11:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57194] [PATCH] gnu: cmh: Update to 1.1.1. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Sep 2022 15:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57194 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: Andreas Enge , 57194@debbugs.gnu.org Received: via spool by 57194-submit@debbugs.gnu.org id=B57194.166230598716730 (code B ref 57194); Sun, 04 Sep 2022 15:40:01 +0000 Received: (at 57194) by debbugs.gnu.org; 4 Sep 2022 15:39:47 +0000 Received: from localhost ([127.0.0.1]:45461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUrir-0004Lk-VI for submit@debbugs.gnu.org; Sun, 04 Sep 2022 11:39:47 -0400 Received: from sonic305-21.consmr.mail.ne1.yahoo.com ([66.163.185.147]:40227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUrin-0004LR-F1 for 57194@debbugs.gnu.org; Sun, 04 Sep 2022 11:39:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1662305975; bh=WSSg3ytdpJgXJFn9qtgjko31SaD2ceZtwAGikjZPqhY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=isCTzbqvoXKUDRIRIgj06AyRwVjXP0u7ylHi40ZtMEBUOt04hBgXxg6Lu6+kGkhTsYBSanwBFtdwZ5xzoP5HGXm2IZdwyrBqWOY4X/gZEAFJKqTvON7OIisSI9VllXbef7e4y0rrzzhcaY9PODyAJw8tsZRynOsMLK+cGi/PWd9vtHAuRoA6ZPP3S3uzcANykhXkrV146cZZz3BK6u0rObZC0ImxdpOsL7CEKVRtt2suL9oMD1OvVtJRmlOBFXEEpR+LBNOtylDl80MG34YbwlETYsmlaNKWqj53VsQUhm5eJtzuBwIh/miF5ApOKWCvPSFiK3gL6eSWLbwa9vIrkg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1662305975; bh=DnKn9UXTRRGiQPP1H1RtgAHnJlDNbv6MXIWDEq51fLV=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=ESxvhjwElUIEeGIjAE4ZUvXDz0alItF0V4MTBkw/uaOLlfE+yKlF8eFeJX6hqftcldTkX514QrT0wOLBXWvM3g7i1z6BEIKcP4rxO+hxLWawpw0Ra2wmR/qCYLylsxZcyAbRP+Yujy2o2eylFPf1mChB1LXUfAGq624uIsX0n/5d+TgPUfOSJggiLJQDQnTdzUEZdeIwPq6tpnV9rfniv6pYSzrXqWYBxkggsiMB+nHJqK73NJ7iYU9WX54vdxuJ9gDQGLRoBb2t0DT63ZROf7qPueLqXpUBqKvNzcXHtUcrW95/StUzcFBgLa2DRqpFOPX5jXostucegaQ5XJQtyw== X-YMail-OSG: RtO3y.MVM1nhTlclXwNJGYAvaYpPyW6RfBW8dzEzEWBhWNTKIa72gwQJvh7NJ2V PA_h7iuDYfz_141Zt3YbvZiy9i.whBK4aqfsAQa7j5qFlrCHeBzw3FEim7d8kQaL2k8AdMLCrrc5 Kmf2QEah9t99nT67T3UGv84Fx5A2JVhNBIClpq6wJI38hwBMnbjqBKC6UMunIaCopDSg1a9R6XoV E2B6K1QRu1_QRkNc6mIbJRT.jhITQrHEB_9fhWXRjbkX00CJmbodtKkFN9aEDo_j0UgPHTHHoAqp 3kbD1ZQGNJBlXHoLCC63feVzKN.R_U3giuu8bl5g4g1_t3kqphPYGy5H00wj.TjQy2Ta.72TFOT6 8uSUdN7VUVlp9mRR4ZL3kJRxs4uHiYoUZT1ydXnEp9s4TRuwDdbazDUWwMmo8BjcIdM5kKaHcIGM 2qs198ElB1uTcDn38UqzwysksWTocR1pz5qVhR2QOQ5OvzDzerKXdtL7xJFyYY3S1dG63Ko26v9Q 9l9yETq8hUPPu05Hp0u_Kly_EulDRtZdU4S._hcyFfCiZxWh9HmNr1zHWB01akSMOqNK0EAGAx.5 FZfkDv1U_hNImwtRoQM1sIqOjwtYhxUJ0kZzmlD1lJzh6Zkn3QSWcqQw.gFbKDnJ0TM8TaIBveqP jeKROkCTV6N70MPPvflDxkrT_v8ir7z3w35FAPRlGROgSSZklXQEpV2RnwWZy3Uj9x_dU0bsnZxK n2h5DpBxjKDEQKUKlC759l9llmP5Q9zi79tfjaseCCQdfeERfRuTLTpUYBA0m6pH3RlJs2WF9F05 60o9SR5hK.uYdemZAFGCzQ9XduJVxyIaYSyI.I6t1MpEzBN5ew4vUXy0zLlWtrpbyplWLfSA6qgX bBY2H9UbS7y.S6Bg2uZoZm3j115_MguE_XOFaTcdYPK9PC9cT1jrmYn49aDGqskEleQyHcC.xreF oaLGhEvnN._CEzNB3uOzpKtTY9FvvfkA6_YWCjccaTZ289kLxAalLWnWtXnqID0QowM_QbMuAi30 bxggjNlq0SslAOu.PoCJeNBwqH9a93hrap7AS0DlDr8GJZSELCcHmuCLvlO9BxeEGW7zw61IozvG MJ2ts7iUDNUUrlwIzKf74DoD2lYcOi1ximJLC.mWd21Wx7TY4lRZtZkmOmcah7pSuqd_uRn4ooGD tucHAr3FQbX1vuYMhJRCm.ERXTD6e4XaMAW05ZY.SGRtNAnDvY21vGLPUeRU93ape57Eh7qF1gj0 1G2_itMXuCbvRcmAbznBMoKLyoJvKLFXPQ_R5qAnTWsHNQg2_dOXd2JFmY4nX7VKA.eqmzZ_BSyI hD2YsixsambdscCwemUF6Zwjy5h7XxBoXHw88VF_2sm7TnsDoI3DA5zrha5B50GJFghw2r7.8wSI MYnFxjiOVGDCU.6H29Yg5YmIdml1IhGX6rvOGLnbBk2AdJLwUFBqD71ATXwl19tnXPaOvYBxAH.k 6pryuog5IUS.hIsLGyaW160pTbUlLj1DhnUAr_CoqcY2UPhfvTtQ_Uv2MSqHabfWQZTum2XMW4Lr FfZBSoblJOvo8GQrI.Sn8LCVoOYJRPf9bHNBKqy3CfF58HfPgLkkVwVY1jHd.o7VkaKo7CAskyay cr1egrW6WzZHhMq6sqZoqqk4x_YZFkvI3uA3rxRhHA7dQoOAkD0SFX_ttPttZlUkb7eYIrNMvG1K VIlQCMaZef7uHtGZv7V6UvYuv5RYTuf8s.a6X7wjGjtNb46Q4aao0v9bVNmhVFRGB533VzAZMTAQ f0m1Xp33s00bAoLXGPhnWpcjEAn48o4U9TyoKgVMxi_BfwRvOyIZMG0NAc.JMmKeZpZ2yR3eU96r xDk06_SPB9bXnn9R8AWUdp1_YV9iwbjQuJmLWJfO7mXfwDabwTLv1LYi8NTE6TTod_8g_VT8SHCM A_I8pxjNUMbpKmiMVncfZq_9HlI_bYBBnXo3O6ZTxiR7ccrsMpUTQJ0qdok7vmAlbtaQAAnkforO dsDZAgnsYm0XXUBkXXT98AyDeI.JggMGdZ_5ApvGUKbY.oA_.jZBhcNx7np0nYL4axFPTimZOOsI xTXf2UqFgpGaftFUPFVKw2cvQn4fH64SJbctn8BiiWVZc.X5ZeLLuzjUJrM_WRMJoJxXuLi5VuTm Vo0n9f3vIwgPa1XEdlzx28gFMR4dFo5hthauA2s30J.AtRy1UXb1oJ4Ts6m4MHilnUQKs6CcLlQR 82KptRaP4szR6XpssrOWdAc.DX_15CAvc7PcMzzOfQ0sZ X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.ne1.yahoo.com with HTTP; Sun, 4 Sep 2022 15:39:35 +0000 Received: by hermes--canary-production-ir2-85867b7b87-6b4z9 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID efbb38c2c79f7217217f39bb36e53843; Sun, 04 Sep 2022 15:39:32 +0000 (UTC) In-Reply-To: <875yi5vm8d.fsf_-_@gnu.org> References: <87wnbb1p8d.fsf.ref@aol.com> <87wnbb1p8d.fsf@aol.com> <875yi5vm8d.fsf_-_@gnu.org> Date: Sun, 04 Sep 2022 11:39:06 -0400 Message-ID: <87h71n409x.fsf@aol.com> MIME-Version: 1.0 X-Mailer: WebService/1.1.20595 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.aol 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hendursaga X-ACL-Warn: , Hendursaga via Guix-patches X-Patchwork-Original-From: Hendursaga via Guix-patches via From: Hendursaga X-getmail-retrieved-from-mailbox: Patches > I think you need to update gnu/local.mk as well to remove the patch. Done. Attached you will find the updated patch. Hendursaga From 5e542036d444f5e482ed9884f60987dab80592f3 Mon Sep 17 00:00:00 2001 From: Hendursaga Date: Sun, 4 Sep 2022 11:31:29 -0400 Subject: [PATCH] gnu: cmh: Update to 1.1.1. * gnu/packages/algebra.scm (cmh): Update to 1.1.1. * gnu/packages/patches/cmh-support-fplll.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/algebra.scm | 47 ++++++++++---------- gnu/packages/patches/cmh-support-fplll.patch | 27 ----------- 3 files changed, 23 insertions(+), 52 deletions(-) delete mode 100644 gnu/packages/patches/cmh-support-fplll.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1b3225d075..fcc2c0aaa5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -974,7 +974,6 @@ dist_patch_DATA = \ %D%/packages/patches/cling-use-shared-library.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates.patch \ - %D%/packages/patches/cmh-support-fplll.patch \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/containerd-create-pid-file.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 8ccb44c434..90aede5fa0 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -293,34 +293,33 @@ (define-public gp2c (define-public cmh (package - (name "cmh") - (version "1.1.0") - (source (origin - (method url-fetch) - ;; Git repo at . - (uri (string-append "http://www.multiprecision.org/downloads/cmh-" - version ".tar.gz")) - (sha256 - (base32 - "1ws2yhzxmm2l5xqqqcjcimmg40f9qq5l9i6d4i5434an9v9s8531")) - (patches (search-patches "cmh-support-fplll.patch")))) - (build-system gnu-build-system) - (inputs - (list gmp - mpfr - mpc - mpfrcx - fplll - pari-gp)) - (synopsis "Igusa class polynomial computations") - (description - "The CMH software computes Igusa (genus 2) class polynomials, which + (name "cmh") + (version "1.1.1") + (source (origin + (method url-fetch) + ;; Git repo at . + (uri (string-append + "https://www.multiprecision.org/downloads/cmh-" version + ".tar.gz")) + (sha256 + (base32 + "0nadvqfmidgks1s7aljsf8dp32pz7vjaxyaym36m9bx4zr8msk91")))) + (build-system gnu-build-system) + (inputs (list gmp + mpfr + mpc + mpfrcx + fplll + pari-gp)) + (synopsis "Igusa class polynomial computations") + (description + "The CMH software computes Igusa (genus 2) class polynomials, which parameterize the CM points in the moduli space of 2-dimensional abelian varieties, i.e. Jacobians of hyperelliptic curves. It can also be used to compute theta constants at arbitrary precision.") - (license license:gpl3+) - (home-page "http://www.multiprecision.org/cmh/home.html"))) + (license license:gpl3+) + (home-page "https://www.multiprecision.org/cmh/home.html"))) (define-public giac (package diff --git a/gnu/packages/patches/cmh-support-fplll.patch b/gnu/packages/patches/cmh-support-fplll.patch deleted file mode 100644 index fae04f456b..0000000000 --- a/gnu/packages/patches/cmh-support-fplll.patch +++ /dev/null @@ -1,27 +0,0 @@ -Patch from the CMH git, after the 1.1.0 release. - -From 2328c819317dda2171217002268f57c74cedc476 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Emmanuel=20Thom=C3=A9?= -Date: Tue, 7 Jun 2022 12:17:05 -0700 -Subject: [PATCH] patch suggested by @x-YVicto - ---- - src/lll.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lll.cpp b/src/lll.cpp -index 83dab07..f005931 100644 ---- a/src/lll.cpp -+++ b/src/lll.cpp -@@ -37,7 +37,7 @@ - #ifdef HAVE_FPLLL - static void lll_fplll (mpz_t *v, mpz_t **M, const int m, const int n) - { -- ZZ_mat Mp (m, n); -+ fplll::ZZ_mat Mp (m, n); - int i, j; - - for (i = 0; i < m; i++) --- -2.36.1 - -- 2.37.1