Re: [PR PATCH] [Updated] gsl: update to 2.8 (with some other minor updates)

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

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

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

https://github.com/tornaria/void-packages gsl
https://github.com/void-linux/void-packages/pull/50565

gsl: update to 2.8 (with some other minor updates)
Rebuild / update as necessary:

- **giac: update to 1.9.0.99.**
- **Clight: Rebuild for gsl**
- **bogofilter: Rebuild for gsl**
- **krita: update to 5.2.2.** (@Johnnynator)
- **calligra: Rebuild for gsl**
- **dieharder: Rebuild for gsl**
- **easyeffects: update to 7.1.6.** (@zen0bit)
- **enblend-enfuse: Rebuild for gsl**
- **guvcview: update to 2.1.0.**
- **igt-gpu-tools: update to 1.28.**
- **lib2geom: Rebuild for gsl**
- **inkscape: Rebuild for gsl**
- **ipe: Rebuild for gsl**
- **python3-cvxopt: Rebuild for gsl**
- **qgis: update to 3.36.3.** (@ar-jan)
- **sagemath: Rebuild for gsl**
- **siril: Rebuild for gsl**
- **xsnow: Rebuild for gsl**
- **gnuradio: update to 3.10.10.0.**
- **gnuradio-nrsc5: rebuild for gnuradio**
- **gnuradio-osmosdr: rebuild for gnuradio**
- **gnuradio-rds: rebuild for gnuradio**
- **gqrx: rebuild for gnuradio**

Maybe it makes sense to merge together with #50295 so we only rebuild sagemath once.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

Rebuilt and checked everything on x86_64 / x86_64-musl / i686

Cross built everything not nocross on aarch64



<!--
#### 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/50565.patch is attached

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

From 3c6f164d49f7d4315478dc6113df11778ac54c4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:17:51 -0300
Subject: [PATCH 01/24] gsl: update to 2.8.

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

diff --git a/common/shlibs b/common/shlibs
index 279bf10d77d26e..e692c67b5ae039 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -841,7 +841,7 @@ libgiblib.so.1 giblib-1.2.4_1
 libgc.so.1 gc-7.6.4_1
 libcord.so.1 gc-7.4_1
 libgslcblas.so.0 gsl-1.15_1
-libgsl.so.27 gsl-2.7.1_1
+libgsl.so.28 gsl-2.8_1
 liblua5.1.so.5.1 lua51-5.1.5_1
 liblua5.2.so.5.2 lua52-5.2.4_2
 liblua5.3.so.5.3 lua53-5.3.5_4
diff --git a/srcpkgs/gsl/template b/srcpkgs/gsl/template
index 854dbe8d795cf9..9fc21348c64d21 100644
--- a/srcpkgs/gsl/template
+++ b/srcpkgs/gsl/template
@@ -1,6 +1,6 @@
 # Template file for 'gsl'
 pkgname=gsl
-version=2.7.1
+version=2.8
 revision=1
 build_style=gnu-configure
 short_desc="Numerical library for C and C++ programmers"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/gsl/gsl.html"
 changelog="http://git.savannah.gnu.org/cgit/gsl.git/plain/NEWS"
 distfiles="${GNU_SITE}/gsl/${pkgname}-${version}.tar.gz"
-checksum=dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b
+checksum=6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190
 
 case $XBPS_TARGET_MACHINE in
 	# avoid numerical noise caused by extended-precision of registers

From 4d2d517258c4021cfa99067180ac6d65240a21ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 18 May 2024 16:59:50 -0300
Subject: [PATCH 02/24] giac: update to 1.9.0.99.

---
 srcpkgs/giac/patches/fix-pariclose.patch | 20 ++++++++++++++++++++
 srcpkgs/giac/template                    |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/giac/patches/fix-pariclose.patch

