Re: [PR PATCH] [Updated] spotify: update to 1.2.31

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

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

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

https://github.com/jasoncsleung/void-packages master
https://github.com/void-linux/void-packages/pull/49547

spotify: update to 1.2.31
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- 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, (x86-64 glibc)


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

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

From 0b3b36fbf461f6d5a7f7eba11416902ec3714cf8 Mon Sep 17 00:00:00 2001
From: jasoleun <jasoleun@gmail.com>
Date: Tue, 26 Mar 2024 05:23:31 -0700
Subject: [PATCH 01/20] Updated Spotify to 1.2.31

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

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 91a924b935a71a..cad4174516505b 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.2.26
+version=1.2.31
 revision=1
-_subver=1187.g36b715a1
+_subver=1205.g4d59ad7c
 archs="x86_64"
 create_wrksrc=yes
 hostmakedepends="libcurl"
@@ -12,7 +12,7 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
 distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.${_subver}_amd64.deb"
-checksum=83abdf8bd65348353110b6d858cb7adb53ef9d751d5f348af3fb8868f9eb1151
+checksum=71b724bd9ec37ccc37b340606bc37f46d47320b5fa429a4c9dce5bd24e07adb8
 repository=nonfree
 restricted=yes
 nostrip=yes

From 9f1e3dd06628e0d02e535ddbb0a1589fe20579cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 24 Mar 2024 18:37:17 -0300
Subject: [PATCH 02/20] palp: update to 2.21.

---
 srcpkgs/palp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/palp/template b/srcpkgs/palp/template
index 6a11005d3052b0..cf98fc873772c6 100644
--- a/srcpkgs/palp/template
+++ b/srcpkgs/palp/template
@@ -1,14 +1,15 @@
 # Template file for 'palp'
 pkgname=palp
-version=2.20
+version=2.21
 revision=1
 build_style=gnu-makefile
+checkdepends="singular"
 short_desc="Package for analyzing lattice polytopes"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-only"
 homepage="http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"
 distfiles="http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"
-checksum=723e89e78b2d3d94a720dd770c11b932b3e6b56f8a49e0bf3621c776f7a02ce0
+checksum=7e4a7bf219998a844c0bcce0a176e49d0743cb4b505a0e195329bf2ec196ddd7
 
 
 # build procedure taken from sagemath, see

From a7cb18039c0da55abc1772a07438660624ff500c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 24 Mar 2024 17:58:22 -0300
Subject: [PATCH 03/20] python3-cypari2: update to 2.1.5.

---
 srcpkgs/python3-cypari2/template | 4 ++--
 srcpkgs/python3-cypari2/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-cypari2/update

diff --git a/srcpkgs/python3-cypari2/template b/srcpkgs/python3-cypari2/template
index 7e359e790f57e8..8b7e06abd5aace 100644
--- a/srcpkgs/python3-cypari2/template
+++ b/srcpkgs/python3-cypari2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cypari2'
 pkgname=python3-cypari2
-version=2.1.4
+version=2.1.5
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel python3-Cython
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sagemath/cypari2"
 changelog="https://github.com/sagemath/cypari2/releases"
 distfiles="https://github.com/sagemath/cypari2/archive/refs/tags/${version}.tar.gz"
