GNU logs - #77902, boring messages


Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77902] [PATCH science-team 0/2] Update SuiteSparse.
Resent-From: Greg Hogan <code@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 18 Apr 2025 15:13:02 +0000
Resent-Message-ID: <handler.77902.B.17449891394362 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 77902
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77902 <at> debbugs.gnu.org
Cc: Greg Hogan <code@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.17449891394362
          (code B ref -1); Fri, 18 Apr 2025 15:13:02 +0000
Received: (at submit) by debbugs.gnu.org; 18 Apr 2025 15:12:19 +0000
Received: from localhost ([127.0.0.1]:52475 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1u5nO1-00017Q-UD
	for submit <at> debbugs.gnu.org; Fri, 18 Apr 2025 11:12:18 -0400
Received: from lists.gnu.org ([2001:470:142::17]:52194)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <code@HIDDEN>)
 id 1u5nNt-00014D-AH
 for submit <at> debbugs.gnu.org; Fri, 18 Apr 2025 11:12:12 -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 <code@HIDDEN>)
 id 1u5nNj-0004mN-LL
 for guix-patches@HIDDEN; Fri, 18 Apr 2025 11:11:55 -0400
Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <code@HIDDEN>)
 id 1u5nNU-0005Ly-NH
 for guix-patches@HIDDEN; Fri, 18 Apr 2025 11:11:55 -0400
Received: by mail-qk1-x72c.google.com with SMTP id
 af79cd13be357-7c07cd527e4so184672285a.3
 for <guix-patches@HIDDEN>; Fri, 18 Apr 2025 08:11:37 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1744989088; x=1745593888;
 darn=gnu.org; 
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=vu0HG9q9CgwNV0e2D9YoP4sJ4kFSl1vkyN5DjRK1Nxc=;
 b=XdZbd+mu2Pvfwj7D4d9nqxcPMlQUWT53qT9AVXAdf13AFZiRvA58lc+jlRifJTsO5N
 ASRazeQ0r2Dlsb7GxI0f8tQ4i03PfjvDNKsvztuSAmoYT1+3gBPBPsF2sDk8JrPQpbPa
 wNZzwRVmr95T6urMxk5un5C3kw5UkcfEAVNoPDse0NmbyhMuNOn7ekqui9wrMEwn6iQE
 yW09cv5fWVT+g8yGPFyFXFlfa1fyrv+GpsWIC61JGafgGJFralzCcUtG+XhMkK8anYgF
 AG+Msi3h6BYNd1p2eJeaMFZfiZpKL7r7E0xCvLN7W0QJ4AhBiJVbsArlTpV8xW+FtCaV
 MGJg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1744989088; x=1745593888;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=vu0HG9q9CgwNV0e2D9YoP4sJ4kFSl1vkyN5DjRK1Nxc=;
 b=Cf3e3mZdki4wdX2n/yzgl2uyx/HQkYwMsrza5sb4NYMcoeJUBFmFmQ0IQQAD8hLX9q
 olwjdoZ7GDQh6zHWaBC6wRZB31OyRFq949Dtc5Pr5Lhqwv9RNDRohIubVxLI31uAb9WM
 9Nuy3yZpXQAXvCtWstiJ8lDl3ol0/QUcmP7VVbm4uSsIv9Ks1SlLDMrgI60HH6P1LWje
 V+jCKljQC1ace1VL8gNN5h6OoX9rsCus3ezwz+cK3ctuxt5r8JXYi3Jvly6B6aIgE6su
 tFyhRmCBG/Y1nRx10s4E9h563ZA2OgPSlWHoWcgj9RLRZ6mkuTE2fGHSD9HcNtr5K6r9
 /uUw==
X-Gm-Message-State: AOJu0YwJN+bzxIfSdO+gD22jP6ozSdtY5sTwPvRwL6Cx693yt66PWF2r
 E07/0L+5wcq9s65iLIpKLnpP/J8d6v0M1sxr5xDeffgoZw439VLwEXqahxvdSDLw8Sh+UabQW3V
 i
X-Gm-Gg: ASbGnctQ5HVxIH0fPS2zUfrFumkRQDcff2b3wBmy4CCHtiwhUCF53cTZwFkYVOQ8IkC
 Muef/IeRhPYqQ+vUe0ewvHG0gqGDKfU17W4xV+5i3qWpOVnL79X84uCHoxhmYhog6QwYSI423r7
 p+t+1dMAXzABOJfIEuyhZob/4lj0d6yAZdlAY4C1kETCHGGWhw3bvl4ysnWj0n9ZnHqp9lLw5L0
 fxzKTa+VVcirbDTDstsDNJL5Uc9X7UrNCRvf35bDpJiVAEUSc9Az4aEhuYSfn4TGHVCDemo8cwt
 uL1iQxzb9zdFUP6qKtFlnE0eU84eBWjE5yHjc/DVePZ5YN/55y8rM/03pVxYNJR3hr9zBVeukyj
 0CiwXzx+tH/oaXqT1Sah16t1gZEPzgSAc80vl8Knl