diff --git a/srcpkgs/giac/patches/fix-pariclose.patch b/srcpkgs/giac/patches/fix-pariclose.patch
new file mode 100644
index 00000000000000..cb1ada85004c84
--- /dev/null
+++ b/srcpkgs/giac/patches/fix-pariclose.patch
@@ -0,0 +1,20 @@
+--- b/src/pari.cc	2024-05-06 13:08:05.000000000 -0300
++++ a/src/pari.cc	2024-05-18 16:57:06.688878820 -0300
+@@ -734,7 +734,7 @@
+   }
+ 
+   static gen pari_exec(const string & s,GIAC_CONTEXT){
+-    static ensure_pari_is_ready now;
++    ensure_pari_is_ready now;
+     long av=avma;
+     void * save_pari_stack_limit = PARI_stack_limit;
+     PARI_stack_limit=0; // required since the stack changed
+@@ -800,7 +800,7 @@
+     lidnt(v,vars,false);
+     vars.erase(vars.begin());
+     bool parse_all=false;
+-    static ensure_pari_is_ready now;
++    ensure_pari_is_ready now;
+     long av=avma;
+     cb_pari_err_recover=gp_err_recover;
+     if (setjmp(env)){
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 447b376fc67460..05dd8db2ae6328 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.9.0.97
+version=1.9.0.99
 revision=1
 build_style=gnu-configure
 configure_args="--disable-micropy --disable-quickjs"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=fb384d92a5dc54d47df930b010de13c91e0d827a684b70f9673ae6b08be5f48d
+checksum=166775fbf2becd583c6ffa23ca6ca8a0b44dd7790dca8d966da767d3f6647ce4
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

From 75b84a88bc02e869f0bd8c419f9c79017bfc44c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:09 -0300
Subject: [PATCH 03/24] Clight: Rebuild for gsl

---
 srcpkgs/Clight/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 6e67e846c6dbd9..cf4aa8fb6361dd 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,7 +1,7 @@
 # Template file for 'Clight'
 pkgname=Clight
 version=4.11
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion

From a9e45e8bc8a5c788ff737f41936127bf3b41004e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:10 -0300
Subject: [PATCH 04/24] bogofilter: Rebuild for gsl

---
 srcpkgs/bogofilter/patches/test-musl.patch | 41 ++++++++++++++++++++++
 srcpkgs/bogofilter/template                |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/bogofilter/patches/test-musl.patch

diff --git a/srcpkgs/bogofilter/patches/test-musl.patch b/srcpkgs/bogofilter/patches/test-musl.patch
new file mode 100644
index 00000000000000..a51808ece77277
--- /dev/null
+++ b/srcpkgs/bogofilter/patches/test-musl.patch
@@ -0,0 +1,41 @@
+--- a/src/tests/t.dump.load	2019-05-19 10:14:00.000000000 -0300
++++ b/src/tests/t.dump.load	2024-05-26 21:37:23.322331002 -0300
+@@ -9,7 +9,7 @@
+ DATA="$TMPDIR/$BASE.${DB_EXT}"
+ SUM="$BASE.sum"
+ 
+-GREP="grep -v /dump.load-"
++GREP="grep -av /dump.load-"
+ SORT="sort"
+ 
+ clear_database() {
+@@ -31,13 +31,13 @@
+ #update some words, including some old dates
+ $BOGOUTIL -C $LEN -l "$DATA" -y 20021215 < "$srcdir"/inputs/$BASE.upd
+ #dump database
+-$BOGOUTIL -C $LEN -d "$DATA" | grep -v "^.ENCODING" | $SORT > "$TMPDIR"/dump.load-2.txt
++$BOGOUTIL -C $LEN -d "$DATA" | grep -av "^.ENCODING" | $SORT > "$TMPDIR"/dump.load-2.txt
+ 
+ #confirm that updated words have different counts and dates
+ ( diff "$TMPDIR"/dump.load-1.txt "$TMPDIR"/dump.load-2.txt ; echo "" ) | $GREP | tee "$TMPDIR"/diff.1.2.txt >> "$OUT"
+ 
+ #dump wordlist, excluding oldest entries
+-$BOGOUTIL -C $LEN -a 20020815 -d "$DATA" | grep -v "^.ENCODING" | $SORT > "$TMPDIR"/dump.load-3.txt
++$BOGOUTIL -C $LEN -a 20020815 -d "$DATA" | grep -av "^.ENCODING" | $SORT > "$TMPDIR"/dump.load-3.txt
+ 
+ #confirm exclusion of oldest entries
+ ( diff "$TMPDIR"/dump.load-2.txt "$TMPDIR"/dump.load-3.txt ; echo "" ) | $GREP | tee "$TMPDIR"/diff.2.3.txt >> "$OUT"
+--- a/src/tests/t.nonascii.replace	2019-05-19 10:14:00.000000000 -0300
++++ b/src/tests/t.nonascii.replace	2024-05-26 21:36:07.201324406 -0300
+@@ -28,9 +28,9 @@
+ | ./dehex > "$TMPDIR"/input
+ 
+ $BOGOUTIL -C -l "$WORDLIST" < "$TMPDIR"/input
+-$BOGOUTIL -C -d "$WORDLIST" | egrep -v "^(\.MSG_COUNT|\.ENCODING)" > "$TMPDIR"/output.1
++$BOGOUTIL -C -d "$WORDLIST" | egrep -av "^(\.MSG_COUNT|\.ENCODING)" > "$TMPDIR"/output.1
+ $BOGOUTIL -C -n -m "$WORDLIST" $UNICODE_NO
+-$BOGOUTIL -C -d "$WORDLIST" | egrep -v "^(\.MSG_COUNT|\.ENCODING)" > "$TMPDIR"/output.2
++$BOGOUTIL -C -d "$WORDLIST" | egrep -av "^(\.MSG_COUNT|\.ENCODING)" > "$TMPDIR"/output.2
+ 
+ LEN1=`wc -l "$TMPDIR"/output.1 | $AWK '{print $1}'`
+ LEN2=`wc -l "$TMPDIR"/output.2 | $AWK '{print $1}'`
diff --git a/srcpkgs/bogofilter/template b/srcpkgs/bogofilter/template
index 32e283f57aad4e..b91c70935ebe26 100644
--- a/srcpkgs/bogofilter/template
+++ b/srcpkgs/bogofilter/template
@@ -1,7 +1,7 @@
 # Template file for 'bogofilter'
 pkgname=bogofilter
 version=1.2.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname} --with-database=sqlite"
 hostmakedepends="perl"

From ddde7fd8a1d277f4cc20b336e388fa473d72014d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 16:07:54 -0300
Subject: [PATCH 05/24] krita: update to 5.2.2.

---
 srcpkgs/krita/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 1486a0c6b6bf09..32783449148ab2 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
-version=5.2.1
-revision=6
+version=5.2.2
+revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.xz"
-checksum=47978f50701be23a18b9c4c3cb2818717b712652807ac5ca954309fb0818b1f2
+checksum=41515784d65b5bf12919df909f7406dc90f37076587b8c459ef2abd569a71adb
 python_version=3
 replaces="calligra-krita>=0"
 # FIXME

From 75e51c43851b2b23601410801e0fcaa80fba8602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:10 -0300
Subject: [PATCH 06/24] calligra: Rebuild for gsl

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index da60d209a9d243..43905e0bd6ca04 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=22
+revision=23
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DMEINPROC5_EXECUTABLE=/usr/bin/meinproc5 -DBUILD_TESTING=OFF"

From b86ceeed16b130d1ebc1c6f44cc10b33f7ed2318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:10 -0300
Subject: [PATCH 07/24] dieharder: Rebuild for gsl

---
 srcpkgs/dieharder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dieharder/template b/srcpkgs/dieharder/template
index bff9f12db8af32..8160548b334599 100644
--- a/srcpkgs/dieharder/template
+++ b/srcpkgs/dieharder/template
@@ -1,7 +1,7 @@
 # Template file for 'dieharder'
 pkgname=dieharder
 version=3.31.1
-revision=8
+revision=9
 build_style=gnu-configure
 makedepends="gsl-devel"
 short_desc="Testing and benchmarking tool for random number generators"

From fb16545b3cea50955207959fc3dce12afd85ea2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 16:07:53 -0300
Subject: [PATCH 08/24] easyeffects: update to 7.1.6.

---
 srcpkgs/easyeffects/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 83563265ea9226..db9b247dd42924 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,6 +1,6 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
-version=7.1.5
+version=7.1.6
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/wwmm/easyeffects"
 changelog="https://raw.githubusercontent.com/wwmm/easyeffects/master/CHANGELOG.md"
 distfiles="https://github.com/wwmm/easyeffects/archive/v${version}.tar.gz"
-checksum=f365c70a5ff750b73c1996e5355109c4f9ea48c68e4420eab189a5ede9af90cc
+checksum=7a206fe02472b87a79e02e48dc7c96ce4a1f6dd700c14f1e1502357882d81aa7
 
 pulseeffects_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 23c03e566c9096aa2bee0ae680cedca63c27a6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:11 -0300
Subject: [PATCH 09/24] enblend-enfuse: Rebuild for gsl

---
 srcpkgs/enblend-enfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index a8e9a748b5b0a7..34ac6ca59c55ff 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'enblend-enfuse'
 pkgname=enblend-enfuse
 version=4.2
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--enable-openmp --with-tcmalloc --with-latex=false HELP2MAN=:"
 hostmakedepends="pkg-config perl automake perl-TimeDate"

From 6a8c7794e795d7992f45e0746b85eb636a669148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 16:07:54 -0300
Subject: [PATCH 10/24] guvcview: update to 2.1.0.

---
 srcpkgs/guvcview/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template
index d42fd38fa4ad12..dff9b807f69837 100644
--- a/srcpkgs/guvcview/template
+++ b/srcpkgs/guvcview/template
@@ -1,8 +1,7 @@
 # Template file for 'guvcview'
 pkgname=guvcview
-version=2.0.7
-revision=2
-create_wrksrc=yes
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-debian-menu"
 hostmakedepends="pkg-config intltool autoconf automake libtool glib-devel"
@@ -14,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://guvcview.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-src-${version}.tar.bz2"
-checksum=f47d51fbd06e44eeaa1a82f4a153c927527c90d94514197a70b2956028cc8ad4
+checksum=3d93e4c9fab8d1a7a9bde1a6dbbf04d6cf9d347c134b5128b4586a1d90b63cfb
 
 post_patch() {
 	sed '31a#include <locale.h>' -i  guvcview/guvcview.c

From 5805bee81cd1cb07c8d8cbb7c8396288630e3e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 16:07:54 -0300
Subject: [PATCH 11/24] igt-gpu-tools: update to 1.28.

---
 .../patches/fix-build-with-libproc2.diff      | 491 ------------------
 srcpkgs/igt-gpu-tools/patches/musl.patch      |  21 +-
 srcpkgs/igt-gpu-tools/template                |   4 +-
 3 files changed, 20 insertions(+), 496 deletions(-)
 delete mode 100644 srcpkgs/igt-gpu-tools/patches/fix-build-with-libproc2.diff

diff --git a/srcpkgs/igt-gpu-tools/patches/fix-build-with-libproc2.diff b/srcpkgs/igt-gpu-tools/patches/fix-build-with-libproc2.diff
deleted file mode 100644
index 21b1866c9cd918..00000000000000
--- a/srcpkgs/igt-gpu-tools/patches/fix-build-with-libproc2.diff
+++ /dev/null
@@ -1,491 +0,0 @@
-Description: Link to libproc2
- libproc2 is the new library for libprocps
-Author: Craig Small <csmall@debian.org>
-Bug-Debian: https://bugs.debian.org/1024221
-Reviewed-by: Craig Small <csmall@debian.org>
-Last-Update: 2022-12-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lib/igt_aux.c
-+++ b/lib/igt_aux.c
-@@ -52,8 +52,16 @@
- #include <assert.h>
- #include <grp.h>
- 
-+#ifdef HAVE_LIBPROCPS
- #include <proc/readproc.h>
-+#endif
-+#ifdef HAVE_LIBPROC2
-+#include <libproc2/pids.h>
-+#endif
-+
- #include <libudev.h>
-+#include <linux/limits.h>
-+#include <dirent.h>
- 
- #include "drmtest.h"
- #include "i915_drm.h"
-@@ -1217,6 +1225,7 @@ void igt_unlock_mem(void)
-  */
- int igt_is_process_running(const char *comm)
- {
-+#if HAVE_LIBPROCPS
- 	PROCTAB *proc;
- 	proc_t *proc_info;
- 	bool found = false;
-@@ -1235,6 +1244,26 @@ int igt_is_process_running(const char *c
- 
- 	closeproc(proc);
- 	return found;
-+#endif
-+#ifdef HAVE_LIBPROC2
-+	enum pids_item Item[] = { PIDS_CMD };
-+	struct pids_info *info = NULL;
-+	struct pids_stack *stack;
-+	char *pid_comm;
-+	bool found = false;
-+
-+	if (procps_pids_new(&info, Item, 1) < 0)
-+	    return false;
-+	while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
-+	    pid_comm = PIDS_VAL(0, str, stack, info);
-+	    if (!strncasecmp(pid_comm, comm, strlen(pid_comm))) {
-+		found = true;
-+		break;
-+	    }
-+	}
-+	procps_pids_unref(&info);
-+	return found;
-+#endif
- }
- 
- /**
-@@ -1251,6 +1280,7 @@ int igt_is_process_running(const char *c
-  */
- int igt_terminate_process(int sig, const char *comm)
- {
-+#ifdef HAVE_LIBPROCPS
- 	PROCTAB *proc;
- 	proc_t *proc_info;
- 	int err = 0;
-@@ -1272,6 +1302,29 @@ int igt_terminate_process(int sig, const
- 
- 	closeproc(proc);
- 	return err;
-+#endif
-+#ifdef HAVE_LIBPROC2
-+	enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD };
-+	struct pids_info *info = NULL;
-+	struct pids_stack *stack;
-+	char *pid_comm;
-+	int pid;
-+	int err = 0;
-+
-+	if (procps_pids_new(&info, Items, 2) < 0)
-+		return -errno;
-+	while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
-+		pid = PIDS_VAL(0, s_int, stack, info);
-+		pid_comm = PIDS_VAL(1, str, stack, info);
-+		if (!strncasecmp(pid_comm, comm, strlen(pid_comm))) {
-+			if (kill(pid, sig) < 0)
-+				err = -errno;
-+			break;
-+		}
-+	}
-+	procps_pids_unref(&info);
-+	return err;
-+#endif
- }
- 
- struct pinfo {
-@@ -1341,9 +1394,9 @@ igt_show_stat_header(void)
- }
- 
- static void
--igt_show_stat(proc_t *info, int *state, const char *fn)
-+igt_show_stat(const pid_t tid, const char *cmd, int *state, const char *fn)
- {
--	struct pinfo p = { .pid = info->tid, .comm = info->cmd, .fn = fn };
-+	struct pinfo p = { .pid = tid, .comm = cmd, .fn = fn };
- 
- 	if (!*state)
- 		igt_show_stat_header();
-@@ -1353,7 +1406,7 @@ igt_show_stat(proc_t *info, int *state,
- }
- 
- static void
--__igt_lsof_fds(proc_t *proc_info, int *state, char *proc_path, const char *dir)
-+__igt_lsof_fds(const pid_t tid, const char *cmd, int *state, char *proc_path, const char *dir)
- {
- 	struct dirent *d;
- 	struct stat st;
-@@ -1400,7 +1453,7 @@ again:
- 		dirn = dirname(copy_fd_lnk);
- 
- 		if (!strncmp(dir, dirn, strlen(dir)))
--			igt_show_stat(proc_info, state, fd_lnk);
-+			igt_show_stat(tid, cmd, state, fd_lnk);
- 
- 		free(copy_fd_lnk);
- 		free(fd_lnk);
-@@ -1416,13 +1469,14 @@ again:
- static void
- __igt_lsof(const char *dir)
- {
--	PROCTAB *proc;
--	proc_t *proc_info;
--
- 	char path[30];
- 	char *name_lnk;
- 	struct stat st;
- 	int state = 0;
-+#ifdef HAVE_LIBPROCPS
-+	PROCTAB *proc;
-+	proc_t *proc_info;
-+
- 
- 	proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
- 	igt_assert(proc != NULL);
-@@ -1456,6 +1510,44 @@ __igt_lsof(const char *dir)
- 	}
- 
- 	closeproc(proc);
-+#endif
-+#ifdef HAVE_LIBPROC2
-+	enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD };
-+	struct pids_info *info = NULL;
-+	struct pids_stack *stack;
-+
-+	if (procps_pids_new(&info, Items, 2) < 0)
-+		return;
-+	while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
-+		ssize_t read;
-+		int tid = PIDS_VAL(0, s_int, stack, info);
-+		char *pid_comm = PIDS_VAL(1, str, stack, info);
-+
-+		/* check current working directory */
-+		memset(path, 0, sizeof(path));
-+		snprintf(path, sizeof(path), "/proc/%d/cwd", tid);
-+
-+		if (stat(path, &st) == -1)
-+			continue;
-+
-+		name_lnk = malloc(st.st_size + 1);
-+
-+		igt_assert((read = readlink(path, name_lnk, st.st_size + 1)));
-+		name_lnk[read] = '\0';
-+
-+		if (!strncmp(dir, name_lnk, strlen(dir)))
-+			igt_show_stat(tid, pid_comm, &state, name_lnk);
-+
-+		/* check also fd, seems that lsof(8) doesn't look here */
-+		memset(path, 0, sizeof(path));
-+		snprintf(path, sizeof(path), "/proc/%d/fd", tid);
-+
-+		__igt_lsof_fds(tid, pid_comm, &state, path, dir);
-+
-+		free(name_lnk);
-+	}
-+	procps_pids_unref(&info);
-+#endif
- }
- 
- /**
-@@ -1490,7 +1582,7 @@ igt_lsof(const char *dpath)
- 	free(sanitized);
- }
- 
--static void pulseaudio_unload_module(proc_t *proc_info)
-+static void pulseaudio_unload_module(const uid_t euid, const gid_t egid)
- {
- 	struct igt_helper_process pa_proc = {};
- 	char xdg_dir[PATH_MAX];
-@@ -1498,14 +1590,14 @@ static void pulseaudio_unload_module(pro
- 	struct passwd *pw;
- 
- 	igt_fork_helper(&pa_proc) {
--		pw = getpwuid(proc_info->euid);
-+		pw = getpwuid(euid);
- 		homedir = pw->pw_dir;
--		snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", proc_info->euid);
-+		snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", euid);
- 
- 		igt_info("Request pulseaudio to stop using audio device\n");
- 
--		setgid(proc_info->egid);
--		setuid(proc_info->euid);
-+		setgid(egid);
-+		setuid(euid);
- 		clearenv();
- 		setenv("HOME", homedir, 1);
- 		setenv("XDG_RUNTIME_DIR",xdg_dir, 1);
-@@ -1524,10 +1616,12 @@ static void pipewire_reserve_wait(void)
- 	char xdg_dir[PATH_MAX];
- 	const char *homedir;
- 	struct passwd *pw;
--	proc_t *proc_info;
--	PROCTAB *proc;
-+	int tid=0, euid, egid;
- 
-+#ifdef HAVE_LIBPROCPS
- 	igt_fork_helper(&pw_reserve_proc) {
-+		proc_t *proc_info;
-+		PROCTAB *proc;
- 		igt_info("Preventing pipewire-pulse to use the audio drivers\n");
- 
- 		proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
-@@ -1539,21 +1633,44 @@ static void pipewire_reserve_wait(void)
- 			freeproc(proc_info);
- 		}
- 		closeproc(proc);
-+		tid = proc_info->tid;
-+		euid = proc_info->euid;
-+		egid = proc_info->egid;
-+		freeproc(proc_info);
-+#endif
-+#ifdef HAVE_LIBPROC2
-+	igt_fork(child, 1) {
-+		enum pids_item Items[] = { PIDS_ID_PID, PIDS_ID_EUID, PIDS_ID_EGID };
-+		enum rel_items { EU_PID, EU_EUID, EU_EGID };
-+		struct pids_info *info = NULL;
-+		struct pids_stack *stack;
-+
-+		igt_info("Preventing pipewire-pulse to use the audio drivers\n");
-+
-+		if (procps_pids_new(&info, Items, 3) < 0)
-+		    return;
-+		while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
-+			tid = PIDS_VAL(EU_PID, s_int, stack, info);
-+			if (pipewire_pulse_pid == tid)
-+				break;
-+		}
-+		euid = PIDS_VAL(EU_EUID, s_int, stack, info);
-+		egid = PIDS_VAL(EU_EGID, s_int, stack, info);
-+		procps_pids_unref(&info);
-+#endif
- 
- 		/* Sanity check: if it can't find the process, it means it has gone */
--		if (pipewire_pulse_pid != proc_info->tid)
-+		if (pipewire_pulse_pid != tid)
- 			exit(0);
- 
--		pw = getpwuid(proc_info->euid);
-+		pw = getpwuid(euid);
- 		homedir = pw->pw_dir;
--		snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", proc_info->euid);
--		setgid(proc_info->egid);
--		setuid(proc_info->euid);
-+		snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", euid);
-+		setgid(egid);
-+		setuid(euid);
- 		clearenv();
- 		setenv("HOME", homedir, 1);
- 		setenv("XDG_RUNTIME_DIR",xdg_dir, 1);
--		freeproc(proc_info);
--
- 		/*
- 		 * pw-reserve will run in background. It will only exit when
- 		 * igt_kill_children() is called later on. So, it shouldn't
-@@ -1570,9 +1687,7 @@ static void pipewire_reserve_wait(void)
- int pipewire_pulse_start_reserve(void)
- {
- 	bool is_pw_reserve_running = false;
--	proc_t *proc_info;
- 	int attempts = 0;
--	PROCTAB *proc;
- 
- 	if (!pipewire_pulse_pid)
- 		return 0;
-@@ -1584,6 +1699,10 @@ int pipewire_pulse_start_reserve(void)
- 	 * pipewire version 0.3.50 or upper.
- 	 */
- 	for (attempts = 0; attempts < PIPEWIRE_RESERVE_MAX_TIME; attempts++) {
-+#ifdef HAVE_LIBPROCPS
-+		proc_t *proc_info;
-+		PROCTAB *proc;
-+
- 		usleep(1000);
- 		proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
- 		igt_assert(proc != NULL);
-@@ -1598,6 +1717,25 @@ int pipewire_pulse_start_reserve(void)
- 			freeproc(proc_info);
- 		}
- 		closeproc(proc);
-+#endif
-+#ifdef HAVE_LIBPROC2
-+		enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD };
-+		struct pids_info *info = NULL;
-+		struct pids_stack *stack;
-+
-+		usleep(1000);
-+
-+		if (procps_pids_new(&info, Items, 2) < 0)
-+			return 1;
-+		while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
-+			if (!strcmp(PIDS_VAL(1, str, stack, info), "pw-reserve")) {
-+				is_pw_reserve_running = true;
-+				pipewire_pw_reserve_pid = PIDS_VAL(0, s_int, stack, info);
-+				break;
-+			}
-+		}
-+		procps_pids_unref(&info);
-+#endif
- 		if (is_pw_reserve_running)
- 			break;
- 	}
-@@ -1645,7 +1783,7 @@ void pipewire_pulse_stop_reserve(void)
-  * If the check fails, it means that the process can simply be killed.
-  */
- static int
--__igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path)
-+__igt_lsof_audio_and_kill_proc(const pid_t tid, const char *cmd, const uid_t euid, const gid_t egid, char *proc_path)
- {
- 	const char *audio_dev = "/dev/snd/";
- 	char path[PATH_MAX * 2];
-@@ -1670,10 +1808,10 @@ __igt_lsof_audio_and_kill_proc(proc_t *p
- 	 * 2) unload/unbind the the audio driver(s);
- 	 * 3) stop the pw-reserve thread.
- 	 */
--	if (!strcmp(proc_info->cmd, "pipewire-pulse")) {
-+	if (!strcmp(cmd, "pipewire-pulse")) {
- 		igt_info("process %d (%s) is using audio device. Should be requested to stop using them.\n",
--			 proc_info->tid, proc_info->cmd);
--		pipewire_pulse_pid = proc_info->tid;
-+			 tid, cmd);
-+		pipewire_pulse_pid = tid;
- 		return 0;
- 	}
- 	/*
-@@ -1685,9 +1823,9 @@ __igt_lsof_audio_and_kill_proc(proc_t *p
- 	 * will respawn them. So, just ignore here, they'll honor pw-reserve,
- 	 * when the time comes.
- 	 */
--	if (!strcmp(proc_info->cmd, "pipewire-media-session"))
-+	if (!strcmp(cmd, "pipewire-media-session"))
- 		return 0;
--	if (!strcmp(proc_info->cmd, "wireplumber"))
-+	if (!strcmp(cmd, "wireplumber"))
- 		return 0;
- 
- 	dp = opendir(proc_path);
-@@ -1723,22 +1861,22 @@ __igt_lsof_audio_and_kill_proc(proc_t *p
- 		 * enough to unbind audio modules and won't cause race issues
- 		 * with systemd trying to reload it.
- 		 */
--		if (!strcmp(proc_info->cmd, "pulseaudio")) {
--			pulseaudio_unload_module(proc_info);
-+		if (!strcmp(cmd, "pulseaudio")) {
-+			pulseaudio_unload_module(euid, egid);
- 			break;
- 		}
- 
- 		/* For all other processes, just kill them */
- 		igt_info("process %d (%s) is using audio device. Should be terminated.\n",
--				proc_info->tid, proc_info->cmd);
-+				tid, cmd);
- 
--		if (kill(proc_info->tid, SIGTERM) < 0) {
-+		if (kill(tid, SIGTERM) < 0) {
- 			igt_info("Fail to terminate %s (pid: %d) with SIGTERM\n",
--				proc_info->cmd, proc_info->tid);
--			if (kill(proc_info->tid, SIGABRT) < 0) {
-+				cmd, tid);
-+			if (kill(tid, SIGABRT) < 0) {
- 				fail++;
- 				igt_info("Fail to terminate %s (pid: %d) with SIGABRT\n",
--					proc_info->cmd, proc_info->tid);
-+					cmd, tid);
- 			}
- 		}
- 
-@@ -1760,9 +1898,10 @@ int
- igt_lsof_kill_audio_processes(void)
- {
- 	char path[PATH_MAX];
-+	int fail = 0;
-+#ifdef HAVE_LIBPROCPS
- 	proc_t *proc_info;
- 	PROCTAB *proc;
--	int fail = 0;
- 
- 	proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
- 	igt_assert(proc != NULL);
-@@ -1772,12 +1911,35 @@ igt_lsof_kill_audio_processes(void)
- 		if (snprintf(path, sizeof(path), "/proc/%d/fd", proc_info->tid) < 1)
- 			fail++;
- 		else
--			fail += __igt_lsof_audio_and_kill_proc(proc_info, path);
-+			fail += __igt_lsof_audio_and_kill_proc(proc_info->pid, proc_info->cmd, proc_info->euid, proc_info->egid, path);
- 
- 		freeproc(proc_info);
- 	}
- 	closeproc(proc);
-+#endif
-+#ifdef HAVE_LIBPROC2
-+	enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD, PIDS_ID_EUID, PIDS_ID_EGID };
-+	enum rel_items { EU_PID, EU_CMD, EU_EUID, EU_EGID };
-+	struct pids_info *info = NULL;
-+	struct pids_stack *stack;
-+	pid_t tid;
-+
-+	if (procps_pids_new(&info, Items, 4) < 0)
-+		return 1;
-+	while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) {
-+		tid = PIDS_VAL(EU_PID, s_int, stack, info);
- 
-+		if (snprintf(path, sizeof(path), "/proc/%d/fd", tid) < 1)
-+			fail++;
-+		else
-+			fail += __igt_lsof_audio_and_kill_proc(tid,
-+				PIDS_VAL(EU_CMD, str, stack, info),
-+				PIDS_VAL(EU_EUID, s_int, stack, info),
-+				PIDS_VAL(EU_EGID, s_int, stack, info),
-+				path);
-+	}
-+	procps_pids_unref(&info);
-+#endif
- 	return fail;
- }
- 
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -105,7 +105,6 @@ lib_deps = [
- 	libdrm,
- 	libdw,
- 	libkmod,
--	libprocps,
- 	libudev,
- 	math,
- 	pciaccess,
-@@ -169,6 +168,12 @@ if chamelium.found()
- 	lib_sources += 'monitor_edids/monitor_edids_helper.c'
- endif
- 
-+if libprocps.found()
-+	lib_deps += libprocps
-+else
-+	lib_deps += libproc2
-+endif
-+
- if get_option('srcdir') != ''
-     srcdir = join_paths(get_option('srcdir'), 'tests')
- else
---- a/meson.build
-+++ b/meson.build
-@@ -120,7 +120,15 @@ build_info += 'With libdrm: ' + ','.join
- 
- pciaccess = dependency('pciaccess', version : '>=0.10')
- libkmod = dependency('libkmod')
--libprocps = dependency('libprocps', required : true)
-+libprocps = dependency('libprocps', required : false)
-+libproc2 = dependency('libproc2', required : false)
-+if libprocps.found()
-+  config.set('HAVE_LIBPROCPS', 1)
-+elif libproc2.found()
-+  config.set('HAVE_LIBPROC2', 1)
-+else
-+  error('Either libprocps or libproc2 is required')
-+endif
- 
- libunwind = dependency('libunwind', required : get_option('libunwind'))
- build_info += 'With libunwind: @0@'.format(libunwind.found())
diff --git a/srcpkgs/igt-gpu-tools/patches/musl.patch b/srcpkgs/igt-gpu-tools/patches/musl.patch
index 615afdb8f8ea5d..ff26a3add868e3 100644
--- a/srcpkgs/igt-gpu-tools/patches/musl.patch
+++ b/srcpkgs/igt-gpu-tools/patches/musl.patch
@@ -187,12 +187,15 @@ index 39ee8dca..fa8e3b9f 100644
  #include <signal.h>
 diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
 index 74935430..0dc87d8c 100644
---- a/tests/i915/i915_pm_rpm.c
-+++ b/tests/i915/i915_pm_rpm.c
-@@ -27,6 +27,7 @@
+--- a/tests/intel/i915_pm_rpm.c
++++ b/tests/intel/i915_pm_rpm.c
+@@ -27,6 +27,10 @@
  
  #include "config.h"
  
++#ifdef HAVE_LIBGEN_H
++#include <libgen.h>  // basename()
++#endif
 +#include <limits.h> // PATH_MAX
  #include <stdio.h>
  #include <stdint.h>
@@ -293,3 +296,15 @@ index 0faf3fc8..f6bd970e 100644
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h>
+--- a/tests/intel/kms_pm_backlight.c
++++ b/tests/intel/kms_pm_backlight.c
+@@ -36,6 +36,9 @@
+  */
+ 
+ #include "igt.h"
++#ifdef HAVE_LIBGEN_H
++#include <libgen.h>    /* basename() */
++#endif
+ #include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 225e2c79118a47..a1fe1035214956 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'igt-gpu-tools'
 pkgname=igt-gpu-tools
-version=1.27.1
+version=1.28
 revision=1
 build_style=meson
 configure_args="-Db_ndebug=false -Ddocs=disabled"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://gitlab.freedesktop.org/drm/igt-gpu-tools"
 changelog="https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/raw/master/NEWS"
 distfiles="${XORG_SITE}/app/igt-gpu-tools-${version}.tar.xz"
-checksum=93b9a4816ed22b5145bb61024314c8a65caeea991ce93027643f1d40723bf417
+checksum=ffcbdf61bd495803d9ae9dfa83e2fe04b8f583a2296fe059c1d5dd135a8a3b15
 # tests don't behave in containers
 make_check=ci-skip
 

From ac57c2a47506ec0fa5bf60e238e9771d6fbcb8f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:11 -0300
Subject: [PATCH 12/24] lib2geom: Rebuild for gsl

- need gtest-devel in makedepends
---
 srcpkgs/lib2geom/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lib2geom/template b/srcpkgs/lib2geom/template
index b5ca3f0d614ab2..f1824a117158ec 100644
--- a/srcpkgs/lib2geom/template
+++ b/srcpkgs/lib2geom/template
@@ -1,12 +1,12 @@
 # Template file for 'lib2geom'
 pkgname=lib2geom
 version=1.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-D2GEOM_BUILD_SHARED=ON"
 hostmakedepends="pkg-config python3-Cython ragel samurai"
-makedepends="boost-devel double-conversion-devel cairo-devel gtk+3-devel gsl-devel"
-checkdepends="gtest-devel"
+makedepends="boost-devel double-conversion-devel cairo-devel gtk+3-devel
+ gsl-devel gtest-devel"
 short_desc="Easy to use 2D geometry library for c++"
 maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
 license="LGPL-2.1-or-later, MPL-1.1"
@@ -23,7 +23,7 @@ fi
 do_check() {
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64-musl) _fail='circle-test' ;;
-		i686) _fail='(ellipse-test|elliptical-arc-test|self-intersections-test)' ;;
+		i686) _fail='(angle|bezier|ellipse|elliptical-arc|self-intersections)-test' ;;
 	esac
 	ctest --test-dir build --output-on-failure "$makejobs" -E "$_fail"
 }