-checksum=95daf1a74275a35730bbca75144776c1bb0594dd90af82ebf7bf96bb1a52c3d8
+checksum=3cea1051f7cd8832b7907d11c68764e83a430036698a215abae48924a580d7fb
 
 do_check() {
 	# Please do not disable this custom check;
diff --git a/srcpkgs/python3-cypari2/update b/srcpkgs/python3-cypari2/update
new file mode 100644
index 00000000000000..25ef51d109a4fd
--- /dev/null
+++ b/srcpkgs/python3-cypari2/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From 7784cbe56fda2a82a8c178e3b839e47c5aed0ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 24 Mar 2024 18:40:54 -0300
Subject: [PATCH 04/20] python3-memory_allocator: update to 0.1.4.

---
 srcpkgs/python3-memory_allocator/template | 10 +++++-----
 srcpkgs/python3-memory_allocator/update   |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/python3-memory_allocator/update

diff --git a/srcpkgs/python3-memory_allocator/template b/srcpkgs/python3-memory_allocator/template
index c3c9f499d94790..600e786d02bd67 100644
--- a/srcpkgs/python3-memory_allocator/template
+++ b/srcpkgs/python3-memory_allocator/template
@@ -1,9 +1,9 @@
 # Template file for 'python3-memory_allocator'
 pkgname=python3-memory_allocator
-version=0.1.3
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython"
+version=0.1.4
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel python3-Cython"
 makedepends="python3-devel"
 depends="python3"
 short_desc="Extension class to allocate memory easily with cython"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/sagemath/memory_allocator"
 changelog="https://github.com/sagemath/memory_allocator#changelog"
 distfiles="${PYPI_SITE}/m/memory_allocator/memory_allocator-${version}.tar.gz"
-checksum=13805c2ae1c01b7489fab5e8eac9361662b4f2c02412e3652eece48ff6953162
+checksum=d609216b03031967e2b45a804b12ff9029578f4ec019fde42cf6aed6ca09efe4
diff --git a/srcpkgs/python3-memory_allocator/update b/srcpkgs/python3-memory_allocator/update
new file mode 100644
index 00000000000000..25ef51d109a4fd
--- /dev/null
+++ b/srcpkgs/python3-memory_allocator/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From 261399c5e82627f6c5a73509086c8de4062135f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 24 Mar 2024 20:44:46 -0300
Subject: [PATCH 05/20] python3-pplpy: update to 0.8.10.

---
 srcpkgs/python3-pplpy/patches/dont-depend-on-sphinx.patch | 7 -------
 srcpkgs/python3-pplpy/template                            | 6 +++---
 srcpkgs/python3-pplpy/update                              | 1 +
 3 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 srcpkgs/python3-pplpy/patches/dont-depend-on-sphinx.patch
 create mode 100644 srcpkgs/python3-pplpy/update

diff --git a/srcpkgs/python3-pplpy/patches/dont-depend-on-sphinx.patch b/srcpkgs/python3-pplpy/patches/dont-depend-on-sphinx.patch
deleted file mode 100644
index 65c5cf40d73bd3..00000000000000
--- a/srcpkgs/python3-pplpy/patches/dont-depend-on-sphinx.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,3 +1,3 @@
- [build-system]
--requires = ["setuptools", "wheel", "Cython", "cysignals", "sphinx", "gmpy2>=2.1.0b1"]
-+requires = ["setuptools", "wheel", "Cython", "cysignals", "gmpy2>=2.1.0b1"]
- build-backend = "setuptools.build_meta"
diff --git a/srcpkgs/python3-pplpy/template b/srcpkgs/python3-pplpy/template
index d3b9aebdf22378..9717dda878d01f 100644
--- a/srcpkgs/python3-pplpy/template
+++ b/srcpkgs/python3-pplpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pplpy'
 pkgname=python3-pplpy
-version=0.8.9
-revision=2
+version=0.8.10
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel python3-Cython
  python3-cysignals python3-gmpy2"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/sagemath/pplpy"
 changelog="https://raw.githubusercontent.com/sagemath/pplpy/master/CHANGES.txt"
 distfiles="${PYPI_SITE}/p/pplpy/pplpy-${version}.tar.gz"
-checksum=db7a3b571d6ef053f75137975e947c3a1c1e45a30bab90eaf215b4e5cc15797e
+checksum=d42a216c82914dcf4d7c000debc98bb336b8f83e026ba5d952cccd9f8074effd
 
 do_check() {
 	PYTHONPATH=$(cd build/lib* && pwd) python3 setup.py test
diff --git a/srcpkgs/python3-pplpy/update b/srcpkgs/python3-pplpy/update
new file mode 100644
index 00000000000000..25ef51d109a4fd
--- /dev/null
+++ b/srcpkgs/python3-pplpy/update
@@ -0,0 +1 @@
+ignore="*a* *b* *rc*"

From da46f756d507eb78e0a7c1983ab26e59114b3fe5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 25 Mar 2024 00:40:28 +0530
Subject: [PATCH 06/20] pre-commit: update to 3.7.0.

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

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 18622ef66479be..c32d8f465a666c 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=3.6.2
+version=3.7.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pre-commit.com/"
 changelog="https://raw.githubusercontent.com/pre-commit/pre-commit/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=c3ef34f463045c88658c5b99f38c1e297abdcc0ff13f98d3370055fbbfabc67e
+checksum=e209d61b8acdcf742404408531f0c37d49d2c734fd7cff2d6076083d191cb060
 make_check=no # unpackaged: pytest-env re-assert
 
 post_install() {

From 53553d3da2af70569e34dae6f1aa83d37c33ecb3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 26 Mar 2024 11:45:26 -0400
Subject: [PATCH 07/20] river: upstream migrated to codeberg

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

diff --git a/srcpkgs/river/template b/srcpkgs/river/template
index 3a70225d623fd9..e766cf04716869 100644
--- a/srcpkgs/river/template
+++ b/srcpkgs/river/template
@@ -12,8 +12,8 @@ depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
-homepage="https://github.com/riverwm/river"
-distfiles="https://github.com/riverwm/river/releases/download/v${version}/river-${version}.tar.gz"
+homepage="https://codeberg.org/river/river"
+distfiles="https://codeberg.org/river/river/releases/download/v${version}/river-${version}.tar.gz"
 checksum=26c1c41a65ce3804069afad6988410515cf478d2b76303ebc699766d3d4dc69f
 
 build_options="xwayland"

From b9f74a79f426d6cd79c880bc649740260e9a2cae Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 26 Mar 2024 11:48:53 -0400
Subject: [PATCH 08/20] waylock: upstream migrated to codeberg

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

diff --git a/srcpkgs/waylock/template b/srcpkgs/waylock/template
index 0db541f03f12ff..18a0c1813ca98d 100644
--- a/srcpkgs/waylock/template
+++ b/srcpkgs/waylock/template
@@ -9,8 +9,8 @@ makedepends="libxkbcommon-devel pam-devel wayland-protocols wayland-devel"
 short_desc="Simple screenlocker for wayland compositors"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
-homepage="https://github.com/ifreund/waylock"
-distfiles="https://github.com/ifreund/waylock/releases/download/v${version}/waylock-${version}.tar.gz"
+homepage="https://codeberg.org/ifreund/waylock"
+distfiles="https://codeberg.org/ifreund/waylock/releases/download/v${version}/waylock-${version}.tar.gz"
 checksum=4a794dedd1b11f3b9bb7b46f8a93c20aac5ac1d40a851cabaa7ae84fd36686fa
 
 post_install() {

From 47fa2abee516c2c919931c6e29e71a50b92eba03 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 25 Mar 2024 19:52:19 +0100
Subject: [PATCH 09/20] lsd: update to 1.1.2

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

diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 0975fc93b1d550..cfc9a72cad2be0 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,6 +1,6 @@
 # Template file for 'lsd'
 pkgname=lsd
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/lsd-rs/lsd"
 changelog="https://github.com/lsd-rs/lsd/releases"
 distfiles="https://github.com/lsd-rs/lsd/archive/refs/tags/v${version}.tar.gz"
-checksum=7933e196bf7b164ea8879078f8a8e87381e0c49f71867e0036c82916199aba61
+checksum=cd80dae9a8f6c4c2061f79084468ea6e04c372e932e3712a165119417960e14e
 conflicts="disputils"
 
 # The 'cannot_access_subdir_exit_status' fails on CI

From 11de34d31e009f23547641d2529b3b18995f2429 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Mon, 25 Mar 2024 09:37:45 +0100
Subject: [PATCH 10/20] alacritty: update to 0.13.2

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

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 71f39261102b66..4a1d15948dbb2d 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,7 +1,7 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.13.1
-revision=2
+version=0.13.2
+revision=1
 build_style=cargo
 make_install_args="--path alacritty"
 hostmakedepends="pkg-config python3 scdoc"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="https://github.com/alacritty/alacritty/archive/refs/tags/v${version}.tar.gz"
-checksum=38a42e23e1e6faaa9e300347df3f7b58b6182908a701517aac6e296fbdf37451
+checksum=e9a54aabc92bbdc25ab1659c2e5a1e9b76f27d101342c8219cc98a730fd46d90
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From c43d93bbbf146b9f706bca9cf67781bf81bee581 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 26 Mar 2024 11:40:37 -0500
Subject: [PATCH 11/20] stellarium: update to 24.1.

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

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index c2dc21d108dba4..09fa20cc0f1725 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,6 +1,6 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=23.4
+version=24.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_SHOWMYSKY=Off -DUSE_PLUGIN_TELESCOPECONTROL=NO"
@@ -14,5 +14,5 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://stellarium.org/"
 distfiles="https://github.com/Stellarium/stellarium/archive/refs/tags/v${version}.tar.gz"
-checksum=b1781ae108c9c95b2a9d507fadcc6801edcadac04399ad025ddb799db9bcd70b
+checksum=6e1000d83cdae4de4c79cea6dbb32850ab55aee7734e80a3ad6b936799686fc3
 replaces="stellarium-data>=0"

From 34c64f6c9817bdbd14aa04d0f61a58477a14236d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 14:19:41 +0100
Subject: [PATCH 12/20] xman: update to 1.2.0.

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

diff --git a/srcpkgs/xman/template b/srcpkgs/xman/template
index 44ff90f83f26ab..c04cfba6579985 100644
--- a/srcpkgs/xman/template
+++ b/srcpkgs/xman/template
@@ -1,6 +1,6 @@
 # Template file for 'xman'
 pkgname=xman
-version=1.1.6
+version=1.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-manconfig=/etc/man.conf"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=7f555acd3855e49060e186a0be60f3224f60b4123b2990dcf6b8d70c482ed593
+checksum=f18db80bd72a0c27cf38b2a7b75485ee48cd22aab10f2ff58de54d83e268b406
 
 post_install() {
 	vlicense COPYING

From 1847047d34999271a0fb6ded8d8dd7f358dd0dae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 14:23:00 +0100
Subject: [PATCH 13/20] xload: update to 1.2.0.

---
 srcpkgs/xload/patches/fix-musl.patch | 11 -----------
 srcpkgs/xload/template               |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/xload/patches/fix-musl.patch

diff --git a/srcpkgs/xload/patches/fix-musl.patch b/srcpkgs/xload/patches/fix-musl.patch
deleted file mode 100644
index f7baecd11484df..00000000000000
--- a/srcpkgs/xload/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/get_rload.c
-+++ b/get_rload.c
-@@ -9,7 +9,7 @@
- /* Not all OS supports get_rload
-    steal the STUB idea from get_load
-  */
--#if defined(QNX4) || defined(__CYGWIN__) || defined(_WIN32)
-+#if defined(QNX4) || defined(__CYGWIN__) || defined(_WIN32) || !defined(__GLIBC__)
- #define RLOADSTUB
- #endif
- 
diff --git a/srcpkgs/xload/template b/srcpkgs/xload/template
index ea85f0afcc4565..2ac5e5a27e01b3 100644
--- a/srcpkgs/xload/template
+++ b/srcpkgs/xload/template
@@ -1,6 +1,6 @@
 # Template file for 'xload'
 pkgname=xload
-version=1.1.4
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config xorg-util-macros"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11, MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xload.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=8346b99120db24e0f42920f7f12e23e9b1b407d3a66ce419990387b608373031
+checksum=2c0fe6d624e1a25c1707e2d56407b979d6a78d64271df9ea0a89d99b81b59a80
 
 post_install() {
 	vlicense COPYING

From dec56dde982819693613f590278434927db845d0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 14:26:23 +0100
Subject: [PATCH 14/20] xedit: update to 1.2.4.

---
 srcpkgs/xedit/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xedit/template b/srcpkgs/xedit/template
index 5cdfccdeb5948f..9b28a8f94bde6d 100644
--- a/srcpkgs/xedit/template
+++ b/srcpkgs/xedit/template
@@ -1,16 +1,16 @@
-# Template build file for 'xedit'.
+# Template file for 'xedit'
 pkgname=xedit
-version=1.2.3
+version=1.2.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXaw-devel"
 short_desc="Simple text editor for X"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
-checksum=bdd33afeeca881622e55d2cf28f07b4a98f083d0a2573c0b9048f25bdd62db2f
+license="MIT"
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=b00d488b29cd007fadf9a4e44193cbdd72b48c94080be5ebc02565f21f9a2a71
 
 post_install() {
 	vlicense COPYING

From 2b8640509d44c4330f4448c974e86a306508ae4e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 14:43:43 +0100
Subject: [PATCH 15/20] pdfgrep: update to 2.2.0.

---
 srcpkgs/pdfgrep/patches/fix-musl.patch | 12 ------------
 srcpkgs/pdfgrep/template               |  8 ++++----
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/pdfgrep/patches/fix-musl.patch

diff --git a/srcpkgs/pdfgrep/patches/fix-musl.patch b/srcpkgs/pdfgrep/patches/fix-musl.patch
deleted file mode 100644
index a68d062f7fe501..00000000000000
--- a/srcpkgs/pdfgrep/patches/fix-musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/pdfgrep.cc
-+++ b/src/pdfgrep.cc
-@@ -460,7 +460,9 @@ int main(int argc, char** argv)
- 	// Set locale to user-preference. If this locale is an UTF-8 locale, the
- 	// regex-functions regcomp/regexec become unicode aware, which means
- 	// e.g. that '.' will match a unicode character, not a single byte.
-+#ifdef __GLIBC__
- 	locale::global(locale(""));
-+#endif
- 
- 	enum re_engine_type {
- 		RE_POSIX = 0,
diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template
index 478c20aa1a63ee..d1108e22bb2a6f 100644
--- a/srcpkgs/pdfgrep/template
+++ b/srcpkgs/pdfgrep/template
@@ -1,13 +1,13 @@
 # Template file for 'pdfgrep'
 pkgname=pdfgrep
-version=2.1.2
-revision=2
+version=2.2.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libgcrypt-devel poppler-cpp-devel pcre-devel"
+makedepends="libgcrypt-devel poppler-cpp-devel pcre2-devel"
 short_desc="A commandline utility to search text in PDF files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://pdfgrep.org"
 distfiles="https://pdfgrep.org/download/pdfgrep-${version}.tar.gz"
-checksum=0ef3dca1d749323f08112ffe68e6f4eb7bc25f56f90a2e933db477261b082aba
+checksum=0661e531e4c0ef097959aa1c9773796585db39c72c84a02ff87d2c3637c620cb

From 806328836fef819d2d0c471aba34dac5fc65c67f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 14:45:18 +0100
Subject: [PATCH 16/20] ts: update to 1.0.3.

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

diff --git a/srcpkgs/ts/template b/srcpkgs/ts/template
index 5cb4a5395ffdfa..876888d220d723 100644
--- a/srcpkgs/ts/template
+++ b/srcpkgs/ts/template
@@ -1,6 +1,6 @@
 # Template file for 'ts'
 pkgname=ts
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=gnu-makefile
 short_desc="Simple unix task spool system"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://vicerveza.homeunix.net/~viric/soft/ts/"
 distfiles="http://vicerveza.homeunix.net/~viric/soft/ts/${pkgname}-${version}.tar.gz"
-checksum=f73452aed80e2f9a7764883e9353aa7f40e65d3c199ad1f3be60fd58b58eafec
+checksum=fa833311543dc535b60cb7ab83c64ab5ee31128dbaaaa13dde341984e542b428
 
 do_install() {
 	make PREFIX="$DESTDIR/usr" install

From 1986dc2b0eaa3fb5e05cdb87c583e9a6287684e7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 14:45:54 +0100
Subject: [PATCH 17/20] perl-Mozilla-CA: update to 20240313.

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

diff --git a/srcpkgs/perl-Mozilla-CA/template b/srcpkgs/perl-Mozilla-CA/template
index 9b1deb6d629955..0f4a156ca1458b 100644
--- a/srcpkgs/perl-Mozilla-CA/template
+++ b/srcpkgs/perl-Mozilla-CA/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Mozilla-CA'
 pkgname=perl-Mozilla-CA
-version=20231213
+version=20240313
 revision=1
 build_style=perl-module
 hostmakedepends="perl"
@@ -11,4 +11,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MPL-2.0"
 homepage="https://metacpan.org/release/Mozilla-CA"
 distfiles="${CPAN_SITE}/Mozilla/${pkgname/perl-/}-$version.tar.gz"
-checksum=421a12ba7cef443bd368671cee9c9b46a8b55c2ccf7ac76c42f99e23a06115df
+checksum=624873939e309833894f881464a95dfe74ab77cab5d557308c010487161698e7

From d235f92bd8f8ee81e55381a6b02d98f1ed40f222 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 14:47:26 +0100
Subject: [PATCH 18/20] pinentry: update to 1.3.0.

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

diff --git a/srcpkgs/pinentry/template b/srcpkgs/pinentry/template
index 0fc1eeb0f4c26a..1225541b85f0d6 100644
--- a/srcpkgs/pinentry/template
+++ b/srcpkgs/pinentry/template
@@ -2,7 +2,7 @@
 # NOTE: keep this pkg synchronized with srcpkgs/pinentry-gtk.
 # NOTE: it's splitted this way to avoid cyclic dependencies.
 pkgname=pinentry
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--without-libcap --enable-pinentry-tty
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnupg.org/related_software/pinentry/index.html"
 distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2"
-checksum=457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067
+checksum=9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de
 
 alternatives="pinentry:pinentry:/usr/bin/pinentry-curses"
 

From a1d737c1dafa2db8aa299490fdb47e69bff1fbe1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 15:04:51 +0100
Subject: [PATCH 19/20] pinentry-gtk: update to 1.3.0.

---
 srcpkgs/pinentry-gtk/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pinentry-gtk/template b/srcpkgs/pinentry-gtk/template
index f0d2a29522ab53..00c69108beb416 100644
--- a/srcpkgs/pinentry-gtk/template
+++ b/srcpkgs/pinentry-gtk/template
@@ -4,7 +4,7 @@
 _desc="PIN or passphrase entry dialogs for GnuPG"
 
 pkgname=pinentry-gtk
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--without-libcap --enable-fallback-curses
@@ -12,15 +12,15 @@ configure_args="--without-libcap --enable-fallback-curses
  --disable-pinentry-emacs --enable-pinentry-qt
  --enable-pinentry-gtk2 --enable-pinentry-gnome3
  $(vopt_enable libsecret)"
-hostmakedepends="pkg-config qt5-host-tools"
+hostmakedepends="pkg-config qt6-base qt6-tools"
 makedepends="ncurses-devel libassuan-devel libgpg-error-devel
- gcr-devel gtk+-devel qt5-devel $(vopt_if libsecret libsecret-devel)"
+ gcr-devel gtk+-devel qt6-base-devel $(vopt_if libsecret libsecret-devel)"
 short_desc="${_desc} based on GTK+"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.gnupg.org/related_software/pinentry/index.html"
 distfiles="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-${version}.tar.bz2"
-checksum=457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067
+checksum=9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de
 
 alternatives="pinentry:pinentry:/usr/bin/pinentry-gtk-2"
 

From dc81301c043a5d0f74335bee58548021ee5e46ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Mar 2024 21:49:30 +0100
Subject: [PATCH 20/20] pinentry-qt: fix cross.

---
 srcpkgs/pinentry-gtk/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/pinentry-gtk/template b/srcpkgs/pinentry-gtk/template
index 00c69108beb416..4cb8b13da1aeeb 100644
--- a/srcpkgs/pinentry-gtk/template
+++ b/srcpkgs/pinentry-gtk/template
@@ -28,6 +28,11 @@ build_options="libsecret"
 build_options_default="libsecret"
 desc_option_libsecret="Enable support for saving passwords via libsecret"
 
+post_patch() {
+	# else it tries to use the target libexecdir
+	vsed -i -e 's:qt6libexecdir=.*:qt6libexecdir=/usr/lib/qt6/libexec:' configure
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/bin/pinentry
 	rm -rf ${DESTDIR}/usr/share/info