X-Google-Smtp-Source: AGHT+IEEv45yiFGxJPko7iRmD1jqQQ//X2MwBW9Q5yz0u42oADpOMy3UWmlXvQzRUw9pXkegwOUsWQ==
X-Received: by 2002:a05:620a:bc8:b0:7c9:1335:633e with SMTP id
 af79cd13be357-7c927f6b658mr465847285a.1.1744989088233; 
 Fri, 18 Apr 2025 08:11:28 -0700 (PDT)
Received: from ip-10-117-149-49.evoforge.org
 (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183])
 by smtp.gmail.com with ESMTPSA id
 af79cd13be357-7c925ac5472sm116166585a.63.2025.04.18.08.11.27
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Apr 2025 08:11:27 -0700 (PDT)
From: Greg Hogan <code@HIDDEN>
Date: Fri, 18 Apr 2025 15:11:09 +0000
Message-ID: <cover.1744988258.git.code@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: none client-ip=2607:f8b0:4864:20::72c;
 envelope-from=code@HIDDEN; helo=mail-qk1-x72c.google.com
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_NONE=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

The component suitesparse packages have no other dependents.

igraph has 26 dependent packages. Switch igraph to the suitesparse
dependency as the newer CXSparse breaks the build (igraph vendors
CXSparse from SuiteSparse 5.12.0).

Greg Hogan (2):
  gnu: Add %suitesparse-package-versions.
  gnu: igraph: Update to 0.10.15.

 gnu/local.mk                                  |  1 -
 gnu/packages/graph.scm                        |  7 +-
 gnu/packages/maths.scm                        | 64 +++++++++++--------
 gnu/packages/patches/gklib-suitesparse.patch  |  6 +-
 .../igraph-fix-varargs-integer-size.patch     | 39 -----------
 5 files changed, 45 insertions(+), 72 deletions(-)
 delete mode 100644 gnu/packages/patches/igraph-fix-varargs-integer-size.patch


base-commit: ffc8a07ba45503014cc0647c5dd0613829999f98
-- 
2.49.0





Message sent:


Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Greg Hogan <code@HIDDEN>
Subject: bug#77902: Acknowledgement ([PATCH science-team 0/2] Update
 SuiteSparse.)
Message-ID: <handler.77902.B.17449891394362.ack <at> debbugs.gnu.org>
References: <cover.1744988258.git.code@HIDDEN>
X-Gnu-PR-Message: ack 77902
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 77902 <at> debbugs.gnu.org
Date: Fri, 18 Apr 2025 15:13:03 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 77902 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
77902: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D77902
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems


Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77902] [PATCH science-team 2/2] gnu: igraph: Update to 0.10.15.
Resent-From: Greg Hogan <code@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 18 Apr 2025 15:16:05 +0000
Resent-Message-ID: <handler.77902.B77902.17449893056299 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 77902
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77902 <at> debbugs.gnu.org
Cc: Greg Hogan <code@HIDDEN>
Received: via spool by 77902-submit <at> debbugs.gnu.org id=B77902.17449893056299
          (code B ref 77902); Fri, 18 Apr 2025 15:16:05 +0000
Received: (at 77902) by debbugs.gnu.org; 18 Apr 2025 15:15:05 +0000
Received: from localhost ([127.0.0.1]:52481 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1u5nQi-0001cE-37
	for submit <at> debbugs.gnu.org; Fri, 18 Apr 2025 11:15:04 -0400
Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:48538)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <code@HIDDEN>)
 id 1u5nQZ-0001ZB-Co
 for 77902 <at> debbugs.gnu.org; Fri, 18 Apr 2025 11:14:56 -0400
