Re: [PR PATCH] [Updated] igraph: update to 0.10.2.

[tornaria <tornaria@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages igraph
https://github.com/void-linux/void-packages/pull/40224

igraph: update to 0.10.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

I run sagemath testsuite with this update.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40224.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-igraph-40224.patch --]
[-- Type: text/x-diff, Size: 4169 bytes --]

From c9200f06c2bd706c25a0767ee6e07b11c726d42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 28 Oct 2022 19:00:39 -0300
Subject: [PATCH 1/2] igraph: update to 0.10.2.

Also: use openblas instead of lapack when available.
---
 common/shlibs           |  2 +-
 srcpkgs/igraph/template | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 481250d5c924..4242beae0db9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3874,7 +3874,7 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.12 intel-gmmlib-22.1.3_1
 libigfxcmrt.so.7 intel-media-driver-21.3.5_1
-libigraph.so.0 igraph-0.9.4_1
+libigraph.so.3 igraph-0.10.2_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
 librdkafka.so.1 librdkafka-1.4.4_3
 librdkafka++.so.1 librdkafka-1.4.4_3
diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template
index 983de0006d3b..0075cb24a31f 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,18 +1,29 @@
 # Template file for 'igraph'
 pkgname=igraph
-version=0.9.8
+version=0.10.2
 revision=1
 build_style=cmake
-configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON"
-hostmakedepends="flex bison python3"
-makedepends="arpack-ng-devel glpk-devel gmp-devel lapack-devel libgomp-devel libxml2-devel SuiteSparse-devel"
+configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON
+ -DBLA_VENDOR=$(vopt_if openblas 'OpenBLAS' 'Generic')"
+makedepends="arpack-ng-devel glpk-devel gmp-devel libgomp-devel libxml2-devel
+ $(vopt_if openblas 'openblas-devel' 'lapack-devel')"
 short_desc="Graph library"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://igraph.org/c/"
 changelog="https://raw.githubusercontent.com/igraph/igraph/master/CHANGELOG.md"
 distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz"
-checksum=f9a83473cea3e037b605b79b336be656b00dcf3037b233b4b250bd9270f36397
+checksum=2c2b9f18fc2f84b327f1146466942eb3e3d2ff09b6738504efb9e5edf2728c83
+
+build_options="openblas"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
+		# Prefer accelerated routines where available
+		build_options_default="openblas"
+		;;
+	*) ;;
+esac
 
 igraph-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From e4ee1a1d48d509b4fc474bf03c24b282afd2f176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 12 Nov 2022 16:14:53 -0300
Subject: [PATCH 2/2] rankwidth: revbump for igraph-0.10.2.

---
 srcpkgs/rankwidth/patches/igraph-0.10.patch | 14 ++++++++++++++
 srcpkgs/rankwidth/template                  |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/rankwidth/patches/igraph-0.10.patch

diff --git a/srcpkgs/rankwidth/patches/igraph-0.10.patch b/srcpkgs/rankwidth/patches/igraph-0.10.patch
new file mode 100644
index 000000000000..de7249e1d402
--- /dev/null
+++ b/srcpkgs/rankwidth/patches/igraph-0.10.patch
@@ -0,0 +1,14 @@
+--- rw-0.9/simplerw.c.newigraph 2017-02-14 00:20:35.000000000 +0900
++++ rw-0.9/simplerw.c   2022-09-11 19:39:47.033917305 +0900
+@@ -134,7 +134,11 @@ int read_graph(const char *format, const
+ 		igraph_destroy(&igraph);
+ 		return(-1);
+ 	}
++#if (IGRAPH_VERSION_MAJOR >= 1) || ((IGRAPH_VERSION_MAJOR == 0) && (IGRAPH_VERSION_MINOR >= 10))
++	igraph_get_adjacency(&igraph, &imatrix, IGRAPH_GET_ADJACENCY_BOTH, NULL, IGRAPH_LOOPS_ONCE);
++#else
+ 	igraph_get_adjacency(&igraph, &imatrix, IGRAPH_GET_ADJACENCY_BOTH, 0);
++#endif
+ 	igraph_destroy(&igraph);
+ 	if(igraph_matrix_nrow(&imatrix) > MAX_VERTICES)
+ 	{
diff --git a/srcpkgs/rankwidth/template b/srcpkgs/rankwidth/template
index 3af39efcbdc3..873e93e1bd15 100644
--- a/srcpkgs/rankwidth/template
+++ b/srcpkgs/rankwidth/template
@@ -1,7 +1,7 @@
 # Template file for 'rankwidth'
 pkgname=rankwidth
 version=0.9
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="igraph-devel"