From c9728b5f744b0b298b4193862f3dcf1756a005d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:11 -0300
Subject: [PATCH 13/24] inkscape: Rebuild for gsl

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 44ecd305de24df..df512511b2ef01 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.3.2
-revision=2
+revision=3
 build_style=cmake
 make_check_target="check"
 hostmakedepends="automake gettext glib-devel intltool libgraphicsmagick-devel

From adfc564e819050a9de4878bb08ed5fd44ada7bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 16:07:54 -0300
Subject: [PATCH 14/24] ipe: Rebuild for gsl

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index 06347934d98974..bf4bd2afee51ba 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.26
-revision=11
+revision=12
 _tools_commit=v7.2.24.1
 create_wrksrc=yes
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"

From 4d1e42f06b5edf6484683b3275c665130d47d45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:11 -0300
Subject: [PATCH 15/24] python3-cvxopt: Rebuild for gsl

---
 srcpkgs/python3-cvxopt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index cc961568f9db0a..d6e94ff1cec40a 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cvxopt'
 pkgname=python3-cvxopt
 version=1.3.2
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel SuiteSparse-devel gsl-devel glpk-devel fftw-devel

From f5426f3ac93c1f00707ee28eec9476c2db91b6e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:12 -0300
Subject: [PATCH 16/24] qgis: update to 3.36.3.