Received: by mail-qv1-xf30.google.com with SMTP id
 6a1803df08f44-6f0ad74483fso22345596d6.1
 for <77902 <at> debbugs.gnu.org>; Fri, 18 Apr 2025 08:14:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1744989284; x=1745594084;
 darn=debbugs.gnu.org; 
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=j48hDdxDEJk1ah0EPJXxOtAXU2VoTCbr49Jf+bt65LI=;
 b=sobfARwJ2roMxA1O7gsnf/g8Ylu4OKIhoK1UOG+yXkV1LlWKn7Bp9fWbB7q3GYQqgL
 InFQ0ZwX8DXKN1CT/rK2XWpIX1ROT5v0NwSCzz+D7EIWMem0LSrFekmHxuYuxq6Zi9L7
 BP9Ae6xf4UwrT+Ko2ef4f6daTW2fJ1mguK5V22Vo15lBqIeFXjz6Z8Uc+3RrH3DqNnwI
 FPYiszxY070Gjsk+cDys4eFzUMHPRpONQtDAMzgRMiF5xp5fsmoqFRDD2DZeHdmuyHeQ
 7oyfaA/SQysZEhb8lPYs1RRJotxMKN3yVskhh0IvKLtX3URbawscJtlERizEC/270MOK
 ftmg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1744989284; x=1745594084;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=j48hDdxDEJk1ah0EPJXxOtAXU2VoTCbr49Jf+bt65LI=;
 b=mg5n+JX9ucoWnczXRjBFOMLkIULxA3hrKbzn3CFbqiQM5pmVt0ixB17ao/D68eCUOk
 fYCyraK9VNyQSwYp/Oug0YUeDIDEBA6x6W5MX1QGlL3SWhyIfgtU9Faklcvls4vgEEEv
 i5t8Cr5sNvPUI9Heba/qmQVPczSfYHWKpM65n/KHRNVdH1wEa8GfISzlaWxcyUHynuG2
 zVIvOR5yPd/Rnch/CfStwgsml9nmXPoRP5hqcsIrpyZfw5i4qnx26rO4D6ZMXGz7eJwe
 SobGG9Bj1ZUSNXIh1PPAgj2rl6jj138OtbR0k+ya5DHnnJo+xD0rG+fGALKwfEXNaCZZ
 SySA==
X-Gm-Message-State: AOJu0YwFsejMvINJP1ank9lDFGMKx3dP6Z1YlbC7WdSnkPRlUQFRfR6r
 nkU4c/UW+Jf2dHeRLRTRoHGL9Dd65Ha65PM4iX2rXH3UjDYEBID671yF9oS5C4AP9/0MQ76wv2J
 a
X-Gm-Gg: ASbGncue4raCFncnZ6C5GYtCVPsKr0/Ycao83cXRdpby3oerduTsMwbRMshb2yRXSoN
 omcO1cmS+0is6R/5uzLH4akLpLQLbiYh+Lzi4oV2wzikqZYyKrduQux/DgzcW2We4kV3zO6nKE6
 edS42BvEJS8CMP48dw98zGMkXoUQKReiCbrGbebgIEVH4amreps9MoHFmgUosm95LiurgEDKzRU
 tnNzVCXgCaX5+URMNopv8u6DJcaQKbVHmAsu80hNA4Kl219FlFgf/pu1cnxLrViF+xk0D2YesRV
 OWhNzOZjSdzTidie7JzxkLWF6BL8SlWvRQjADbRB7nhsrhs3PRxsIVU+7Vi8BwbYIgEwycX3fp0
 TsqSPR/98hSnyDokqn1Ylz5a+N6Iu9pGCxsG2ib+9
X-Google-Smtp-Source: AGHT+IF+3EMp3ZIl6as9xwbrXnCjLWiAE3mbLHG5GTzaoZ01sRJ/aMzCp6wWu7zSkULy/jPjHe7x1w==
X-Received: by 2002:a05:6214:410e:b0:6d8:80e8:d567 with SMTP id
 6a1803df08f44-6f2c4546bcamr49588976d6.18.1744989284180; 
 Fri, 18 Apr 2025 08:14:44 -0700 (PDT)
Received: from ip-10-117-149-49.evoforge.org
 (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183])
 by smtp.gmail.com with ESMTPSA id
 6a1803df08f44-6f2c2b0f80asm11563896d6.45.2025.04.18.08.14.43
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Apr 2025 08:14:43 -0700 (PDT)
From: Greg Hogan <code@HIDDEN>
Date: Fri, 18 Apr 2025 15:14:10 +0000
Message-ID: <4765db19bd76943e2303a04eae2f77f2a43b445b.1744988258.git.code@HIDDEN>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <cover.1744988258.git.code@HIDDEN>
References: <cover.1744988258.git.code@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/graph.scm (igraph): Update to 0.10.15.
[source]: Remove patches.
[inputs]: Replace suitesparse-cxsparse with suitesparse.
* gnu/packages/patches/igraph-fix-varargs-integer-size.patch: Delete.
* gnu/local.mk (dist_patch_DATA): Update accordingly.

