diff options
author | Greg Hogan <code@greghogan.com> | 2025-04-18 14:41:30 +0000 |
---|---|---|
committer | Greg Hogan <code@greghogan.com> | 2025-05-13 16:35:40 +0000 |
commit | 365d1ed9082fb995604ae60686b08ef19108fdc6 (patch) | |
tree | 0933eb67f0cd0fb0a6de8a4731148a6bf37528a7 | |
parent | c6aaffba1c766d67cac28c47682952fb3ec095e5 (diff) | |
download | guix-365d1ed9082fb995604ae60686b08ef19108fdc6.tar.gz guix-365d1ed9082fb995604ae60686b08ef19108fdc6.zip |
gnu: igraph: Update to 0.10.15.
* 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
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/graph.scm | 5 | ||||
-rw-r--r-- | gnu/packages/patches/igraph-fix-varargs-integer-size.patch | 39 |
3 files changed, 2 insertions, 43 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8d1b44977f..ce0f981a41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1609,7 +1609,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 ab8594eefb..9458f9d332 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -106,7 +106,7 @@ distributions in empirical data. SIAM Review 51, 661-703 (2009)}).") (define-public igraph (package (name "igraph") - (version "0.10.7") + (version "0.10.15") (source (origin (method git-fetch) @@ -114,7 +114,6 @@ distributions in empirical data. SIAM Review 51, 661-703 (2009)}).") (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 @@ distributions in empirical data. SIAM Review 51, 661-703 (2009)}).") (("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"); |