Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] igraph: update to 0.10.2.
@ 2022-10-29 17:30 tornaria
  2022-10-30 19:06 ` classabbyamp
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: tornaria @ 2022-10-29 17:30 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1700 bytes --]

From d3239a252644548976e67621774babfcfe1d7f21 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] igraph: update to 0.10.2.

---
 common/shlibs           | 2 +-
 srcpkgs/igraph/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c1b969e9d0b4..fc9194545313 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3867,7 +3867,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..8a8ed1e182d3 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,6 +1,6 @@
 # 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"
@@ -12,7 +12,7 @@ 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
 
 igraph-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
@ 2022-10-30 19:06 ` classabbyamp
  2022-10-30 23:17 ` tornaria
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-10-30 19:06 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40224#issuecomment-1296329049

Comment:
does `rankwidth` need to be revbumped for this?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
  2022-10-30 19:06 ` classabbyamp
@ 2022-10-30 23:17 ` tornaria
  2022-10-31 15:08 ` szhorvat
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: tornaria @ 2022-10-30 23:17 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/40224#issuecomment-1296375680

Comment:
> does `rankwidth` need to be revbumped for this?

No, because it's statically linked. But maybe it should (so we make sure it still builds ok).

Maybe I should put together update SuiteSparse (#39846) + update igraph + revbump rankwidth. I'm not in a hurry with this, the priority is to get sagemath updated (#39876) and hopefully working with python 3.11.

BTW, the issue with SuiteSparse is that there are file conflicts between `SuiteSparse-devel` and `mongoose-devel`, but those already conflict in current versions (try `xlocate libmongoose`). I don't know if there's anything we can do about this. Hopefully the sonames remain different. 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
  2022-10-30 19:06 ` classabbyamp
  2022-10-30 23:17 ` tornaria
@ 2022-10-31 15:08 ` szhorvat
  2022-10-31 15:11 ` szhorvat
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: szhorvat @ 2022-10-31 15:08 UTC (permalink / raw)
  To: ml

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

New comment by szhorvat on void-packages repository

https://github.com/void-linux/void-packages/pull/40224#issuecomment-1297233806

Comment:
Note that SuiteSparse is no longer a dependency of igraph since version 0.10.

flex and bison are only needed if you are trying to build the development version from the git repo. If you build from the release archive, as you are doing now, they are not needed.

python3 is only needed if building the docs. The docs are already included in the release archive, so if you want to install them, you can just copy the `doc` folder directly, no need to build anything.

Regarding rankwidth: igraph 0.10 is not API-compatible with 0.9. Some very significant changes have been made, so basically every dependency will need source changes. rankwidth seems to be lucky in that a single very minor change allows it to build, see https://sourceforge.net/p/rankwidth/tickets/2/

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
                   ` (2 preceding siblings ...)
  2022-10-31 15:08 ` szhorvat
@ 2022-10-31 15:11 ` szhorvat
  2022-11-03  2:16 ` tornaria
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: szhorvat @ 2022-10-31 15:11 UTC (permalink / raw)
  To: ml

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

New comment by szhorvat on void-packages repository

https://github.com/void-linux/void-packages/pull/40224#issuecomment-1297233806

Comment:
Note that SuiteSparse is no longer a dependency of igraph since version 0.10.

flex and bison are only needed if you are trying to build the development version from the git repo. If you build from the release archive, as you are doing now, they are not needed.

python3 is only needed if building the docs. The docs are already included in the release archive, so if you want to install them, you can just copy the `doc` folder directly, no need to build anything.

Regarding rankwidth: igraph 0.10 is not API-compatible with 0.9. Some very significant changes have been made, so basically every dependency will need source changes. rankwidth seems to be lucky in that a single very minor change allows it to build, see https://sourceforge.net/p/rankwidth/tickets/2/

A short upgrade guide for package maintainers is here: https://github.com/igraph/igraph/issues/2134#issuecomment-1220427403

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
                   ` (3 preceding siblings ...)
  2022-10-31 15:11 ` szhorvat
@ 2022-11-03  2:16 ` tornaria
  2022-11-12 19:19 ` [PR PATCH] [Updated] " tornaria
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: tornaria @ 2022-11-03  2:16 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/40224#issuecomment-1301569125

Comment:
> Note that SuiteSparse is no longer a dependency of igraph since version 0.10.
> 
> flex and bison are only needed if you are trying to build the development version from the git repo. If you build from the release archive, as you are doing now, they are not needed.
> 
> python3 is only needed if building the docs. The docs are already included in the release archive, so if you want to install them, you can just copy the `doc` folder directly, no need to build anything.
> 
> Regarding rankwidth: igraph 0.10 is not API-compatible with 0.9. Some very significant changes have been made, so basically every dependency will need source changes. rankwidth seems to be lucky in that a single very minor change allows it to build, see https://sourceforge.net/p/rankwidth/tickets/2/
> 
> A short upgrade guide for package maintainers is here: [igraph/igraph#2134 (comment)](https://github.com/igraph/igraph/issues/2134#issuecomment-1220427403)

Thanks for the info, it will be very useful. I'm fighting with sage-on-python 3.11 with a deadline right now, but I will come back to this PR later and make sure igraph + rankwidth work ok.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
                   ` (4 preceding siblings ...)
  2022-11-03  2:16 ` tornaria
@ 2022-11-12 19:19 ` tornaria
  2022-11-13  2:52 ` tornaria
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: tornaria @ 2022-11-12 19:19 UTC (permalink / raw)
  To: ml

[-- 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: 3707 bytes --]

From ff11fddce9453ec01f9098794942f8e04ec195d3 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.

---
 common/shlibs           | 2 +-
 srcpkgs/igraph/template | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 76512744735e..61a732aa2b5a 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..299112220961 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,18 +1,17 @@
 # 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"
+makedepends="arpack-ng-devel glpk-devel gmp-devel lapack-devel libgomp-devel libxml2-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
 
 igraph-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 95b9cce7b3d1afcfccae910bfb06b7d6a07e96ef 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..16248b6bfde4
--- /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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
                   ` (5 preceding siblings ...)
  2022-11-12 19:19 ` [PR PATCH] [Updated] " tornaria
@ 2022-11-13  2:52 ` tornaria
  2022-11-15 19:14 ` [PR PATCH] [Updated] " tornaria
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: tornaria @ 2022-11-13  2:52 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/40224#issuecomment-1312625438

Comment:
Force push:
- removed makedepends on SuiteSparse (no longer needed)
- removed hostmakedepends on flex, bison, python (not needed for the release tarball).
- patched rankwidth and revbump so it compiles with igraph 0.10.2
- tested by running sagemath testsuite after installing the new rankwidth.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
                   ` (6 preceding siblings ...)
  2022-11-13  2:52 ` tornaria
@ 2022-11-15 19:14 ` tornaria
  2022-11-16  2:47 ` tornaria
  2022-12-03 22:36 ` [PR PATCH] [Merged]: " Piraty
  9 siblings, 0 replies; 11+ messages in thread
From: tornaria @ 2022-11-15 19:14 UTC (permalink / raw)
  To: ml

[-- 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: 3707 bytes --]

From ea40158ae7d94ea8850db240bd5fd02a238addf9 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.

---
 common/shlibs           | 2 +-
 srcpkgs/igraph/template | 7 +++----
 2 files changed, 4 insertions(+), 5 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..299112220961 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,18 +1,17 @@
 # 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"
+makedepends="arpack-ng-devel glpk-devel gmp-devel lapack-devel libgomp-devel libxml2-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
 
 igraph-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From dede127cb03a27898b39bbed35bdbc3fd8a72541 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..16248b6bfde4
--- /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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
                   ` (7 preceding siblings ...)
  2022-11-15 19:14 ` [PR PATCH] [Updated] " tornaria
@ 2022-11-16  2:47 ` tornaria
  2022-12-03 22:36 ` [PR PATCH] [Merged]: " Piraty
  9 siblings, 0 replies; 11+ messages in thread
From: tornaria @ 2022-11-16  2:47 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Merged]: igraph: update to 0.10.2.
  2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
                   ` (8 preceding siblings ...)
  2022-11-16  2:47 ` tornaria
@ 2022-12-03 22:36 ` Piraty
  9 siblings, 0 replies; 11+ messages in thread
From: Piraty @ 2022-12-03 22:36 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

igraph: update to 0.10.2.
https://github.com/void-linux/void-packages/pull/40224

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-12-03 22:36 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-29 17:30 [PR PATCH] igraph: update to 0.10.2 tornaria
2022-10-30 19:06 ` classabbyamp
2022-10-30 23:17 ` tornaria
2022-10-31 15:08 ` szhorvat
2022-10-31 15:11 ` szhorvat
2022-11-03  2:16 ` tornaria
2022-11-12 19:19 ` [PR PATCH] [Updated] " tornaria
2022-11-13  2:52 ` tornaria
2022-11-15 19:14 ` [PR PATCH] [Updated] " tornaria
2022-11-16  2:47 ` tornaria
2022-12-03 22:36 ` [PR PATCH] [Merged]: " Piraty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).