Change-Id: Iffbfdc83b347f9abf82891f5b97954903d3df3dd
---
 gnu/local.mk                                  |  1 -
 gnu/packages/graph.scm                        |  7 ++--
 .../igraph-fix-varargs-integer-size.patch     | 39 -------------------
 3 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 gnu/packages/patches/igraph-fix-varargs-integer-size.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 62cfe230bb..2828d8913f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1610,7 +1610,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
   %D%/packages/patches/id3lib-UTF16-writing-bug.patch			\
   %D%/packages/patches/idris-test-ffi008.patch			\
-  %D%/packages/patches/igraph-fix-varargs-integer-size.patch	\
   %D%/packages/patches/ilmbase-fix-tests.patch			\
   %D%/packages/patches/indent-CVE-2024-0911.patch	\
   %D%/packages/patches/inferno-fix-crash.patch		\
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 467a7f661b..af4943c281 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -106,7 +106,7 @@ (define-public plfit
 (define-public igraph
   (package
     (name "igraph")
-    (version "0.10.7")
+    (version "0.10.15")
     (source
      (origin
        (method git-fetch)
@@ -114,7 +114,6 @@ (define-public igraph
              (url "https://github.com/igraph/igraph")
              (commit version)))
        (file-name (git-file-name name version))
-       (patches (search-patches "igraph-fix-varargs-integer-size.patch"))
        (modules '((guix build utils)
                   (ice-9 ftw)
                   (srfi srfi-26)))
@@ -136,7 +135,7 @@ (define-public igraph
                      (("add_sub.*vendor.*") ""))))
        (sha256
         (base32
-         "025f9c2jsawniqkig4l5z3v9aw3ipazmnlsf80b653mns5bvj1yn"))))
+         "0z9jqvl65j4z6brrjlfyykba2bs10az6dx6m8g41snlfnx21a82d"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -201,7 +200,7 @@ (define-public igraph
            ;lapack
            openblas
            plfit
-           suitesparse-cxsparse))
+           suitesparse))
     ;; libxml2 is in the 'Requires.private' of igraph.pc.
     (propagated-inputs (list libxml2))
     (home-page "https://igraph.org")
diff --git a/gnu/packages/patches/igraph-fix-varargs-integer-size.patch b/gnu/packages/patches/igraph-fix-varargs-integer-size.patch
deleted file mode 100644
index 2d7ffd7e68..0000000000
--- a/gnu/packages/patches/igraph-fix-varargs-integer-size.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-If the size of int is different from IGRAPH_INTEGER_SIZE, the integer size
-passed to these vararg arguments is different from the assumed one,
-leading to undefined behavior.
-Submitted upstream: https://github.com/igraph/igraph/pull/2423
-
-
-diff -ur a/examples/simple/igraph_union.c b/examples/simple/igraph_union.c
---- a/examples/simple/igraph_union.c
-+++ b/examples/simple/igraph_union.c
-@@ -103,7 +103,7 @@
-     igraph_vector_ptr_init(&glist, 10);
-     for (i = 0; i < igraph_vector_ptr_size(&glist); i++) {
-         VECTOR(glist)[i] = calloc(1, sizeof(igraph_t));
--        igraph_vector_int_init_int_end(&v, -1, i, i + 1, 1, 0, -1);
-+        igraph_vector_int_init_int_end(&v, -1, (int) i, (int) i + 1, 1, 0, -1);
-         igraph_create(VECTOR(glist)[i], &v, 0, IGRAPH_DIRECTED);
-         igraph_vector_int_destroy(&v);
-     }
-@@ -123,7 +123,7 @@
-     igraph_vector_ptr_init(&glist, 10);
-     for (i = 0; i < igraph_vector_ptr_size(&glist); i++) {
-         VECTOR(glist)[i] = calloc(1, sizeof(igraph_t));
--        igraph_vector_int_init_int_end(&v, -1, i, i + 1, 1, 0, -1);
-+        igraph_vector_int_init_int_end(&v, -1, (int) i, (int) i + 1, 1, 0, -1);
-         igraph_create(VECTOR(glist)[i], &v, 0, IGRAPH_UNDIRECTED);
-         igraph_vector_int_destroy(&v);
-     }
-diff -ur a/src/core/matrix.pmt b/src/core/matrix.pmt
---- a/src/core/matrix.pmt
-+++ b/src/core/matrix.pmt
-@@ -1863,7 +1863,7 @@
- #ifdef FPRINTFUNC_ALIGNED
-             FPRINTFUNC_ALIGNED(file, VECTOR(column_width)[j], MATRIX(*m, i, j));
- #else
--            fprintf(file, format, VECTOR(column_width)[j], MATRIX(*m, i, j));
-+            fprintf(file, format, (int) VECTOR(column_width)[j], MATRIX(*m, i, j));
- #endif
-         }
-         fprintf(file, "\n");
-- 
2.49.0