- mark nocross due to grass and hdf5
---
 srcpkgs/qgis/template | 5 +++--
 srcpkgs/qgis/update   | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qgis/update

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 507bd3dd4bed04..96069b9bed9296 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,6 +1,6 @@
 # Template file for 'qgis'
 pkgname=qgis
-version=3.36.1
+version=3.36.3
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
@@ -29,7 +29,8 @@ maintainer="Arjan Mossel <arjanmossel@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://qgis.org"
 distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
-checksum=96c47cd21ffc7bdced6eb5acc183540b834ce6a3b04d1bbab6bb45e52ff7b75f
+checksum=8fd8add9ac36ff3e9eb5e4cae35a8f9eb40c57a7fe9ccebbba22708afe2d4555
+nocross="due to grass and hdf5"
 
 post_install() {
 	mv ${DESTDIR}/usr/share/qgis/python ${DESTDIR}/usr/lib/qgis/
diff --git a/srcpkgs/qgis/update b/srcpkgs/qgis/update
new file mode 100644
index 00000000000000..a506e95ee99469
--- /dev/null
+++ b/srcpkgs/qgis/update
@@ -0,0 +1,3 @@
+site=https://github.com/qgis/QGIS/releases
+pattern='/final-\K[0-9_.]*(?=")'
+

From b2758b4314ed4bde1b62fd77260d6e1845070c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:12 -0300
Subject: [PATCH 17/24] sagemath: Rebuild for gsl

---
 srcpkgs/sagemath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 8b4bf7dfa441bb..faefc4b91a84e1 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=10.3
-revision=2
+revision=3
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-pep517
 make_build_args="--skip-dependency-check"

From 52c2525eed9649db7cc978e4223bb90d5165f0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:12 -0300
Subject: [PATCH 18/24] siril: Rebuild for gsl

---
 srcpkgs/siril/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 84332f79d060d2..62750dd247548f 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,7 +1,7 @@
 # Template file for 'siril'
 pkgname=siril
 version=0.9.12
-revision=10
+revision=11
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel

From fb241b70587cef1b554bfe6b1109fdd80e756e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 13:33:13 -0300
Subject: [PATCH 19/24] xsnow: Rebuild for gsl

- fix cross (fails with -s, no need for qemu)
---
 srcpkgs/xsnow/template | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index 509d1fc67f969a..16b2ca07cfe48d 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,9 +1,8 @@
 # Template file for 'xsnow'
 pkgname=xsnow
 version=3.7.9
-revision=2
+revision=3
 build_style=gnu-configure
-build_helper=qemu
 hostmakedepends="gsl-devel pkg-config gettext tar"
 makedepends="gsl-devel gtk+3-devel libX11-devel libXext-devel libXpm-devel
  libXt-devel"
@@ -15,12 +14,6 @@ changelog="https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html"
 distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
 checksum=0c4cd06e551f9b691dd08db5b14c0edc45549bf5879ce93b4fa88c828dfe1006
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		vsed -e "s:./xsnow -manpage:/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static &:" -i src/Makefile.am src/Makefile.in
-	fi
-}
-
 do_install() {
 	vbin src/xsnow
 	vman src/xsnow.6

From 118cc551a62dd7e9386cba839b61291f9963e1a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 16:07:53 -0300
Subject: [PATCH 20/24] gnuradio: update to 3.10.10.0.

---
 common/shlibs             | 44 +++++++++++++++++++--------------------
 srcpkgs/gnuradio/template |  4 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e692c67b5ae039..c42a468363edb2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3300,28 +3300,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
 liblwipv6.so.2 lwipv6-1.5a_1
 libpipewire-0.3.so.0 libpipewire-0.3.6_1
 libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-pmt.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-blocks.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-audio.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-fec.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-fft.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-filter.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-analog.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-digital.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-dtv.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-channels.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-trellis.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-video-sdl.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-vocoder.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-wavelet.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-uhd.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-network.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-soapy.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-qtgui.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-zeromq.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-iio.so.3.10.8 gnuradio-3.10.8.0_1
-libgnuradio-pdu.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-runtime.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-pmt.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-blocks.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-audio.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-fec.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-fft.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-filter.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-analog.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-digital.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-dtv.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-channels.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-trellis.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-video-sdl.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-vocoder.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-wavelet.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-uhd.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-network.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-soapy.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-qtgui.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-zeromq.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-iio.so.3.10.10 gnuradio-3.10.10.0_1
+libgnuradio-pdu.so.3.10.10 gnuradio-3.10.10.0_1
 libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
 libflann_cpp.so.1.9 flann-1.9.1_1
 libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 58127cedd3ddc6..f9d50825b18fb1 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,6 +1,6 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.10.8.0
+version=3.10.10.0
 revision=1
 build_style=cmake
 conf_files="/etc/gnuradio/conf.d/*"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=a66709939b28f5919e804ba0ff7b8791f7f02180954cc2218367e9f22d262f95
+checksum=4202a486bee49ae97672acae559c133b1337e0e89f2d192332e4381d7c6682da
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 8b23439c43837c086d8f6bfca7c327f042a43889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 17:51:24 -0300
Subject: [PATCH 21/24] gnuradio-nrsc5: rebuild for gnuradio

---
 srcpkgs/gnuradio-nrsc5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 0d8beb75d82938..f596dec72a4cbe 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-nrsc5'
 pkgname=gnuradio-nrsc5
 version=2.0.0
-revision=6
+revision=7
 build_style=cmake
 make_cmd=make
 configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"

From 10144a47017248cc588c36a0c7254da34abb267c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 17:51:25 -0300
Subject: [PATCH 22/24] gnuradio-osmosdr: rebuild for gnuradio

---
 srcpkgs/gnuradio-osmosdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 740642b1b2c774..fa8334722d84c1 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-osmosdr'
 pkgname=gnuradio-osmosdr
 version=0.2.4
-revision=5
+revision=6
 build_style=cmake
 configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
 hostmakedepends="pkg-config gnuradio python3"

From e7cd873f0c32cfece072c80be3b172a02a9fbb00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 17:51:26 -0300
Subject: [PATCH 23/24] gnuradio-rds: rebuild for gnuradio

---
 srcpkgs/gnuradio-rds/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index a5ae2ae80d201d..73f5728e0f351d 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-rds'
 pkgname=gnuradio-rds
 version=3.10
-revision=10
+revision=11
 build_style=cmake
 configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
 hostmakedepends="pkg-config gnuradio python3"

From 9696b719abba872580e78068cf305bb187b7c055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 May 2024 17:51:27 -0300
Subject: [PATCH 24/24] gqrx: rebuild for gnuradio

---
 srcpkgs/gqrx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 288ad2325cc3f4..be93b18ba2f27d 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
 # Template file for 'gqrx'
 pkgname=gqrx
 version=2.17.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
  $(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"