From patchwork Mon Aug 8 15:45:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vicvbcun X-Patchwork-Id: 41397 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 18EC727BBEA; Mon, 8 Aug 2022 16:51:15 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 62C6027BBE9 for ; Mon, 8 Aug 2022 16:51:14 +0100 (BST) Received: from localhost ([::1]:52202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oL528-0003Ha-2F for patchwork@mira.cbaines.net; Mon, 08 Aug 2022 11:51:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL4zC-0000S0-GL for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oL4zC-0006nm-69 for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oL4zC-0006A2-1T for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56729] [RFC PATCH v2 08/29] gnu: lrcalc: Update to 2.1. Resent-From: vicvbcun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Aug 2022 15:48:10 +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: Ludovic =?utf-8?q?Court=C3=A8s?= , Andreas Enge Received: via spool by 56729-submit@debbugs.gnu.org id=B56729.165997365823345 (code B ref 56729); Mon, 08 Aug 2022 15:48:10 +0000 Received: (at 56729) by debbugs.gnu.org; 8 Aug 2022 15:47:38 +0000 Received: from localhost ([127.0.0.1]:41722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4yf-00064L-Pv for submit@debbugs.gnu.org; Mon, 08 Aug 2022 11:47:38 -0400 Received: from mo4-p05-ob.smtp.rzone.de ([85.215.255.133]:33785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4yY-00061r-AS for 56729@debbugs.gnu.org; Mon, 08 Aug 2022 11:47:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1659973638; 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=PmkRDwIOZFFt1HqjdmGUoB2kQz2DvogozIAt08/gkvk=; b=HJwI8r687fbGrcAQ3L7EbwCXu3xubh57IASfaxS6VHhCv5Tk4SB64Yi/fs8cv2AFOV QLXf3mqp2BSGuyY+NKjBxVpTAwxYIPjyxNCytb4nUH8js0HB9dPp7oLoIgGICpA0MGJP 1QDZEFZDiOf+w4e0h39vkvSjGBCgzFrUPtK4ZAyxsaafeDQN+Ss2qN6Cx2amzRjb0MC+ sQKBA2ecCxAUrKueAv4UTTYroMdpznH0mK/H5MAuR7PPUMFtqEnoAkIr8/m6U0o4KPGx QlU9oQcF/bISYgodepbZXhA6Ow1AqDNo8KJE3CjXP3WefVNorRG+BGD3VCPgUYfWftpw J4dA== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":IUwNfkitaf3qOWm2b/jA5tveVwUUcwH3PkiYp6DPxTDDEo4xO9ymAEzKSWlvmNAhIG6s" X-RZG-CLASS-ID: mo05 Received: from lambda.localdomain by smtp.strato.de (RZmta 47.47.0 DYNA|AUTH) with ESMTPSA id 0cac6cy78FlIoRK (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 8 Aug 2022 17:47:18 +0200 (CEST) From: vicvbcun Date: Mon, 8 Aug 2022 17:45:43 +0200 Message-Id: <1f91b91d0ebf10eb4baf1fc5c2e411af2e4a1efb.1659973115.git.guix@ikherbers.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: References: MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/algebra.scm (lrcalc): Update to 2.1. [source]: Remove patch. * gnu/packages/patches/lrcalc-includes.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove here. --- gnu/local.mk | 1 - gnu/packages/algebra.scm | 12 +-- gnu/packages/patches/lrcalc-includes.patch | 92 ---------------------- 3 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 gnu/packages/patches/lrcalc-includes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5a4c4c0652..3877d1aeb3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1455,7 +1455,6 @@ dist_patch_DATA = \ %D%/packages/patches/llvm-roc-4.0.0-remove-isystem-usr-include.patch \ %D%/packages/patches/llvm-roc-5.0.0-linkdl.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ - %D%/packages/patches/lrcalc-includes.patch \ %D%/packages/patches/lsh-fix-x11-forwarding.patch \ %D%/packages/patches/lsof-fatal-test-failures.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 3ea79e3971..649dc4e442 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1617,7 +1617,7 @@ (define-public eclib (define-public lrcalc (package (name "lrcalc") - (version "1.2") + (version "2.1") (source (origin (method git-fetch) (uri (git-reference @@ -1626,18 +1626,10 @@ (define-public lrcalc (file-name (git-file-name name version)) (sha256 (base32 - "1c12d04jdyxkkav4ak8d1aqrv594gzihwhpxvc6p9js0ry1fahss")) - (patches (search-patches "lrcalc-includes.patch")))) + "0s3amf3z75hnrjyszdndrvk4wp5p630dcgyj341i6l57h43d1p4k")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool)) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'fix-permission - (lambda _ - (chmod "lrcalc.maple.src" #o644) - #t))))) (synopsis "Littlewood-Richardson calculator in algebraic combinatorics") (description "The Littlewood-Richardson Calculator (lrcalc) is a program designed to compute Littlewood-Richardson coefficients. It computes diff --git a/gnu/packages/patches/lrcalc-includes.patch b/gnu/packages/patches/lrcalc-includes.patch deleted file mode 100644 index e15286905b..0000000000 --- a/gnu/packages/patches/lrcalc-includes.patch +++ /dev/null @@ -1,92 +0,0 @@ -Patch taken from the Sage packaging system. - -From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001 -From: Anders Skovsted Buch -Date: Sun, 29 Nov 2015 16:25:56 -0500 -Subject: [PATCH] Patch by Jeroen Demeyer to change include to - "vector.h", plus similar cases. - ---- - src/lrcalc.c | 2 +- - src/maple.c | 4 ++-- - src/schublib.h | 2 +- - src/symfcn.c | 6 +++--- - src/symfcn.h | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/lrcalc.c b/src/lrcalc.c -index aff3f75..60df49e 100644 ---- a/src/lrcalc.c -+++ b/src/lrcalc.c -@@ -8,7 +8,7 @@ - #include - extern char *optarg; - --#include -+#include "vectarg.h" - - #include "symfcn.h" - #include "maple.h" -diff --git a/src/maple.c b/src/maple.c -index fdc0768..a5f4d14 100644 ---- a/src/maple.c -+++ b/src/maple.c -@@ -4,8 +4,8 @@ - */ - - #include --#include --#include -+#include "vector.h" -+#include "hashtab.h" - #include "maple.h" - - -diff --git a/src/schublib.h b/src/schublib.h -index a8e8511..864850c 100644 ---- a/src/schublib.h -+++ b/src/schublib.h -@@ -1,7 +1,7 @@ - #ifndef _SCHUBLIB_H - #define _SCHUBLIB_H - --#include -+#include "hashtab.h" - - hashtab *trans(vector *w, int vars, hashtab *res); - hashtab *monk(int i, hashtab *slc, int rank); -diff --git a/src/symfcn.c b/src/symfcn.c -index 4ffbe4b..fd5df5d 100644 ---- a/src/symfcn.c -+++ b/src/symfcn.c -@@ -5,9 +5,9 @@ - - #include - --#include --#include --#include -+#include "alloc.h" -+#include "vector.h" -+#include "hashtab.h" - - #include "symfcn.h" - -diff --git a/src/symfcn.h b/src/symfcn.h -index b8543b1..29bb00d 100644 ---- a/src/symfcn.h -+++ b/src/symfcn.h -@@ -1,8 +1,8 @@ - #ifndef _SYMFCN_H - #define _SYMFCN_H - --#include --#include -+#include "hashtab.h" -+#include "vector.h" - - int part_itr_sz(vector *part); - int part_itr_sub(vector *part, vector *outer); --- -2.1.1.1.g1fb337f -