Message sent to andreas@HIDDEN, bavier@HIDDEN, sharlatanus@HIDDEN, guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77902] [PATCH science-team 1/2] gnu: Add %suitesparse-package-versions.
Resent-From: Greg Hogan <code@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andreas@HIDDEN, bavier@HIDDEN, sharlatanus@HIDDEN, guix-patches@HIDDEN
Resent-Date: Fri, 18 Apr 2025 15:16:07 +0000
Resent-Message-ID: <handler.77902.B77902.17449893246834 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 77902
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77902 <at> debbugs.gnu.org
Cc: "X-Debbugs-Cc: Andreas Enge" <andreas@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Greg Hogan <code@HIDDEN>, Eric Bavier <bavier@HIDDEN>, Andreas Enge <andreas@HIDDEN>, Eric Bavier <bavier@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>
X-Debbugs-Original-Xcc: Andreas Enge <andreas@HIDDEN>, Eric Bavier <bavier@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>
Received: via spool by 77902-submit <at> debbugs.gnu.org id=B77902.17449893246834
          (code B ref 77902); Fri, 18 Apr 2025 15:16:07 +0000
Received: (at 77902) by debbugs.gnu.org; 18 Apr 2025 15:15:24 +0000
Received: from localhost ([127.0.0.1]:52484 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1u5nR1-0001jJ-0g
	for submit <at> debbugs.gnu.org; Fri, 18 Apr 2025 11:15:23 -0400
Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:60792)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <code@HIDDEN>)
 id 1u5nQZ-0001Yx-Mi
 for 77902 <at> debbugs.gnu.org; Fri, 18 Apr 2025 11:15:09 -0400
Received: by mail-qv1-xf2a.google.com with SMTP id
 6a1803df08f44-6eeb7589db4so21132666d6.1
 for <77902 <at> debbugs.gnu.org>; Fri, 18 Apr 2025 08:14:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1744989283; x=1745594083;
 darn=debbugs.gnu.org; 
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=J2fzI/+Rzyg4sOQ2ZZdvMcyL9xiJarJMe1BLkow9rK4=;
 b=cy0NPnPCju9TGIK3BkaoW7gMEygvZK2ArVEwo/z+IYsid7JawMDP36E+AaAmMmESfE
 SC8oHdWFmc4I7LDxSS6BiHpAjoA9F3wyCS/dzt5Ld4RyNcFgW/EdNeN0TIQD0MKhgIkx
 AyfrFDEPSmk5HFs7LUt/Y05fnMasxHghQPUiKZ7IStgcKZHD7ugFZ1zyiwQ0fo8kC2H3
 l0UfNLhWRliQ96eOaV77QH53+qAv464KqCTmiYLq19ej8U6s7rFSw0LE2MTz0ztLUOlS
 0POp78fQdUVLHJGlo5wIIg7oj0VTnjo2QDf8WtB4MHGmDUxORaXeD8h8Lc3eQtupBUqc
 A54g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1744989283; x=1745594083;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=J2fzI/+Rzyg4sOQ2ZZdvMcyL9xiJarJMe1BLkow9rK4=;
 b=Vf520wntb8MUyCuklMh4b5sPC92t/gAM+l4nBiNN+gh+2g+dSW1E6oRABJ0jjboKqr
 NRGjOj07jZ10j5mwoSPF7GYc6r8FL0I0q7v7n8ig8z3MIQWGEtTIIOlS3he9RIQqFEa7
 sbK7TPvm6jWvt2yiCvUFDFNtDIXFK5i/uK34p2UyoNqaARyEj1lrKdBKWfWCJJMvhj/B
 yc5iMbGsI9FDD2eDgqv660TrZ7jFHQsnhalo0tBwBbH2dncw1nu8aeXuctFbEKZW7rgP
 nKE76jSsnHwIqm750L/SjjN3/aKLtaorL1teiHO2WDZKj57baqeOQnVIs03E8sJOn+yV
 a2YA==
X-Gm-Message-State: AOJu0YwKx8/DQwm9cyNgrfjj7dH9bRriRSYWg0l2aFWTXToJdjYB8vuE
 IVX1kowcqWQVwsxhpZHIvDBLPv7zDhn3BP55duZRfc//yv2tG4uLQndOO4USPwLZ7PNyOGfhaUq
 S
