From patchwork Mon May 5 16:43:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 42331 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 C228527BC4B; Mon, 5 May 2025 17:48:43 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 3BBA627BC49 for ; Mon, 5 May 2025 17:48:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uByz8-0004it-Gf; Mon, 05 May 2025 12:48:06 -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 1uByz5-0004fX-42 for guix-patches@gnu.org; Mon, 05 May 2025 12:48:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uByz4-0001lF-QS for guix-patches@gnu.org; Mon, 05 May 2025 12:48:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=K1r1TCfz2aqOQvMo4ynB94nkhgRkvVoGRVZfO1Yw8vg=; b=aWtEW43+qyoMbluubv73a7wuey0EDa0HHFQJflcu01sNmyMIssFLz6LU4uIy8FYHFbR60LfeEReHkMP2kjvMCAoiP9qkiFcTA05HiccCOjTHeiGtBnIWhWMcz4PE7DQbEut3FuOaV1T2ydoqmJblPZnco9p0q3q7IrRE9YbZYdU0nrvDT3BsvhGlZOmvNTvQs2y+K8s3J4aJ5zGiLcmnRaFdrQq1vsOI4xBMfFi4cBuoSJc3a0/kFcjbDi+S2XH0jlrr725dx5jV/ZeqDGDVF929DYnfGZcViAtq0+2OqFdVIcKhlLgEPUGUnvo1Esjx58mPHr/MEO3Hbxkc/TSY3Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uByz4-0004U3-M0 for guix-patches@gnu.org; Mon, 05 May 2025 12:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77902] [PATCH v2 science-team 2/7] gnu: igraph: Update to 0.10.15. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 May 2025 16:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77902 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77902@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 77902-submit@debbugs.gnu.org id=B77902.174646367617153 (code B ref 77902); Mon, 05 May 2025 16:48:02 +0000 Received: (at 77902) by debbugs.gnu.org; 5 May 2025 16:47:56 +0000 Received: from localhost ([127.0.0.1]:42282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uByyx-0004SU-5Z for submit@debbugs.gnu.org; Mon, 05 May 2025 12:47:55 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:53711) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uByyu-0004Re-0K for 77902@debbugs.gnu.org; Mon, 05 May 2025 12:47:52 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-6e8f8657f29so46672116d6.3 for <77902@debbugs.gnu.org>; Mon, 05 May 2025 09:47:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1746463666; x=1747068466; 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=K1r1TCfz2aqOQvMo4ynB94nkhgRkvVoGRVZfO1Yw8vg=; b=vvZvMeQc7RDLxz07MoM2oZkf6B3OqRxkjD4TP7qGkIApB30RvwaKfP1C2cHF6MngfH Q7FbVEyv4spgn+agyuXfQEMPckCEa4+48ty/kPziaaTTi7dQPmGVkFIP9IrBQaX9W8E4 WYz24ISx0jx+RpnmF1Bxz5ATYMmbeanI2QZ8IiyNr5osl1AyN0U+Hm18OFRUnbpEM+Qh 2WfYPKaLgmUbQguZNNifZApqGnTEFInPsRZj+c1kF4Vj5+sR/Jm29wzy8hlh/MIJHTTu +SZ8OrngAo252aUzv3WqvVmG5tUtz3q8+OSewEfghJzYEBgLN6ceYYL9OzLlo0IjvEZa 6prQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746463666; x=1747068466; 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=K1r1TCfz2aqOQvMo4ynB94nkhgRkvVoGRVZfO1Yw8vg=; b=EXW229XSMXOSsN4Oi1BllapBmR9V8yc4noTalu55ehCK0r2B+iHO0XOKzYlz92a3q2 CHEeH9B7kC8NHNr3pP4VfNHLKkzjEZ9rNu9XWYG7OMnqLOz+ChT8RpiulfG4hRYzdDfM n9tt/snqLjmkrgaUqo7OCgFRKnq1iBSnalZXJ8XQtVuDx0HMu+hERASQD3uZi6TO8Xef qxVTnWDIx1RUXBtsNQxJ1Ahq6CLIYtB9vPSUF6f/YsNlVu5T7Azyu5pQ4tPiPp+w+fms cF6HpM6QZoDj8cSZ+7xuvp66+vt20ucGXlY1AoP7DH550Ko6SM06MaNA6hzKiN85wyLq h9TQ== X-Gm-Message-State: AOJu0YztQctLdjbcd415Wbm8z06KdYr4hfK/grmT+CXr+jR53ylchhC0 YykiG3b2/mj3+KkeoGEXi+hiBoyWO1SkIKwozYTznFAUr+zNpV5hIm6ZBIGRSnKrojeObTw9QvI z X-Gm-Gg: ASbGnctIIfr2nzKZ/B+uPRk8ybW1S178h5DLD0QqTwVAjppFvHakQA5FSsoihBV8AjD 1t9rtrUqy5zd7//oyXlJpvVP8uS17B78TCROXgv5xCUowO2OtcV/3m0zTPo6uLCdC5c2i/ZynOr PT/wJW66TlYA8rOu1j5SGNSpRH7c7AftJNXB3ZBubRt3ibZltpjuvPn02J9U2Fb22sJAVjlQ2hY 7e61jED/fCJJCdjtJjB9g+90Sl7nFBlto/5d56GdvaC33XVzhDrSdf5C/lVUwk36ngcgbGUEpXs KesElf8gT4coN/JjEuR+0TNnE1qli556mlKy5NY4aP9TNt27fGd+HwqJUDGYEjB/YMDtX3wiEVe LZ0RFtFPxeY7S9Rn8OuADkgZ1J88qukh8jyuvA1x+ X-Google-Smtp-Source: AGHT+IFgNYso7QTCEcljQQxziEIRHy4LsNB9ljIitKpTJctOc4vdNlL4IUn0nrJ0WWhEBWnvHSVorQ== X-Received: by 2002:a05:6214:e67:b0:6e8:f464:c9a9 with SMTP id 6a1803df08f44-6f5353cf6d6mr1837906d6.2.1746463665948; Mon, 05 May 2025 09:47:45 -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-6f50f3c32b5sm57738656d6.30.2025.05.05.09.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 09:47:45 -0700 (PDT) From: Greg Hogan Date: Mon, 5 May 2025 16:43:22 +0000 Message-ID: <655499c1d007f27fa6d2c81fc9d58ddda945f019.1746463068.git.code@greghogan.com> X-Mailer: git-send-email 2.49.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graph.scm (igraph): Update to 0.10.15. [source]: Remove patches. * 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 | 5 +-- .../igraph-fix-varargs-integer-size.patch | 39 ------------------- 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 gnu/packages/patches/igraph-fix-varargs-integer-size.patch diff --git a/gnu/local.mk b/gnu/local.mk index e25fcc115b..d351005ae3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1614,7 +1614,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 9cca8520ba..0d65558a60 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 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");