X-Gm-Gg: ASbGncuRdu9RvAq7EDQNMUNOypdI60LdxdJ2UT/QMvCpiSGYKCwARsB7h0/IHfTQa86
 9C4SWDLsKr6rGsfD5cX80/fiNntqexwb3llrtMXYlCvFClPX2PsGPPhM9C5X7NXLvRsgJhdFxc0
 9jDyTQE+tJ0TdLOgMw7HjrYvM4bJvXr/9IpReBF6PSD5ErqMA35cTI/bNQ0tzQJZGhfo34Us2XD
 lElrXZbLnUzFx6r1EEIUm+q8rgwTWVnogI8njh+L8F+p5tV/D5NlLDVx9SZchX9xLZZH/p4FJMN
 MLnZQUF5Eg4QCYjBsglGVvXAU1ywLX65SKMgBnitSlEhg3HU3rSCN1POYrgHY7f0R7VpmLeAVKQ
 LBgL2p4PEJ2vz58+YNq/lnTH60FcsG37ebeeRNziS
X-Google-Smtp-Source: AGHT+IFc4KD9rjjys2pgG9FyUD+xsrCYQIsWl9IAZ8IOiUSLLnlK9VVjX8pFEYeYawVIlLlaFQCqQA==
X-Received: by 2002:a05:6214:c2f:b0:6e8:ed7f:1a79 with SMTP id
 6a1803df08f44-6f2c463fda7mr56769936d6.32.1744989283094; 
 Fri, 18 Apr 2025 08:14:43 -0700 (PDT)
Received: from ip-10-117-149-49.evoforge.org
 (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183])
 by smtp.gmail.com with ESMTPSA id
 6a1803df08f44-6f2c2b0f80asm11563896d6.45.2025.04.18.08.14.42
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Apr 2025 08:14:42 -0700 (PDT)
From: Greg Hogan <code@HIDDEN>
Date: Fri, 18 Apr 2025 15:14:09 +0000
Message-ID: <0199e4a26c0ac3f0c07c9e80963f4562f49544e3.1744988258.git.code@HIDDEN>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <cover.1744988258.git.code@HIDDEN>
References: <cover.1744988258.git.code@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/maths.scm (%suitesparse-package-versions): New variable.
(suitesparse-version): Update to 7.10.2.
(suitesparse-source)[origin]: Update deletion list.
(suitesparse-amd, suitesparse-btf, suitesparse-camd, suitesparse-colamd,
suitesparse-ccolamd, suitesparse-cholmod, suitesparse-cxsparse,
suitesparse-klu, suitesparse-ldl, suitesparse-rbio, suitesparse-monUse
goose,
suitesparse-spex, suitesparse-spqr, suitesparse-umfpack)
[version]: Use %suitesparse-package-versions.
(suitesparse-cholmod)[arguments]<#:phases>('install-license-files):
Update paths.
(suitesparse-klu)[arguments]<#:phases>('build-doc): Update paths.
(suitesparse-spex)[native-inputs]: Add texlive-fncychap.
(suitesparse-spqr)[native-inputs]: Add texlive-etoolbox.
* gnu/packages/patches/gklib-suitesparse.patch: Update version and path.

Change-Id: I14a9bfeddb37330c88a2e94b0992c2f1afbc5310
---
 gnu/packages/maths.scm                       | 64 ++++++++++++--------
 gnu/packages/patches/gklib-suitesparse.patch |  6 +-
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4be9e71320..4cfcd5ba9e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -6060,9 +6060,25 @@ (define-public openspecfun
     ;; public domain software.
     (license (list license:expat license:public-domain))))
 
+(define %suitesparse-package-versions
+  '(("AMD" . "3.3.3")
+    ("BTF" . "2.3.2")
+    ("CAMD" . "3.3.3")
+    ("CCOLAMD" . "3.3.4")
+    ("CHOLMOD" . "5.3.2")
+    ("COLAMD" . "3.3.4")
+    ("CXSparse" . "4.4.1")
+    ("KLU" . "2.3.5")
+    ("LDL" . "3.3.2")
+    ("SuiteSparse_Mongoose" . "3.3.4")
+    ("RBio" . "4.3.4")
+    ("SPEX" . "3.2.3")
+    ("SPQR" . "4.3.4")
+    ("UMFPACK" . "6.3.5")))
+
 ;; Source for the modular SuiteSparse packages. When updating, also update the
 ;; (different) versions of the subpackages.
-(define suitesparse-version "7.2.0")
+(define suitesparse-version "7.10.2")
 (define suitesparse-source
   (origin
     (method git-fetch)
@@ -6072,10 +6088,12 @@ (define suitesparse-source
     (file-name (git-file-name "suitesparse" suitesparse-version))
     (sha256
      (base32
-      "1draljn8i46862drc6008cnb2zjpklf74j8c34jirjazzpf53kaa"))
+      "1ndwx2cp5zxrikq4xdrzjrxk1b5ps7lyi6qw34m8jpfpa0ba01ln"))
     (modules '((guix build utils)))
     (snippet
      #~(begin
+         ;; Empty except for a .gitignore.
+         (delete-file-recursively "build")
          ;; Delete autogenerated and bundled files
          (for-each delete-file (find-files "." "\\.pdf$"))
          ;; ssget
@@ -6086,19 +6104,13 @@ (define suitesparse-source
          (delete-file-recursively "CHOLMOD/SuiteSparse_metis")
          ; GraphBLAS
          (delete-file "GraphBLAS/README.md")
-         (delete-file "GraphBLAS/Config/GB_config.h")
          (delete-file "GraphBLAS/Config/GB_prejit.c")
          (delete-file-recursively "GraphBLAS/cpu_features")
-         (delete-file "GraphBLAS/CUDA/GB_cuda_common_jitFactory.hpp")
-         (delete-file "GraphBLAS/JITpackage/GB_JITpackage.c")
          (delete-file-recursively "GraphBLAS/lz4/lz4.c")
          (delete-file-recursively "GraphBLAS/lz4/lz4.h")
          (delete-file-recursively "GraphBLAS/lz4/lz4hc.c")
          (delete-file-recursively "GraphBLAS/lz4/lz4hc.h")
-         (delete-file "GraphBLAS/GraphBLAS/Config/GB_config.h")
          (delete-file "GraphBLAS/Tcov/PreJIT/GB_prejit.c")
-         (delete-file-recursively "GraphBLAS/Source/FactoryKernels")
-         (delete-file "GraphBLAS/Source/GB_AxB__include1.h")
          (delete-file "GraphBLAS/xxHash/xxhash.h")
          (delete-file-recursively "GraphBLAS/zstd/zstd_subset")
          ;; KLU
@@ -6144,7 +6156,7 @@ (define-public suitesparse-config
 (define-public suitesparse-amd
   (package
     (name "suitesparse-amd")
-    (version "3.2.0")
+    (version (assoc-ref %suitesparse-package-versions "AMD"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6192,7 +6204,7 @@ (define-public suitesparse-amd
 (define-public suitesparse-btf
   (package
     (name "suitesparse-btf")
-    (version "2.2.0")
+    (version (assoc-ref %suitesparse-package-versions "BTF"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6225,7 +6237,7 @@ (define-public suitesparse-btf
 (define-public suitesparse-camd
   (package
     (name "suitesparse-camd")
-    (version "3.2.0")
+    (version (assoc-ref %suitesparse-package-versions "CAMD"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6270,7 +6282,7 @@ (define-public suitesparse-camd
 (define-public suitesparse-colamd
   (package
     (name "suitesparse-colamd")
-    (version "3.2.0")
+    (version (assoc-ref %suitesparse-package-versions "COLAMD"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6303,7 +6315,7 @@ (define-public suitesparse-colamd
 (define-public suitesparse-ccolamd
   (package
     (name "suitesparse-ccolamd")
-    (version "3.2.0")
+    (version (assoc-ref %suitesparse-package-versions "CCOLAMD"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6386,7 +6398,7 @@ (define-public metis-suitesparse
 (define-public suitesparse-cholmod
   (package
     (name "suitesparse-cholmod")
-    (version "4.2.0")
+    (version (assoc-ref %suitesparse-package-versions "CHOLMOD"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6448,7 +6460,7 @@ (define-public suitesparse-cholmod
               (let ((out (string-append #$output
                                         "/share/doc/" #$name "-" #$version)))
                 (install-file "../CHOLMOD/Doc/License.txt" out)
-                (install-file "../CHOLMOD/Core/lesser.txt" out)
+                (install-file "../CHOLMOD/Check/lesser.txt" out)
                 (install-file "../CHOLMOD/MatrixOps/gpl.txt" out)))))))
     (inputs
      (list gklib-suitesparse
@@ -6471,7 +6483,7 @@ (define-public suitesparse-cholmod
 (define-public suitesparse-cxsparse
   (package
     (name "suitesparse-cxsparse")
-    (version "4.2.0")
+    (version (assoc-ref %suitesparse-package-versions "CXSparse"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6505,7 +6517,7 @@ (define-public suitesparse-cxsparse
 (define-public suitesparse-klu
   (package
     (name "suitesparse-klu")
-    (version "2.2.0")
+    (version (assoc-ref %suitesparse-package-versions "KLU"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6537,7 +6549,7 @@ (define-public suitesparse-klu
             (lambda _
               (substitute* "../KLU/Doc/Makefile"
                 (("\\.\\./\\.\\./BTF/Include/btf.h")
-                 (string-append #$suitesparse-btf "/include/btf.h")))
+                 (string-append #$suitesparse-btf "/include/suitesparse/btf.h")))
               (with-directory-excursion "../KLU/Doc"
                 (invoke "make"))))
           (add-after 'install 'install-doc
@@ -6569,7 +6581,7 @@ (define-public suitesparse-klu
 (define-public suitesparse-ldl
   (package
     (name "suitesparse-ldl")
-    (version "3.2.0")
+    (version (assoc-ref %suitesparse-package-versions "LDL"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6622,7 +6634,7 @@ (define-public suitesparse-ldl
 (define-public suitesparse-rbio
   (package
     (name "suitesparse-rbio")
-    (version "4.2.0")
+    (version (assoc-ref %suitesparse-package-versions "RBio"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6660,7 +6672,7 @@ (define-public suitesparse-rbio
 (define-public suitesparse-mongoose
   (package
     (name "suitesparse-mongoose")
-    (version "3.2.0")
+    (version (assoc-ref %suitesparse-package-versions "SuiteSparse_Mongoose"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6735,7 +6747,7 @@ (define-public suitesparse-mongoose
 (define-public suitesparse-spex
   (package
     (name "suitesparse-spex")
-    (version "2.2.0")
+    (version (assoc-ref %suitesparse-package-versions "SPEX"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6778,6 +6790,7 @@ (define-public suitesparse-spex
                   texlive-soul
                   texlive-multirow
                   texlive-algorithms
+                  texlive-fncychap
                   texlive-float
                   texlive-algorithmicx
                   texlive-cprotect
@@ -6801,7 +6814,7 @@ (define-public suitesparse-spex
 (define-public suitesparse-spqr
   (package
     (name "suitesparse-spqr")
-    (version "4.2.0")
+    (version (assoc-ref %suitesparse-package-versions "SPQR"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
@@ -6851,7 +6864,8 @@ (define-public suitesparse-spqr
     (propagated-inputs (list suitesparse-cholmod))
     (native-inputs
      (list (texlive-updmap.cfg
-            (list texlive-epsf))))
+            (list texlive-epsf
+                  texlive-etoolbox))))
     (home-page "https://people.engr.tamu.edu/davis/suitesparse.html")
     (synopsis "Sparse QR factorization method")
     (description "The SPQR (SuiteSparseQR) package provides sparse QR
@@ -6862,7 +6876,7 @@ (define-public suitesparse-spqr
 (define-public suitesparse-umfpack
   (package
     (name "suitesparse-umfpack")
-    (version "6.2.0")
+    (version (assoc-ref %suitesparse-package-versions "UMFPACK"))
     (source suitesparse-source)
     (build-system cmake-build-system)
     (arguments
diff --git a/gnu/packages/patches/gklib-suitesparse.patch b/gnu/packages/patches/gklib-suitesparse.patch
index 8b6c708b6a..d207f080b1 100644
--- a/gnu/packages/patches/gklib-suitesparse.patch
+++ b/gnu/packages/patches/gklib-suitesparse.patch
@@ -1,5 +1,5 @@
 This patch contains the relevant changes to GKlib made in SuiteSparse
-(CHOLMOD) for the version 7.2.0
+(CHOLMOD) for the version 7.10.2
 (https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/8a7641cdb4809533c681417e94f98058c07c5da2).
 The disabling of signal handling when MATLAB_MEX_FILE is defined is omitted.
 
@@ -10,7 +10,7 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt
  
  option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF)
  
-+find_package ( SuiteSparse_config 7.1.0 REQUIRED )
++find_package ( SuiteSparse_config 7.10.2 REQUIRED )
 +
  get_filename_component(abs "." ABSOLUTE)
  set(GKLIB_PATH ${abs})
@@ -25,7 +25,7 @@ diff -ur a/GKlib.h b/GKlib.h
 +/* -------------------------------------------------------------------------- */
 +/* Added for incorporation into SuiteSparse.
 +   Tim Davis, Oct 31, 2022, Texas A&M University. */
-+#include "SuiteSparse_config.h"
++#include "suitesparse/SuiteSparse_config.h"
 +#define malloc  SuiteSparse_config_malloc
 +#define calloc  SuiteSparse_config_calloc
 +#define realloc SuiteSparse_config_realloc
-- 
2.49.0






Last modified: Fri, 18 Apr 2025 15:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.