* Re: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
@ 2022-06-24 19:37 ` cultab
2022-06-24 20:02 ` paper42
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-06-24 19:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
New comment by cultab on void-packages repository
https://github.com/void-linux/void-packages/pull/37671#issuecomment-1165880666
Comment:
@q66 any chance you have some insight as to what might be happening? (I tagged you as you're listed as the maintainer for libportal, sorry if it's inappropriate)
I think `/usr/lib/girepository-1.0/Xdp-1.0.typelib` might be missing from our libportal package?
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
2022-06-24 19:37 ` cultab
@ 2022-06-24 20:02 ` paper42
2022-06-24 20:22 ` cultab
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: paper42 @ 2022-06-24 20:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37671#issuecomment-1165895692
Comment:
> I think `/usr/lib/girepository-1.0/Xdp-1.0.typelib` might be missing from our libportal package?
It is missing in our version, wait for an update to 0.6 in #36311.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
2022-06-24 19:37 ` cultab
2022-06-24 20:02 ` paper42
@ 2022-06-24 20:22 ` cultab
2022-07-06 23:24 ` [PR PATCH] [Updated] " cultab
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-06-24 20:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New comment by cultab on void-packages repository
https://github.com/void-linux/void-packages/pull/37671#issuecomment-1165908538
Comment:
Ok great thanks! I will watch that issue and check back here when there's progress.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (2 preceding siblings ...)
2022-06-24 20:22 ` cultab
@ 2022-07-06 23:24 ` cultab
2022-07-06 23:28 ` cultab
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-07-06 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by cultab against master on the void-packages repository
https://github.com/cultab/void-packages master
https://github.com/void-linux/void-packages/pull/37671
New package: Junction-1.5.0
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
# This is a work in progress.
As of now it builds correctly but when run it seems to be missing a dependency.
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.
#### Made in response to issue #37352.
A patch file from https://github.com/void-linux/void-packages/pull/37671.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37671.patch --]
[-- Type: text/x-diff, Size: 1370245 bytes --]
From e48ab57dd41cc04b9a9c15db0998c9ce56715fc5 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Fri, 24 Jun 2022 21:32:13 +0300
Subject: [PATCH 001/609] New package: Junction-1.5.0
---
srcpkgs/Junction/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/Junction/template
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
new file mode 100644
index 000000000000..2b7c41b2da33
--- /dev/null
+++ b/srcpkgs/Junction/template
@@ -0,0 +1,24 @@
+# Template file for 'Junction'
+pkgname=Junction
+version=1.5.0
+revision=1
+#archs="i686 x86_64"
+#wrksrc=
+#create_wrksrc=yes
+build_style=meson
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
+# makedepends=""
+depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
+# checkdepends="appstream-glib"
+short_desc="Application/browser chooser"
+maintainer="cultab <rroarck@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/sonnyp/Junction"
+#changelog=""
+distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
+checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
From 34a9a66844c06842e458aef89b44a51fd1e116bc Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 16 Jun 2022 18:02:40 -0500
Subject: [PATCH 002/609] Signal-Desktop: update to 5.47.0.
---
srcpkgs/Signal-Desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 8cddd9d86ffd..fd5f31224bee 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=5.45.1
+version=5.47.0
revision=1
# Signal officially only supports x86_64 (also due to Electron)
# discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="akierig <anelki@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=14065fa2e2788a91893364740bfac8bd6c7aea41924fe661a0a231abe6512a7b
+checksum=d563b9be5ea5690ec2579c688db5bedbba3787b9b46428fa4164fc172e0c9322
nostrip_files="signal-desktop"
post_extract() {
From fbc3f176346953a28e75beb729716e3e251672b6 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Thu, 23 Jun 2022 23:35:48 +0700
Subject: [PATCH 003/609] vivaldi: update to 5.3.2679.61
---
srcpkgs/vivaldi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 984736d36ba1..995e269fe80e 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
# Template file for 'vivaldi'
pkgname=vivaldi
-version=5.3.2679.58
+version=5.3.2679.61
revision=1
_release=1
archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
homepage="https://vivaldi.com"
distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
_licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=5c45e446c9885618cd50d556b609effca8441ffb6a7007b62be64e24732db920
+checksum=2ffd4d9b3c6a2b3027b40581128cfb18993cc1b0b967c4acef2d89ad276bba33
repository=nonfree
restricted=yes
nostrip=yes
From 17418aa41943bb37e6efd1e80d2d13c1220a4df7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 23 Jun 2022 16:34:59 -0400
Subject: [PATCH 004/609] watchexec: update to 1.20.0
---
srcpkgs/watchexec/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index a63d43e27d04..6e872efcd8ee 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,16 +1,16 @@
# Template file for 'watchexec'
pkgname=watchexec
-version=1.19.0
+version=1.20.0
revision=1
wrksrc="${pkgname}-cli-v${version}"
-build_wrksrc="cli"
+build_wrksrc="crates/cli"
build_style=cargo
short_desc="Executes commands in response to file modifications"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="Apache-2.0"
homepage="https://github.com/watchexec/watchexec"
distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=6837dff4d14802e1e3714a2f3ef4330f8faadd10449508b128cff7f93d921101
+checksum=69c551090692a04943e7ded2d7f997f8777aa099c674b096a31d94983d02dbf7
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -18,7 +18,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
fi
post_install() {
- vdoc ../README.md
- vman ../doc/watchexec.1
- vcompletion ../completions/zsh zsh
+ vman ${wrksrc}/doc/watchexec.1
+ vcompletion ${wrksrc}/completions/zsh zsh
}
From 6836eedf659fafcb741edc3f3848f7c03be5adf6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 22:03:30 +0300
Subject: [PATCH 005/609] libdeflate: update to 1.12.
---
srcpkgs/libdeflate/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libdeflate/template b/srcpkgs/libdeflate/template
index 2991257fb464..fc3eb24cf513 100644
--- a/srcpkgs/libdeflate/template
+++ b/srcpkgs/libdeflate/template
@@ -1,6 +1,6 @@
# Template file for 'libdeflate'
pkgname=libdeflate
-version=1.11
+version=1.12
revision=1
build_style=gnu-makefile
make_build_args="PROG_SUFFIX=libdeflate"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/ebiggers/libdeflate"
changelog="https://raw.githubusercontent.com/ebiggers/libdeflate/master/NEWS.md"
distfiles="https://github.com/ebiggers/libdeflate/archive/refs/tags/v${version}.tar.gz"
-checksum=c72f691293f41c6aee66d44ca2dcd24092161b312a1c4c3d591d5d25f26b1faf
+checksum=ba89fb167a5ab6bbdfa6ee3b1a71636e8140fa8471cce8a311697584948e4d06
post_install() {
vlicense COPYING
From 0a6c389f59b97a6ae4c8432550ba4048645616b9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 21 Jun 2022 20:09:26 -0400
Subject: [PATCH 006/609] broot: update to 1.13.3
---
srcpkgs/broot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index bfd724e18cbc..b3e5f71efe15 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
# Template file for 'broot'
pkgname=broot
-version=1.13.1
+version=1.13.3
revision=1
build_style=cargo
short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://dystroy.org/broot/"
changelog="https://raw.githubusercontent.com/Canop/broot/master/CHANGELOG.md"
distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=95b4b01c43f23b8d4f06030b57c9b2e47a4fbbc4f6099acaf6e42d1f1697385e
+checksum=a7f9e98ff1371eff065a8dabbe9e31ef42d264b7d93c18f920d6a5399016da33
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 78495afe66e23cbaf9ef16cf986809df60c0fec2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Jun 2022 20:11:32 -0400
Subject: [PATCH 007/609] alsa-lib: update to 1.2.7.1
---
srcpkgs/alsa-lib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index 588169cb9b04..ac9d619a7872 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-lib'
pkgname=alsa-lib
-version=1.2.6.1
+version=1.2.7.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="LGPL-2.1-or-later"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
-checksum=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f
+checksum=046dc42dfcfad269217be05954686137e5e7397f3041372f8c6dcd7d79461e61
alsa-lib-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 21a69a7de866a5225a8c8587d421c6739e1b3fdd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Jun 2022 20:11:45 -0400
Subject: [PATCH 008/609] alsa-utils: update to 1.2.7
---
srcpkgs/alsa-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 41482fdd427c..aee7558c5111 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-utils'
pkgname=alsa-utils
-version=1.2.6
+version=1.2.7
revision=1
build_style=gnu-configure
configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf
@@ -14,7 +14,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-2.0-only"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/utils/${pkgname}-${version}.tar.bz2"
-checksum=6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d
+checksum=e906bf2404ff04c448eaa3d226d283a62b9a283f12e4fd8457fb24bac274e678
post_install() {
# Install required udev rules file.
From 63c4093756978325c7f80c8034c7d15cf27f2174 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Jun 2022 20:12:02 -0400
Subject: [PATCH 009/609] alsa-plugins: update to 1.2.7.1
---
srcpkgs/alsa-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 0a03eaf9d8f0..0bfa6d9fd264 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-plugins'
pkgname=alsa-plugins
-version=1.2.6
+version=1.2.7.1
revision=1
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/plugins/${pkgname}-${version}.tar.bz2"
-checksum=068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0
+checksum=8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511
post_install() {
rm -rfv ${DESTDIR}/etc/alsa/conf.d
From e81a4beaa3d37b2f72c43d33f869060efe337651 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Jun 2022 20:12:19 -0400
Subject: [PATCH 010/609] alsa-ucm-conf: update to 1.2.7.1
---
srcpkgs/alsa-ucm-conf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-ucm-conf/template b/srcpkgs/alsa-ucm-conf/template
index 43e25c39c650..7ecbab8eef0e 100644
--- a/srcpkgs/alsa-ucm-conf/template
+++ b/srcpkgs/alsa-ucm-conf/template
@@ -1,13 +1,13 @@
# Template file for 'alsa-ucm-conf'
pkgname=alsa-ucm-conf
-version=1.2.6.3
+version=1.2.7.1
revision=1
short_desc="ALSA Use Case Manager topology configurations"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/alsa-project/alsa-ucm-conf"
distfiles="https://github.com/alsa-project/${pkgname}/archive/refs/tags/v${version}.tar.gz"
-checksum=37ce894d5b420660a4483cf503fd3c33937697e0ed6962f47c42d4aed6d24199
+checksum=ab5fc8b04fbb3d351e422267acae6a57698f67fc7b3549ef05127ff0b7203462
do_install() {
vdoc ucm2/README.md
From 25422b47f7af34bc3f6348588009fd5e6f8d4959 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 16 Jun 2022 20:21:59 -0400
Subject: [PATCH 011/609] libnma: update to 1.8.40
---
srcpkgs/libnma/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 9d2a53119d01..13ce6f353dca 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,6 +1,6 @@
# Template file for 'libnma'
pkgname=libnma
-version=1.8.38
+version=1.8.40
revision=1
build_style=meson
build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libnma"
changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4
+checksum=870a75f8d4641ed0d90f836aea6ff511224bde97ffd56d608ade2e9b5acb2b22
replaces="libnm-gtk>=0"
if [ "$CROSS_BUILD" ]; then
From 8b4771ee145add3a559151da90769951d64dc959 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 20:27:10 +0300
Subject: [PATCH 012/609] mpv-mpris: update to 0.8.1.
---
srcpkgs/mpv-mpris/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mpv-mpris/template b/srcpkgs/mpv-mpris/template
index 784b45db60c1..e0d1793457ac 100644
--- a/srcpkgs/mpv-mpris/template
+++ b/srcpkgs/mpv-mpris/template
@@ -1,18 +1,22 @@
# Template file for 'mpv-mpris'
pkgname=mpv-mpris
-version=0.5
-revision=2
+version=0.8.1
+revision=1
build_style=gnu-makefile
+make_use_env=yes
make_build_target=mpris.so
+make_check_target=test
hostmakedepends="pkg-config"
makedepends="libglib-devel mpv-devel"
depends="mpv"
+checkdepends="mpv playerctl sound-theme-freedesktop
+ xvfb-run xauth jq socat dbus"
short_desc="MPRIS plugin for mpv"
maintainer="Alif Rachmawadi <arch@subosito.com>"
license="MIT"
homepage="https://github.com/hoyon/mpv-mpris"
distfiles="https://github.com/hoyon/mpv-mpris/archive/${version}.tar.gz"
-checksum=673aff031e7cc741edea68d7b4b0103d7b031d4a55755abb9e1be5dd4ec4e969
+checksum=a208f42ec9df5444f725a55e1b457e62c86d6b93c9c84215e1808ff047695053
do_install() {
vlicense LICENSE
From c86c2cd1ef86ece4b0ff9ea9c3131ec7e5edc458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 22 Jun 2022 16:49:27 +0200
Subject: [PATCH 013/609] qutebrowser: update to 2.5.2.
---
srcpkgs/qutebrowser/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index d1b4394c4e50..5f5bde24204e 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
# Template file for 'qutebrowser'
pkgname=qutebrowser
-version=2.5.1
+version=2.5.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://qutebrowser.org/"
changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=e6885886a84cd166a6ba633794a58a4c67d871c27188127e5ddbc5276d76edbc
+checksum=a9bfce14ddc403de0deb2eedf983c231ce003e0759995ec7ef4ea34e4974e908
nostrip=yes
# testing requires unpackaged plugins:
# pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
From 31478a5395ba8d43a0cfd2f8861ab452aa343d54 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Mon, 20 Jun 2022 12:31:35 -0700
Subject: [PATCH 014/609] python3-click: update to 8.1.3.
---
srcpkgs/python3-click/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template
index 2583a95cc4ad..921ddbbe0cb2 100644
--- a/srcpkgs/python3-click/template
+++ b/srcpkgs/python3-click/template
@@ -1,17 +1,19 @@
# Template file for 'python3-click'
pkgname=python3-click
-version=7.1.2
-revision=5
+version=8.1.3
+revision=1
wrksrc="click-${version}"
build_style="python3-module"
hostmakedepends="python3-setuptools"
depends="python3"
+checkdepends="python3-pytest"
short_desc="Python3 package for creating beautiful command line interfaces"
maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
license="BSD-3-Clause"
-homepage="http://click.pocoo.org/"
+homepage="https://palletsprojects.com/p/click/"
+changelog="https://raw.githubusercontent.com/pallets/click/main/CHANGES.rst"
distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
-checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
+checksum=7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e
post_install() {
vlicense LICENSE.rst
From b632f6bc5da059bb25628d31058944f272a892cb Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Tue, 21 Jun 2022 22:14:38 -0700
Subject: [PATCH 015/609] fava: update to 1.21.
make_check=no because:
```
=> fava-1.21_1: running do_check ...
ImportError while loading conftest '/builddir/fava-1.21/tests/conftest.py'.
tests/conftest.py:19: in <module>
from fava.application import _load_file
build/lib/fava/application.py:40: in <module>
from fava import __version__ as fava_version
E ImportError: cannot import name '__version__' from 'fava'
(/builddir/fava-1.21/build/lib/fava/__init__.py)
=> ERROR: fava-1.21_1: do_check: 'PYTHONPATH="$PWD/build/lib" python3 -m
pytest tests -k 'not cli and not static_url'' exited with 4
=> ERROR: in do_check() at srcpkgs/fava/template:20
```
---
srcpkgs/fava/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index 9b0f83e540b9..48542321d2f3 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,24 +1,20 @@
# Template file for 'fava'
pkgname=fava
-version=1.18
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+version=1.21
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
python3-Jinja2 beancount python3-click python3-markdown2 python3-ply
- python3-simplejson python3-Werkzeug python3-aiohttp"
+ python3-simplejson python3-Werkzeug python3-aiohttp python3-wheel"
checkdepends="$depends"
short_desc="Web interface for Beancount"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="MIT"
homepage="https://beancount.github.io/fava/"
distfiles="${PYPI_SITE}/f/fava/fava-${version}.tar.gz"
-checksum=21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5
-
-do_check() {
- # CLI test expects fava on $PATH. Not sure why static_url fails.
- PYTHONPATH="$PWD/build/lib" python3 -m pytest tests -k 'not cli and not static_url'
-}
+checksum=d1a1422848e65e7eb275d80d322f6de2bcea1dc37b5412e8cf72c483d6a998d6
+make_check=no # "ImportError: cannot import name '__version__' from 'fava'"
post_install() {
vlicense LICENSE
From 5b5430aacf273b6b98fa7635d8b986534a60cb97 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Thu, 23 Jun 2022 19:33:26 -0700
Subject: [PATCH 016/609] python3-click-threading: update to 0.5.0.
---
srcpkgs/python3-click-threading/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
index 66bd90de3fd8..07744a6f6f70 100644
--- a/srcpkgs/python3-click-threading/template
+++ b/srcpkgs/python3-click-threading/template
@@ -1,7 +1,7 @@
# Template file for 'python3-click-threading'
pkgname=python3-click-threading
-version=0.4.4
-revision=5
+version=0.5.0
+revision=1
wrksrc="click-threading-${version}"
build_style="python3-module"
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
license="MIT"
homepage="https://github.com/click-contrib/click-threading"
distfiles="${PYPI_SITE}/c/click-threading/click-threading-${version}.tar.gz"
-checksum=b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7
+checksum=adcfe623c02a595c107c314072f67a2278fe4eb40b72c0d1a2c903cc78af3439
post_install() {
vlicense LICENSE
From e99752c3c1919226505bdcba50b0e9217c8b6344 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 19:58:13 +0100
Subject: [PATCH 017/609] libunistring: update to 1.0.
---
srcpkgs/libunistring/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libunistring/template b/srcpkgs/libunistring/template
index d25099d67eba..296c327fd895 100644
--- a/srcpkgs/libunistring/template
+++ b/srcpkgs/libunistring/template
@@ -1,6 +1,6 @@
# Template file for 'libunistring'
pkgname=libunistring
-version=0.9.10
+version=1.0
revision=1
build_style=gnu-configure
short_desc="Library for manipulating Unicode strings and C strings"
@@ -8,10 +8,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="https://www.gnu.org/software/libunistring"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b
+checksum=3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544
libunistring-devel_package() {
- short_desc+=" - development files)"
+ short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 89309a07542f419dbe4060d4951b317ea66775b4 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Tue, 3 May 2022 16:34:40 +1000
Subject: [PATCH 018/609] kubernetes: update to 1.23.7
---
srcpkgs/kubernetes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 1cf5ba118164..604938bc7edd 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
# Template file for 'kubernetes'
pkgname=kubernetes
-version=1.23.3
+version=1.23.7
revision=1
archs="x86_64* ppc64le*"
build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="http://kubernetes.io"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=cd9b217b7b82e885533f9c315ac7365cc8d2c0760bfb1da281a249f061908457
+checksum=fa366d6e1013e83fc54329c9ce7f2b170734e7aeee6ffc8e337b9e2d3de46c3f
nocross=yes
system_accounts="kube"
make_dirs="/var/lib/kubelet 0755 kube kube"
From 6f3d5928e69c470fc87f1537b9c075be5fce581f Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 14 Jun 2022 09:25:33 -0500
Subject: [PATCH 019/609] xsm: update to 1.0.5.
---
srcpkgs/xsm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xsm/template b/srcpkgs/xsm/template
index 830de263e1d1..b5f29364fb39 100644
--- a/srcpkgs/xsm/template
+++ b/srcpkgs/xsm/template
@@ -1,6 +1,6 @@
# Template file for 'xsm'
pkgname=xsm
-version=1.0.4
+version=1.0.5
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="X Session Manager"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=9934b6893a4e52cf7435368fc8d425c371b5e32d96e420ead30166eb82d64425
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=9c30fdaa3fc132e4ff201cfc478669056e6e15502e77df88df11fb94e4e6fb2d
post_install() {
vlicense COPYING
From 93620a5a85596a08ab9b8d650838de33fd1973b4 Mon Sep 17 00:00:00 2001
From: "amy.sh" <amy5.sh@protonmail.com>
Date: Fri, 11 Feb 2022 20:00:46 -0800
Subject: [PATCH 020/609] new package: bdfresize-1.5
---
srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch | 13 +++++++++++++
srcpkgs/bdfresize/patches/02-minus-sign.patch | 14 ++++++++++++++
srcpkgs/bdfresize/template | 15 +++++++++++++++
3 files changed, 42 insertions(+)
create mode 100644 srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch
create mode 100644 srcpkgs/bdfresize/patches/02-minus-sign.patch
create mode 100644 srcpkgs/bdfresize/template
diff --git a/srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch b/srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch
new file mode 100644
index 000000000000..b69bc4b3d5a4
--- /dev/null
+++ b/srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch
@@ -0,0 +1,13 @@
+Description: Fix FTBFS with gcc 4.0
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=258509#5
+Bug-Debian: http://bugs.debian.org/258509
+
+--- bdfresize-1.5/charresize.c 2000-12-12 20:18:14.000000000 +0900
++++ bdfresize-1.5-3.1/charresize.c 2008-05-11 23:01:11.000000000 +0900
+@@ -46,7 +46,6 @@
+ void
+ processChar(void)
+ {
+- char *malloc();
+ char *srcimage;
+ int *dstgray;
diff --git a/srcpkgs/bdfresize/patches/02-minus-sign.patch b/srcpkgs/bdfresize/patches/02-minus-sign.patch
new file mode 100644
index 000000000000..54d69a09bebd
--- /dev/null
+++ b/srcpkgs/bdfresize/patches/02-minus-sign.patch
@@ -0,0 +1,14 @@
+Description: The - sign escapes, changes in debian/1.5-4
+Author: Frank Lichtenheld <djpig@debian.org>
+
+--- bdfresize-1.5/bdfresize.1 2000-12-11 17:18:15.000000000 +0900
++++ bdfresize-1.5-4/bdfresize.1 2008-05-11 23:01:11.000000000 +0900
+@@ -2,7 +2,7 @@
+ .SH NAME
+ bdfresize \- Resize BDF Format Font
+ .SH SYNOPSIS
+-bdfresize [-v] [-b \fInumber\fP] [-[whf] \fIfactor\fP] [\fIbdf-file\fP]
++bdfresize [\-v] [\-b \fInumber\fP] [\-[whf] \fIfactor\fP] [\fIbdf-file\fP]
+ .SH DESCRIPTION
+ .I Bdfresize
+ is a command to magnify or reduce fonts which are described with
diff --git a/srcpkgs/bdfresize/template b/srcpkgs/bdfresize/template
new file mode 100644
index 000000000000..90f223ccad33
--- /dev/null
+++ b/srcpkgs/bdfresize/template
@@ -0,0 +1,15 @@
+# Template file for 'bdfresize'
+pkgname=bdfresize
+version=1.5
+revision=1
+build_style=gnu-configure
+short_desc="Tool for resizing BDF format font"
+maintainer="amy.sh <amy5.sh@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/"
+distfiles="${homepage}/bdfresize-${version}.tar.gz"
+checksum=440cfc0620a0237e46352c14a0774caa3f3059759b0a20defefc94e8490897a6
+
+post_install() {
+ vdoc README
+}
From 504e5395ccbaacb687e5315ae404600ce040d36b Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 22 Jun 2022 19:14:40 +0200
Subject: [PATCH 021/609] gopls: update to 0.8.4.
---
srcpkgs/gopls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 963253e7b4ee..c6164f56decd 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
# Template file for 'gopls'
pkgname=gopls
-version=0.8.2
+version=0.8.4
revision=1
wrksrc=tools-gopls-v${version}
build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="MIT"
homepage="https://github.com/golang/tools"
distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=761aa768e82a958e6f803db39215c995fe0f263df825ed1cbb9f6b2989f0cd00
+checksum=815060abeb22755352414ef62ffb265b2f0f9d38786c164595f85c9c25c8a7cb
post_install() {
vlicense ../LICENSE
From 7db578a628d7f2c5f49e80f6c78fadfc30a5358c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 26 Mar 2022 12:31:02 +0100
Subject: [PATCH 022/609] tokei: enable additional output formats
---
srcpkgs/tokei/template | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template
index 32aeea5e1a2a..8e5da7ab3923 100644
--- a/srcpkgs/tokei/template
+++ b/srcpkgs/tokei/template
@@ -1,8 +1,9 @@
# Template file for 'tokei'
pkgname=tokei
version=12.1.2
-revision=1
+revision=2
build_style=cargo
+configure_args="--features all"
short_desc="Count lines of code"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
@@ -10,6 +11,12 @@ homepage="https://github.com/XAMPPRocky/tokei"
distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}.tar.gz"
checksum=81ef14ab8eaa70a68249a299f26f26eba22f342fb8e22fca463b08080f436e50
+# on i686 LLVM has problems with compiling doctests
+case "$XBPS_TARGET_MACHINE" in
+ i686) make_check_args+=" --tests";;
+ *) ;;
+esac
+
post_install() {
vlicense LICENCE-MIT
}
From 98075e6f605755463215af992240c1e0b4c910d7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 20 Jun 2022 13:12:02 -0700
Subject: [PATCH 023/609] glib: update to 2.72.2
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index d301dadb8990..b69e5bbda63a 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
# Template file for 'glib'
pkgname=glib
-version=2.72.0
+version=2.72.2
revision=1
build_style=meson
# static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
+checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
From 263e46b89b2ab3aa42c640580a03edea480fec87 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 20 Jun 2022 19:19:10 -0300
Subject: [PATCH 024/609] rust-analyzer: update to 2022.06.20.
---
srcpkgs/rust-analyzer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index f59223bc5740..d6babaaf3b56 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
# Template file for 'rust-analyzer'
pkgname=rust-analyzer
-version=2022.06.13
+version=2022.06.20
revision=1
_ver=${version//./-}
wrksrc="${pkgname}-${_ver}"
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
license="Apache-2.0, MIT"
homepage="https://rust-analyzer.github.io/"
distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
-checksum=7cc67e054330a63d3c8ca7c2cd8d0a8067f5ab0a45f5297df64bec1ce91ab072
+checksum=195f0f19ef0254e030f5806021f19dbb099a340bcb7874287583f0b534d71078
# tests require Rust source code
make_check=no
From 1315457dabb5b0fed447d02fde209289b0be9cb6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 10 May 2022 08:37:46 -0400
Subject: [PATCH 025/609] python3-phonenumbers: update to 8.12.50.
---
srcpkgs/python3-phonenumbers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 5b4179baaacf..b9773a67edfe 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.12.47
+version=8.12.50
revision=1
wrksrc="phonenumbers-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://github.com/daviddrysdale/python-phonenumbers"
changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522
+checksum=f00d67f20875804f4fade4803a9438294029982ac929c6ba303e1f0290cf5d45
From d2a3796f6f0db40526c9e224c16ac8fd022066cb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 20 Jun 2022 09:03:54 -0400
Subject: [PATCH 026/609] python3-canonicaljson: update to 1.6.2.
---
srcpkgs/python3-canonicaljson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index 2124a48c545b..2da9cde02ccb 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
# Template file for 'python3-canonicaljson'
pkgname=python3-canonicaljson
-version=1.6.1
+version=1.6.2
revision=1
wrksrc="canonicaljson-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="Apache-2.0"
homepage="https://github.com/matrix-org/python-canonicaljson"
distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824
+checksum=af00be8ce9c589857df176bb94594f0d43b0e027f027a8d7cf8978fdb819024a
From da15729b28e6d86d0b975bf082c734920940748c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 17 May 2022 08:23:47 -0400
Subject: [PATCH 027/609] synapse: update to 1.61.0.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 5e23260063e5..ce748cc3a452 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.58.0
+version=1.61.0
revision=1
build_style=python3-pep517
make_check_target=tests
@@ -22,7 +22,7 @@ license="Apache-2.0"
homepage="https://github.com/matrix-org/synapse"
changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
+checksum=3602b4a01688edae8365973877220a0511cb3970ff4e32eec759ca070066a684
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
From e90fd63c42362154a08c599a8013e0af439a4463 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Tue, 21 Jun 2022 18:53:24 +0700
Subject: [PATCH 028/609] phoronix-test-suite: update to 10.8.3
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index eae4ccbe8171..7b1b90a927f5 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,6 +1,6 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
-version=10.2.0
+version=10.8.3
revision=1
wrksrc="$pkgname"
depends="php"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.phoronix-test-suite.com/"
changelog="https://raw.githubusercontent.com/phoronix-test-suite/phoronix-test-suite/master/ChangeLog"
distfiles="https://phoronix-test-suite.com/releases/${pkgname}-${version}.tar.gz"
-checksum=7a828781b4b2384930ce48b9c16b9994e0266658f138c5dcced03f83c4edbad4
+checksum=4b742e28a9542fe2b57aacb691159d69d3e1c77d95da6d24b7867889ce84ba80
do_install() {
vsed -e "s/^\texport PTS_DIR=.*/\texport PTS_DIR=\/usr\/share\/webapps\/${pkgname}/g" -i phoronix-test-suite
From 7271b9be9e533c94ea3cb7ca2c3c9d4328727ee4 Mon Sep 17 00:00:00 2001
From: Quad <contact@quad.moe>
Date: Wed, 22 Jun 2022 19:11:56 +0200
Subject: [PATCH 029/609] radeontop: update to 1.4
---
srcpkgs/radeontop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/radeontop/template b/srcpkgs/radeontop/template
index 4f36a8d6b032..097d40bd05f4 100644
--- a/srcpkgs/radeontop/template
+++ b/srcpkgs/radeontop/template
@@ -1,6 +1,6 @@
# Template file for 'radeontop'
pkgname=radeontop
-version=1.3
+version=1.4
revision=1
archs="i686* x86_64*"
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-only"
homepage="https://github.com/clbr/radeontop"
distfiles="https://github.com/clbr/radeontop/archive/v${version}.tar.gz"
-checksum=0e6abacafa3c795ee783be18b736f6dfc7ff93c6e3c3237cc7c1684863e08100
+checksum=2c1e2aace1a749d8e4530047ce245004e0f7d1d32a99037917e03d83e60f7ad1
do_build() {
make CC="$CC" amdgpu=1
From 2bb364857eb09c6bfa2f001ad1236f4f36a0a26a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 17 Jun 2022 21:27:59 +0300
Subject: [PATCH 030/609] opera: update to 88.0.4412.40.
---
srcpkgs/opera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 75d8c0a1c0ba..35645b527cae 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
# Template file for 'opera'
pkgname=opera
-version=88.0.4412.27
+version=88.0.4412.40
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
homepage="https://www.opera.com/computer"
distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=3112a9549764d3ba28873a0710256509886cdf68d6ce2b11b7013479c48fbfef
+checksum=9f825b3040bc2c3d8b10f5d45313b2006736562f0bf86fa86345c0cea9e6bacf
repository="nonfree"
nostrip=yes
From 243acd6b3bbd93836e30cee6eadd3a668085e3d5 Mon Sep 17 00:00:00 2001
From: Barbaross <cullenrss@gmail.com>
Date: Fri, 17 Jun 2022 17:40:56 -0400
Subject: [PATCH 031/609] mpdscribble: update to 0.24
---
srcpkgs/mpdscribble/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mpdscribble/template b/srcpkgs/mpdscribble/template
index 7a33d2bb607a..652b5e46076e 100644
--- a/srcpkgs/mpdscribble/template
+++ b/srcpkgs/mpdscribble/template
@@ -1,6 +1,6 @@
# Template file for 'mpdscribble'
pkgname=mpdscribble
-version=0.23
+version=0.24
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/MusicPlayerDaemon/mpdscribble"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/mpdscribble/master/NEWS"
distfiles="https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"
-checksum=a3387ed9140eb2fca1ccaf9f9d2d9b5a6326a72c9bcd4119429790c534fec668
+checksum=f6b4cba748b3b87e705270b4923c8e23e94c2e00fedd50beb1468dbe2fb2a8e7
conf_files="/etc/${pkgname}.conf"
make_dirs="/var/cache/mpdscribble/ 0755 root root"
From 3b7f8b6e4f087a8d764998e6528b6c814218f9c1 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Fri, 17 Jun 2022 06:32:39 -0400
Subject: [PATCH 032/609] font-iosevka: update to 15.5.0.
---
srcpkgs/font-iosevka/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index bfde8e7c10cc..4cb4acfbeb3a 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
# Template file for 'font-iosevka'
pkgname=font-iosevka
-version=15.3.1
+version=15.5.0
revision=1
create_wrksrc=yes
depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 553b3e1da4a35396993a755b952b573ec466c4f47a6b4efa07e0636cd65b2600
- e67d51a5a7a40f0cd267f0503af32c9892aee53a131e7c836ed7138ca664dffe"
+ aa0c7af1f7dca595bcb137fa1aa009385705bda19e04272a5ddad749610f6624
+ b1f53a77a8fbd44a9a19f2e8fbd1057c697add7c56d933c699aba8d73f1d124e"
font_dirs="/usr/share/fonts/TTF"
From 26719ecc2609bbb93286805eb2d293a9356cf189 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Wed, 18 May 2022 12:16:20 -0400
Subject: [PATCH 033/609] direnv: update to 2.32.0.
---
srcpkgs/direnv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 7c19c9030396..1cd5f6966e97 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,6 +1,6 @@
# Template file for 'direnv'
pkgname=direnv
-version=2.30.3
+version=2.32.0
revision=1
build_style=go
go_import_path=github.com/direnv/direnv/v2
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://direnv.net/"
changelog="https://raw.githubusercontent.com/direnv/direnv/master/CHANGELOG.md"
distfiles="https://github.com/direnv/direnv/archive/v${version}.tar.gz"
-checksum=7fb5431b98d57fb8c70218b4a0fab4b08f102790e7a92486f588bf3d5751ac3b
+checksum=d9bd6a78b57257306b45a64473d3302b0f274a3d2499e870d29f7a22a730f11c
post_install() {
vlicense LICENSE
From 98ba68df049604286a5e07132f8d57620d978299 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 17 Jun 2022 20:24:53 +0400
Subject: [PATCH 034/609] calibre: update to 5.44.0.
---
srcpkgs/calibre/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 2c096a3c5ccf..1ecfaacf8f63 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
# Template file for 'calibre'
pkgname=calibre
-version=5.43.0
-revision=2
+version=5.44.0
+revision=1
build_style=python3-module
pycompile_dirs="/usr/lib/calibre/"
hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
homepage="https://calibre-ebook.com"
changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=834bfae52c26f9293c00cb4d4f51260defe198ef076619194016c51f87df12e0
+checksum=6ffaa3eafd36a24355e5957f0f838db6db6d3456cfa17cb4d139fd94ebaf88ec
python_version=3
lib32disabled=yes
nocross=yes
From a329cba4d9f048d5d5dbe9d519cb77a62a5639e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
<sigrid@ftrv.se>
Date: Mon, 13 Jun 2022 18:50:15 +0200
Subject: [PATCH 035/609] chuck: update to 1.4.1.1, adopt
---
srcpkgs/chuck/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/chuck/template b/srcpkgs/chuck/template
index 9c6c8be9364a..5e9510c4b162 100644
--- a/srcpkgs/chuck/template
+++ b/srcpkgs/chuck/template
@@ -1,6 +1,6 @@
# Template file for 'chuck'
pkgname=chuck
-version=1.4.1.0
+version=1.4.1.1
revision=1
build_wrksrc=src
build_style=gnu-makefile
@@ -9,12 +9,12 @@ make_build_target="linux-jack"
hostmakedepends="bison flex"
makedepends="jack-devel libsndfile-devel liblo-devel"
short_desc="Concurrent, on-the-fly audio programming language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>"
license="GPL-2.0-or-later"
homepage="http://chuck.cs.princeton.edu"
changelog="https://chuck.cs.princeton.edu/release/VERSIONS"
distfiles="http://chuck.cs.princeton.edu/release/files/$pkgname-$version.tgz"
-checksum=74bf99ad515e3113c55b833152936fad02a3cf006a54105ff11777c473194928
+checksum=4459ee6f151da72dcde1525e0afe05329d61086356b168ecfc0bc3a570290f63
post_extract() {
From 781b4eb9496954bfa8bbb4feaffaca81cce0353f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jun 2022 21:42:37 +0200
Subject: [PATCH 036/609] rosegarden: update to 22.06
---
srcpkgs/rosegarden/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template
index e909cd4173b5..d9bf2c26cd76 100644
--- a/srcpkgs/rosegarden/template
+++ b/srcpkgs/rosegarden/template
@@ -1,6 +1,6 @@
# Template file for 'rosegarden'
pkgname=rosegarden
-version=21.12
+version=22.06
revision=1
build_style=cmake
hostmakedepends="pkg-config shared-mime-info"
@@ -12,7 +12,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="http://rosegardenmusic.com/"
distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2"
-checksum=dc3ed3db064e754de9fe830b69df40a53dc7157fbfa8a206ca82e5e41c262809
+checksum=9024825155ebb1be8b4af567f3502026957398fdefd086e23fe399f1d033fadb
if [ -n "${CROSS_BUILD}" ]; then
hostmakedepends+=" qt5-devel qt5-host-tools"
From 11471e43ba48fd0c5740f6c976086b5a85f491a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 18 Jun 2022 08:51:05 +0200
Subject: [PATCH 037/609] maxima: enable sbcl option only on supported archs
---
srcpkgs/maxima/template | 12 ++++++++++--
srcpkgs/sbcl/template | 1 +
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index 69af367ca11d..69e85ec833e8 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,7 +1,7 @@
# Template file for 'maxima'
pkgname=maxima
version=5.45.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
hostmakedepends="python3 perl emacs texinfo patchelf"
@@ -28,7 +28,15 @@ build_options="clisp sbcl ecl"
desc_option_clisp="Build with CLISP"
desc_option_sbcl="Build with SBCL"
desc_option_ecl="Build with ECL"
-build_options_default="sbcl ecl"
+build_options_default="ecl"
+
+# sbcl is only available for these architectures
+case "$XBPS_TARGET_MACHINE" in
+ i686|x86_64*|armv7l|aarch64|ppc64le*)
+ build_options_default+=" sbcl"
+ ;;
+esac
+
vopt_conflict clisp sbcl
post_configure() {
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index cd2e813dc7f8..43e3045f5fc9 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -2,6 +2,7 @@
pkgname=sbcl
version=2.2.5
revision=1
+# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
hostmakedepends="iana-etc texinfo"
makedepends="zlib-devel"
From e7733a7bef391363c7f30c20ce04430d5cf78d6a Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 24 Jun 2022 23:48:56 +0200
Subject: [PATCH 038/609] python3-spotipy: update to 2.20.0.
---
srcpkgs/python3-spotipy/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-spotipy/template b/srcpkgs/python3-spotipy/template
index a0a2aba69d93..6ea9e629df06 100644
--- a/srcpkgs/python3-spotipy/template
+++ b/srcpkgs/python3-spotipy/template
@@ -1,18 +1,18 @@
# Template file for 'python3-spotipy'
pkgname=python3-spotipy
-version=2.19.0
-revision=2
+version=2.20.0
+revision=1
wrksrc="spotipy-${version}"
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="python3-devel"
depends="python3-requests python3-six python3-urllib3"
short_desc="Light weight Python library for the Spotify Web API"
-maintainer="Eloi Torrents <eloitorrentsj@gmail.com>"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
license="MIT"
homepage="https://github.com/plamere/spotipy"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36c94b4b3beaa7979721272d84837ee4df3adb8ca6d32c5675b91b3823b4df12
+checksum=5f14c44945520b5fc0c5bf985ea7767d2b86f5f666a69191d12a376919cf95ed
make_check=no # Requires Spotify API Key
post_install() {
From 219fc3189a6617293dce830f3648d86955dbd317 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 23 Jun 2022 12:22:44 +0200
Subject: [PATCH 039/609] bindfs: update to 1.16.0.
---
srcpkgs/bindfs/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index 71836f4985c6..beb18d37dcc1 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,6 +1,6 @@
# Template file for 'bindfs'
pkgname=bindfs
-version=1.15.1
+version=1.16.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -9,7 +9,8 @@ short_desc="FUSE filesystem for mounting a directory to another location"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://bindfs.org"
+changelog="https://bindfs.org/docs/ChangeLog.utf8.txt"
distfiles="https://bindfs.org/downloads/bindfs-${version}.tar.gz"
-checksum=04dd3584a6cdf9af4344d403c62185ca9fab31ce3ae5a25d0101bc10936c68ab
+checksum=02ebefaaa64e1b044fc5c743c5829aad21ed6f7145f4db0723bcc45f085781f6
#cannot mount
make_check=no
From e9faf9f988e0a85906476cc44bef4946ce322051 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 22 Jun 2022 19:12:50 +0200
Subject: [PATCH 040/609] golangci-lint: update to 1.46.2.
---
srcpkgs/golangci-lint/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index ec240a602f1d..3993c339613f 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
# Template file for 'golangci-lint'
pkgname=golangci-lint
-version=1.43.0
+version=1.46.2
revision=1
build_style=go
go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=1fea2ae146e9578931ade7dfd4a0ae3335079dd49bbb396c1fef2333a6524632
+checksum=2f4b6592161565fdd0ee5fea7719dbd6ef593f7ad0e1975fd82e4fb745d487a8
# fix: collect2: fatal error: cannot find 'ld'
export LDFLAGS="-fuse-ld=bfd"
From c5ea1941f4cc044e48618ddadc6a54264f08cfa5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 11 Jun 2022 09:53:45 -0700
Subject: [PATCH 041/609] fuse-overlayfs: update to 1.9
---
srcpkgs/fuse-overlayfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template
index 0fb2a3a56503..4d65edb76ae6 100644
--- a/srcpkgs/fuse-overlayfs/template
+++ b/srcpkgs/fuse-overlayfs/template
@@ -1,6 +1,6 @@
# Template file for 'fuse-overlayfs'
pkgname=fuse-overlayfs
-version=1.8.2
+version=1.9
revision=1
build_style=gnu-configure
hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/containers/fuse-overlayfs"
distfiles="https://github.com/containers/fuse-overlayfs/archive/v${version}.tar.gz"
-checksum=dfcadb2d7e1d109db42cca250fbe3341bbd463ac25f5950b2b56bd7618c0fc0f
+checksum=6a2ff4cb3d32bdedb7986bcb0430ce8e5c44f0e3e71b8c7be558451032fc27f4
pre_configure() {
./autogen.sh
From f8b32b2e14edfd02ede7eefc4e23f3801ef33f5c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 11 Jun 2022 10:53:38 +0300
Subject: [PATCH 042/609] qmmp: update to 1.6.1.
---
srcpkgs/qmmp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index df7b57da7ed6..26c661ed16be 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,6 +1,6 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.5.1
+version=1.6.1
revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=f3dc676039b5f190e6a87377a6b2bd2bcca122d1659b5f22668c7a284bb91f43
+checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
qmmp-devel_package() {
short_desc+=" - development files"
From 62ceae0f640decc9d3344058bb49e613d2f43102 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 6 Jun 2022 16:17:55 +0200
Subject: [PATCH 043/609] duplicity: update to 0.8.23, split subpkg, update
homepage
---
srcpkgs/duplicity-doc | 1 +
srcpkgs/duplicity/template | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
create mode 120000 srcpkgs/duplicity-doc
diff --git a/srcpkgs/duplicity-doc b/srcpkgs/duplicity-doc
new file mode 120000
index 000000000000..3c49d7bc8b8b
--- /dev/null
+++ b/srcpkgs/duplicity-doc
@@ -0,0 +1 @@
+duplicity
\ No newline at end of file
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index 7098a587a79d..afb1eeabaf66 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,7 +1,7 @@
# Template file for 'duplicity'
pkgname=duplicity
-version=0.8.20
-revision=2
+version=0.8.23
+revision=1
build_style=python3-module
hostmakedepends="gettext python3-setuptools_scm"
makedepends="python3-devel librsync-devel"
@@ -11,12 +11,15 @@ checkdepends="$depends python3-pytest python3-mock python3-pexpect
short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://duplicity.nongnu.org/"
-changelog="http://duplicity.nongnu.org/vers8/CHANGELOG.md"
-distfiles="http://launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz"
-checksum=bbe4679d37cc5523c2302d6d7933d32f365f7c9aea7ffc7827c45e3b7b2d2234
+homepage="https://duplicity.gitlab.io"
+changelog="${homepage}/vers8/CHANGELOG.html"
+distfiles="https://launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz"
+checksum=b24aec0df4849a71de64b743fe9957f09bb80259898e455bdc612c78bdb374e2
-post_install() {
- # drop doc
- rm -rf ${DESTDIR}/usr/share/doc
+duplicity-doc_package() {
+ short_desc+=" - documentation"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/doc
+ }
}
From d334277f2af10c5ed9c8f70ee02eed7600f96887 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 29 May 2022 18:54:53 +0200
Subject: [PATCH 044/609] trash-cli: update to 0.22.4.16.
---
srcpkgs/trash-cli/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/trash-cli/template b/srcpkgs/trash-cli/template
index d093cfcd1a25..ef4ab4ecb102 100644
--- a/srcpkgs/trash-cli/template
+++ b/srcpkgs/trash-cli/template
@@ -1,9 +1,9 @@
# Template file for 'trash-cli'
pkgname=trash-cli
-version=0.20.12.26
-revision=2
+version=0.22.4.16
+revision=1
build_style=python3-module
-hostmakedepends="python3"
+hostmakedepends="python3 python3-setuptools"
depends="python3-psutil"
checkdepends="$depends python3-pytest python3-six python3-mock"
short_desc="Command line interface to the freedesktop.org trashcan"
@@ -11,4 +11,6 @@ maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-2.0-or-later"
homepage="https://github.com/andreafrancia/trash-cli"
distfiles="https://github.com/andreafrancia/trash-cli/archive/${version}.tar.gz"
-checksum=06173eaca9b7fbda661ac7d84f900c7f4d17db5dd6ee4b3617bcf2182cde0f31
+checksum=6f2d306abbb0cb857d6fc6697a65e006758458ad85793cc0b62f64be993f9c68
+# Can not be run as root
+make_check=ci-skip
From 9fcd9d75083559124136e60e8b7b23514d422a2b Mon Sep 17 00:00:00 2001
From: Bogdan Drozd <python.bogdan@gmail.com>
Date: Tue, 24 May 2022 17:13:53 +0300
Subject: [PATCH 045/609] reuse: update to 1.0.0.
---
srcpkgs/reuse/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
index 156b73ea9dbe..9da8deb6dcb8 100644
--- a/srcpkgs/reuse/template
+++ b/srcpkgs/reuse/template
@@ -1,18 +1,20 @@
# Template file for 'reuse'
pkgname=reuse
-version=0.13.0
-revision=2
+version=1.0.0
+revision=1
build_style=python3-module
+# These tests pass on local machine but don't pass in CI.
make_check_args="--deselect tests/test_lint.py::test_lint_read_errors
+ --deselect tests/test_main_addheader.py::test_addheader_to_read_only_file_does_not_traceback
--deselect tests/test_report.py::test_generate_project_report_read_error"
hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
- python3-license-expression python3-requests"
-checkdepends="python3-pytest $depends"
+ python3-license-expression python3-requests python3-setuptools"
+checkdepends="python3-pytest $depends git mercurial"
short_desc="Helper tool for compliance with REUSE Specification"
maintainer="k4leg <python.bogdan@gmail.com>"
-license="GPL-3.0-or-later, CC0-1.0, Apache-2.0"
+license="GPL-3.0-or-later, CC0-1.0, Apache-2.0, CC-BY-SA-4.0"
homepage="https://reuse.software"
changelog="https://raw.githubusercontent.com/fsfe/reuse-tool/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
-checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
+checksum=db3022be2d87f69c8f508b928023de3026f454ce17d01e22f770f7147ac1e8d4
From 29426e98dad01c4cf19e31544187309d2bd5a38a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 May 2022 12:04:28 +0200
Subject: [PATCH 046/609] bfs: update to 2.6.
---
srcpkgs/bfs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index 799cd1d86bb6..de85ef0a52fe 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
# Template file for 'bfs'
pkgname=bfs
-version=2.5
+version=2.6
revision=1
build_style=gnu-makefile
makedepends="acl-devel libcap-devel oniguruma-devel"
@@ -9,9 +9,9 @@ short_desc="Breadth-first version of the UNIX find command"
maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="0BSD"
homepage="https://github.com/tavianator/bfs"
-changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md"
+changelog="https://raw.githubusercontent.com/tavianator/bfs/main/docs/CHANGELOG.md"
distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=410be5de74bfc5dece213731d3a8462310789118d299fb14f02bd9b0fdd66875
+checksum=5812a4c62004c851eb02e23c0b6698dbb40061ce1c4069bb33c5b14f5361d81b
post_install() {
vlicense LICENSE
From 174f279869c2580b5783b8fddfd2d42f806e9eff Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 May 2022 16:28:12 +0300
Subject: [PATCH 047/609] seabios: update to 1.16.0.
Also:
- fix xlint warnings.
---
srcpkgs/seabios/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/seabios/template b/srcpkgs/seabios/template
index bec0dcd92f2d..4a99299fae7e 100644
--- a/srcpkgs/seabios/template
+++ b/srcpkgs/seabios/template
@@ -1,16 +1,16 @@
# Template file for 'seabios'
pkgname=seabios
-version=1.14.0
+version=1.16.0
revision=1
+archs="i686* x86_64*"
build_style=gnu-makefile
hostmakedepends="python3"
-archs="i686* x86_64*"
short_desc="OSS implementation of a 16-bit x86 BIOS"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="https://www.seabios.org/"
distfiles="https://www.seabios.org/downloads/${pkgname}-${version}.tar.gz"
-checksum=eb70cc62b29aa83e10a653233acebf4bb154d00d0c87dc2a2c6e2da75e5e81fd
+checksum=d44d8e97ad56f3fd23ed3076077a770d37a5e7bae22daa59656ff41c3334fb34
CFLAGS="-Wno-error -Wno-array-bounds"
From b29e73e21b084cece7ba94d787ad5e0804548c51 Mon Sep 17 00:00:00 2001
From: obunden <56209614+obunden@users.noreply.github.com>
Date: Fri, 20 May 2022 18:15:49 +0200
Subject: [PATCH 048/609] retroarch: update to 1.10.3.
---
srcpkgs/retroarch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index bafac5d513a0..ad22866768fa 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.10.2
+version=1.10.3
revision=1
wrksrc="RetroArch-$version"
build_style=configure
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
homepage="https://www.retroarch.com/"
changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=c7d371208292aa58b295d639e550efbe412671e09a3d609540796709b17b9b8b
+checksum=2af44294e55f5636262284d650cb5fff55c9070ac3a700d4fa55c1f152dcb3f2
build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"
From c10ce210277fe9d88650a53f127014ff68074cbe Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Mon, 20 Jun 2022 12:28:26 +0700
Subject: [PATCH 049/609] cadence: update to 0.9.2
Closes: #37618 [via git-merge-pr]
---
srcpkgs/cadence/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cadence/template b/srcpkgs/cadence/template
index 35ec773b9f11..5fe361c13921 100644
--- a/srcpkgs/cadence/template
+++ b/srcpkgs/cadence/template
@@ -1,10 +1,9 @@
# Template file for 'cadence'
pkgname=cadence
-version=0.9.1
-revision=2
+version=0.9.2
+revision=1
wrksrc="Cadence-${version}"
build_style=gnu-makefile
-python_version=3
pycompile_dirs="usr/share/cadence/src"
hostmakedepends="pkg-config qt5-host-tools python3-PyQt5-devel-tools"
makedepends="jack-devel ladish-devel pulseaudio-devel qt5-devel"
@@ -13,9 +12,10 @@ depends="a2jmidid desktop-file-utils hicolor-icon-theme jack python3-PyQt5-dbus
short_desc="Set of tools useful for audio production"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-only"
-homepage="http://kxstudio.linuxaudio.org/Applications:Cadence"
+homepage="https://kx.studio/Applications:Cadence"
distfiles="https://github.com/falkTX/Cadence/archive/v${version}.tar.gz"
-checksum=e530787ded0d53a3004c7a8260114ddb970c2aea43875d62eccd599ac96e1fd1
+checksum=a07fe845e55c1785d3e1a091b77efd3bb01a88648bd11215461f9fa6a797ae87
+python_version=3
post_extract() {
case "$XBPS_TARGET_MACHINE" in
From 5cdc8db4585a6f001d4c303e90c00558ec721528 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 May 2022 19:00:20 +0300
Subject: [PATCH 050/609] pasystray: update to 0.8.0.
---
srcpkgs/pasystray/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pasystray/template b/srcpkgs/pasystray/template
index fc553ddc05fe..1343c482c7df 100644
--- a/srcpkgs/pasystray/template
+++ b/srcpkgs/pasystray/template
@@ -1,8 +1,7 @@
# Template file for 'pasystray'
pkgname=pasystray
-version=0.7.1
-revision=2
-wrksrc="${pkgname}-${pkgname}-${version}"
+version=0.8.0
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool automake"
makedepends="gtk+3-devel pulseaudio-devel libnotify-devel"
@@ -10,8 +9,8 @@ short_desc="PulseAudio System Tray"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/christophgysin/pasystray"
-distfiles="${homepage}/archive/${pkgname}-${version}.tar.gz"
-checksum=efa5e762c7a60e1017474b87fec78d55cc0420dba3dae7f04f74b64160bd56a6
+distfiles="https://github.com/christophgysin/pasystray/archive/refs/tags/${version}.tar.gz"
+checksum=98624a709c1195a5c2a22a65ffde5e55702bb6999aba7aca8c78dd459a884fdf
pre_configure() {
autoreconf -fi
From 394baac3a8eb69bcb9840bb0ff5182cc7b61cee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 25 Jun 2022 10:59:47 +0700
Subject: [PATCH 051/609] zulucrypt-gui: libcryptsetup always present
Fix: #37633
---
.../patches/20-disable-auto-update.patch | 4 ++--
.../{fix-cflags.patch => 30-fix-cflags.patch} | 4 ----
...40-libcryptsetup-is-always-available.patch | 24 +++++++++++++++++++
srcpkgs/zulucrypt/template | 2 +-
4 files changed, 27 insertions(+), 7 deletions(-)
rename srcpkgs/zulucrypt/patches/{fix-cflags.patch => 30-fix-cflags.patch} (76%)
create mode 100644 srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch
diff --git a/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch b/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch
index f02fa84bb02f..b944c8898600 100644
--- a/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch
+++ b/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch
@@ -2,7 +2,7 @@
--- a/zuluCrypt-gui/zulucrypt.ui
+++ b/zuluCrypt-gui/zulucrypt.ui
-@@ -493,6 +493,9 @@
+@@ -501,6 +501,9 @@
</property>
</action>
<action name="actionCheck_For_Update">
@@ -10,5 +10,5 @@
+ <bool>false</bool>
+ </property>
<property name="text">
- <string>Check For Update</string>
+ <string>C&heck For Update</string>
</property>
diff --git a/srcpkgs/zulucrypt/patches/fix-cflags.patch b/srcpkgs/zulucrypt/patches/30-fix-cflags.patch
similarity index 76%
rename from srcpkgs/zulucrypt/patches/fix-cflags.patch
rename to srcpkgs/zulucrypt/patches/30-fix-cflags.patch
index 665bdf62d558..4629bf4417d2 100644
--- a/srcpkgs/zulucrypt/patches/fix-cflags.patch
+++ b/srcpkgs/zulucrypt/patches/30-fix-cflags.patch
@@ -1,5 +1,3 @@
-Index: external_libraries/tcplay/CMakeLists.txt
-===================================================================
--- a/external_libraries/tcplay/CMakeLists.txt
+++ b/external_libraries/tcplay/CMakeLists.txt
@@ -13,7 +13,7 @@ set (SRCS_LINUX crypto-gcrypt.c)
@@ -11,8 +9,6 @@ Index: external_libraries/tcplay/CMakeLists.txt
set (CFLAGS_VER "-DMAJ_VER=${VERSION_MAJOR} -DMIN_VER=${VERSION_MINOR}")
set (CFLAGS_COMMON "-std=c99 -fPIC ${CFLAGS_LINUX} ${CFLAGS_WARN} ${CFLAGS_VER}")
if ($ENV{DEBUG})
-Index: external_libraries/tcplay/Makefile.classic
-===================================================================
--- a/external_libraries/tcplay/Makefile.classic
+++ b/external_libraries/tcplay/Makefile.classic
@@ -47,8 +47,6 @@ COMMON_CFLAGS= $(WARNFLAGS) -fPIC $(VER_
diff --git a/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch b/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch
new file mode 100644
index 000000000000..5f7412d921d7
--- /dev/null
+++ b/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch
@@ -0,0 +1,24 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,7 +152,7 @@ else( NOT CRYPTSETUP_FOUND )
+
+ get_filename_component(libcrypsetupFullPath ${cryptsetup_lib} REALPATH)
+ MESSAGE( STATUS "commiting to cryptsetup library path of: ${libcrypsetupFullPath}" )
+- file( WRITE ${PROJECT_BINARY_DIR}/cryptsetup_library_path.h "\n#define CRYPTSETUP_LIBRARY_PATH \"${libcrypsetupFullPath}\"" )
++ file( WRITE ${PROJECT_BINARY_DIR}/cryptsetup_library_path.h "\n" )
+
+ endif( NOT CRYPTSETUP_FOUND )
+
+--- a/zuluCrypt-gui/utility.cpp
++++ b/zuluCrypt-gui/utility.cpp
+@@ -3174,5 +3174,9 @@ bool utility::canShowKeySlotProperties()
+
+ bool utility::libCryptSetupLibraryNotFound()
+ {
+- return !utility::pathExists( CRYPTSETUP_LIBRARY_PATH ) ;
++ /*
++ * always present in Void Linux because
++ * zulucrypt-gui depends on zulucrypt which depends on libcryptsetup
++ */
++ return false;
+ }
diff --git a/srcpkgs/zulucrypt/template b/srcpkgs/zulucrypt/template
index cc596dc63dc2..a314ddd38e48 100644
--- a/srcpkgs/zulucrypt/template
+++ b/srcpkgs/zulucrypt/template
@@ -1,7 +1,7 @@
# Template file for 'zulucrypt'
pkgname=zulucrypt
version=6.0.0
-revision=1
+revision=2
wrksrc="zuluCrypt-${version}"
build_style=cmake
configure_args="-DINTERNAL_ZULUPLAY=true -DQT5=true
From dd2c5560f96e4db0db8be6344670d9aa48503624 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 07:11:09 +0200
Subject: [PATCH 052/609] vkd3d: remove package
It was only used for wine and is now bundled with it
---
srcpkgs/vkd3d-devel | 1 -
srcpkgs/vkd3d/template | 24 ------------------------
2 files changed, 25 deletions(-)
delete mode 120000 srcpkgs/vkd3d-devel
delete mode 100644 srcpkgs/vkd3d/template
diff --git a/srcpkgs/vkd3d-devel b/srcpkgs/vkd3d-devel
deleted file mode 120000
index 7dbdf667c5c4..000000000000
--- a/srcpkgs/vkd3d-devel
+++ /dev/null
@@ -1 +0,0 @@
-vkd3d
\ No newline at end of file
diff --git a/srcpkgs/vkd3d/template b/srcpkgs/vkd3d/template
deleted file mode 100644
index c1d1e7f4e436..000000000000
--- a/srcpkgs/vkd3d/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'vkd3d'
-pkgname=vkd3d
-version=1.3
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config flex"
-makedepends="Vulkan-Headers SPIRV-Headers vulkan-loader"
-short_desc="Direct3D 12 to Vulkan translation library"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="LGPL-2.1-or-later"
-homepage="https://www.winehq.org"
-distfiles="https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"
-checksum=134b347806d34a4d2b39ea29ff1c2b38443793803a3adc50800855bb929fb8b2
-
-vkd3d-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
- }
-}
From 36d2e081fea80ab7bee0d5561476216cf8faaa19 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 07:14:25 +0200
Subject: [PATCH 053/609] shlibs: remove vkd3d
---
common/shlibs | 3 ---
1 file changed, 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 93c350e14ac0..8231f48d36a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3592,9 +3592,6 @@ libuhd.so.4.0.0 uhd-4.0.0.0_1
libeditline.so.1 editline-1.16.0_1
libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
-libvkd3d-utils.so.1 vkd3d-1.1_1
-libvkd3d-shader.so.1 vkd3d-1.3_1
-libvkd3d.so.1 vkd3d-1.1_1
libgamemode.so.0 libgamemode-1.6.1_1
libgamemodeauto.so.0 libgamemode-1.6.1_1
libgaminggear.so.0 libgaminggear-0.15.1_1
From e82898ff2f3df0a4571c2eefb1853a447f8e2e38 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 07:14:40 +0200
Subject: [PATCH 054/609] removed-packages: add vkd3d
---
srcpkgs/removed-packages/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a6d94cc051d6..f8cb33ef4098 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=69
+revision=70
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -420,6 +420,7 @@ replaces="
zuluplay-devel<=1.1_1
zuluplay<=1.1_1
bgc<=1.0.1_1
+ vkd3d<=1.3_1
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From b28caf23d510c8b6eb6d1f2f7d4a2457ec400de2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 07:21:16 +0200
Subject: [PATCH 055/609] linux5.4: update to 5.4.200.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 701eaefe8da3..c0f59b5ea1c0 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.199
+version=5.4.200
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=484c09f387656ddb6a1174c7ae6a1df81c02daba831911ad9240aa9582c16c58
+checksum=eae97c9bbf0228bef165be60283ec42cfc9531cea5c641aa3ba131f2125525b8
python_version=3
nodebug=yes # -dbg package is generated below manually
From 2a8660ce8a4aa5bd57081cafe5c2d7724f67333c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 25 Jun 2022 00:47:10 +0530
Subject: [PATCH 056/609] papis: update to 0.12.
---
srcpkgs/papis/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index c97d9c49ddcb..f693def810ea 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,22 +1,26 @@
# Template file for 'papis'
pkgname=papis
-version=0.11.1
-revision=2
+version=0.12
+revision=1
build_style=python3-module
+make_check_args="--deselect=tests/downloaders/test_project_euclid.py::test_1"
+make_check_target="papis tests"
hostmakedepends="python3-setuptools"
depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4
python3-colorama python3-click python3-slugify python3-prompt_toolkit
python3-tqdm python3-Pygments python3-stevedore python3-parsing
python3-filetype python3-bibtexparser python3-habanero python3-arxiv2bib
- python3-isbnlib python3 python3-setuptools python3-lxml
- python3-typing_extensions python3-doi"
+ python3-isbnlib python3-lxml python3-doi python3-Whoosh"
+checkdepends="${depends} python3-pytest-cov"
short_desc="Command-line based document and bibliography manager"
maintainer="xaltsc <xaltsc@protonmail.ch>"
license="GPL-3.0-or-later"
homepage="https://github.com/papis/papis"
+changelog="https://github.com/papis/papis/blob/master/CHANGELOG.md"
distfiles="https://github.com/papis/papis/archive/v${version}.tar.gz"
-checksum=8ebb2f6f50e2e92e16a37ffc1a054983f6b50c6a56d3629d9f612f4197d7a7da
+checksum=75a91f827927a79ac648fbd810aacb1d2a0ba475f69f2f61c421c8b1dbf10cc9
-pre_build() {
- sed -i '/configparser/d' setup.py
+pre_check() {
+ # Required to generate egg_info so that tests can use entry points
+ python3 setup.py egg_info
}
From 500fa577525183e001c50ef0c947d6ea855fce73 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 12:32:03 +0200
Subject: [PATCH 057/609] digikam: update to 7.7.0.
---
srcpkgs/digikam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 54e0216a11f0..1a08760e0f56 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,6 +1,6 @@
# Template file for 'digikam'
pkgname=digikam
-version=7.6.0
+version=7.7.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -21,7 +21,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.digikam.org"
distfiles="${KDE_SITE}/digikam/${version}/digiKam-${version}.tar.xz"
-checksum=d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641
+checksum=c0c6dd2ea8a07514acbf2462f3a54518e7e8099b3337f881336168cff63d771c
CXXFLAGS="-Wl,-lpthread"
From 6bbe30c9cc81247d835ad2916824fa6696fc95aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:08:50 +0200
Subject: [PATCH 058/609] netpbm: update to 10.99.00.
---
srcpkgs/netpbm/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 91c85332c50a..d3b12e78ea92 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
# Template file for 'netpbm'
pkgname=netpbm
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.98.02
+version=10.99.00
revision=1
-_githash=5991a720c260e171c145d035014609f18cb2eaf3
-_githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
+_githash=5bcb369386d617631627a4fb086ff6ab80ffa157
+_githash_guide=7539a285f1cb2b7ed65f79b51cd24e1287cea478
create_wrksrc=yes
build_wrksrc="netpbm-mirror-${_githash}"
hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
homepage="http://netpbm.sourceforge.net/"
distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="7ed7fdfc8cae0a11f15ace63715296917a4a1f61017c06f3d09ead2d39d83320
- 30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
+checksum="47a12475e5ced6ca305e53ec8f0e8e12795309b04ff9e636e24462c9e538ae0f
+ c8eca14c896a9cc2b786445cdaee106dc829c22ceb71219ad471020372ae3704"
post_extract() {
cd $build_wrksrc
From 4f916df07d8c4ea6d1458c707bcb0574495ef98d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:12:55 +0200
Subject: [PATCH 059/609] python3-ropgadget: update to 6.8.
---
srcpkgs/python3-ropgadget/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template
index df108c7351ab..9d32b853ddf3 100644
--- a/srcpkgs/python3-ropgadget/template
+++ b/srcpkgs/python3-ropgadget/template
@@ -1,15 +1,16 @@
# Template file for 'python3-ropgadget'
pkgname=python3-ropgadget
-version=6.7
+version=6.8
revision=1
wrksrc="ROPGadget-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
depends="capstone-python3 python3"
+checkdepends="python3-wheel python3-pip"
short_desc="Search gadgets in binaries to facilitate ROP exploitation"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/JonathanSalwan/ROPgadget"
distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz"
-checksum=a048f2e51c397b902e4586997bd4fe62af97984e207567cb63e67d86e8e09c8e
+checksum=8ce1164d64cb524e07bb67b8e03e57eea1535432b712de9b7efc98829de8ea05
From 3d59a4e643627ad6d781622e95e1dfe4cd9579ce Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 25 Jun 2022 11:57:04 +0530
Subject: [PATCH 060/609] black: update to 22.3.0.
---
srcpkgs/black/template | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index b17749777fb0..c197da7cc670 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,30 +1,28 @@
# Template file for 'black'
pkgname=black
-version=21.9b0
-revision=2
+version=22.3.0
+revision=1
build_style=python3-module
-# Disable tests that require `black` in the search path for commands.
-make_check_args="--deselect tests/test_primer.py::PrimerLibTests::test_gen_check_output
- --deselect tests/test_primer.py::PrimerLibTests::test_process_queue
- --deselect tests/test_primer.py::PrimerCLITests::test_async_main"
hostmakedepends="python3-setuptools python3-setuptools_scm"
-depends="python3-click python3-platformdirs python3-tomli
- python3-mypy_extensions python3-pathspec python3-regex
- python3-typing_extensions"
-checkdepends="python3-typed-ast python3-aiohttp python3-aiohttp-cors
- python3-pytest python3-parameterized python3-ipython python3-tokenize-rt
- $depends"
+depends="python3-click python3-platformdirs python3-tomli python3-pathspec python3-mypy_extensions"
+checkdepends="${depends} python3-pytest-xdist python3-aiohttp python3-colorama python3-uvloop
+ python3-ipython python3-tokenize-rt"
short_desc="Uncompromising Python code formatter"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/psf/black"
changelog="https://raw.githubusercontent.com/psf/black/main/CHANGES.md"
distfiles="${PYPI_SITE}/b/black/black-${version}.tar.gz"
-checksum=7de4cfc7eb6b710de325712d40125689101d21d25283eed7e9998722cf10eb91
+checksum=35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79
-pre_build() {
- # <https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-python/black/black-21.8_beta0.ebuild#n45>.
- vsed -i '/setuptools_scm/s:~=:>=:' setup.cfg
+do_check() {
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional jupyter \
+ -m jupyter --deselect=tests/test_ipynb.py::test_set_input
+
+ pyver=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+ mv ${XBPS_MASTERDIR}/usr/lib/python${pyver}/site-packages/IPython ${XBPS_MASTERDIR}/tmp/IPython.bak
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional no_jupyter
+ mv ${XBPS_MASTERDIR}/tmp/IPython.bak ${XBPS_MASTERDIR}/usr/lib/python${pyver}/site-packages/IPython
}
post_install() {
From b46af7e7b8f119258ddadec7676aa83a75afa52c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:18:56 +0200
Subject: [PATCH 061/609] linux5.18: update to 5.18.7.
---
srcpkgs/linux5.18/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index 44b7162ebc70..be6582401d64 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.18'
pkgname=linux5.18
-version=5.18.4
+version=5.18.7
revision=1
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee
- 63b32158ca369f104a80543b9b8e553c761c49f93da40eae91c8675af01b560b"
+ 783de8b66193fd9bd2acabad8fdc7a14ac74aca35b7e606b10ac94ced77b430e"
skip_extraction="patch-${version}.xz"
python_version=3
From 8edd0e5402e9f54068d126a9a84637f4299e5ee2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:21:58 +0200
Subject: [PATCH 062/609] linux5.15: update to 5.15.50.
---
srcpkgs/linux5.15/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a3d4cc99dbd2..a54741bf8478 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.15'
pkgname=linux5.15
-version=5.15.47
+version=5.15.50
revision=1
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 1a9a61db4b613190278cc1a4ba77bd597feaae8c4276e0c6103fcacc78b09c5a"
+ 16bfe772c0ac272bc4b5be68b3e1aead51eebdab2d61b360a0d18126f52c50a8"
skip_extraction="patch-${version}.xz"
python_version=3
From 5a37b288b32983efd05215b0bcdc2c0989d6bc8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:23:07 +0200
Subject: [PATCH 063/609] linux5.10: update to 5.10.125.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 144424658757..781879543adc 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.122
+version=5.10.125
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=920bb3110a881b132a8960db8311689dec3c984634d3d93bbaa4b57047740f40
+checksum=b9356ea02532c063f0b19a82e67c2afbd7c5460184fce7011222cf8667568f60
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From aae8b2f1466eee90ecee431e09f3ed69f465f829 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 14:28:06 +0300
Subject: [PATCH 064/609] New package: font-awesome6-6.1.1
---
srcpkgs/font-awesome6/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/font-awesome6/template
diff --git a/srcpkgs/font-awesome6/template b/srcpkgs/font-awesome6/template
new file mode 100644
index 000000000000..d004b2b31579
--- /dev/null
+++ b/srcpkgs/font-awesome6/template
@@ -0,0 +1,18 @@
+# Template file for 'font-awesome6'
+pkgname=font-awesome6
+version=6.1.1
+revision=1
+wrksrc="fontawesome-free-${version}-desktop"
+hostmakedepends="font-util"
+short_desc="Iconic SVG, font, and CSS toolkit - desktop fonts"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="OFL-1.1"
+homepage="https://fontawesome.com/"
+changelog="https://fontawesome.com/docs/changelog/"
+distfiles="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-desktop.zip"
+checksum=73366012c82155f4ba78e842d15f5e49597bb21320d85c63ea984d788791b267
+font_dirs="/usr/share/fonts/OTF"
+
+do_install() {
+ install -Dm644 otfs/*.otf -t ${DESTDIR}/usr/share/fonts/OTF
+}
From 49d87a25cff01283478183e070486bd0ed8e808f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 6 Jun 2022 21:51:25 +0300
Subject: [PATCH 065/609] font-awesome5: remove conflict with font-awesome.
- suggested by @classabbyamp
---
srcpkgs/font-awesome5/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..638813c8450b 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,7 +1,7 @@
# Template file for 'font-awesome5'
pkgname=font-awesome5
version=5.15.4
-revision=1
+revision=2
wrksrc="Font-Awesome-${version}"
depends="font-util"
short_desc="Iconic font (version 5)"
@@ -11,7 +11,6 @@ homepage="https://fontawesome.com"
changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
-conflicts="font-awesome>=0"
font_dirs="/usr/share/fonts/OTF"
do_install() {
From 8192721f72e3c1aa40a579973eb109a93d05f64d Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Sun, 13 Mar 2022 23:28:29 +0100
Subject: [PATCH 066/609] New package: bkt-0.5.3
---
srcpkgs/bkt/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/bkt/template
diff --git a/srcpkgs/bkt/template b/srcpkgs/bkt/template
new file mode 100644
index 000000000000..3906e3e849bb
--- /dev/null
+++ b/srcpkgs/bkt/template
@@ -0,0 +1,18 @@
+# Template file for 'bkt'
+pkgname=bkt
+version=0.5.4
+revision=1
+build_style=cargo
+# disable flaky test: https://github.com/dimo414/bkt/issues/14
+make_check_args=" -- --skip cli::discard_failures_in_background"
+short_desc="Subprocess caching utility"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://www.bkt.rs/"
+distfiles="https://github.com/dimo414/bkt/archive/${version}.tar.gz"
+checksum=172c413709dc81ced9dfa2750aaa398864e904d1ed213bd19e51d45d1ff0a8ff
+
+post_install() {
+ vlicense LICENSE
+ vdoc README.md
+}
From c4c9ca704961da4059ec45dc10083d5d61e8c2e9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jun 2022 23:49:56 +0200
Subject: [PATCH 067/609] broot: broken on big endian
---
srcpkgs/broot/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index b3e5f71efe15..d57eb2f7b588 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -11,6 +11,10 @@ changelog="https://raw.githubusercontent.com/Canop/broot/master/CHANGELOG.md"
distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
checksum=a7f9e98ff1371eff065a8dabbe9e31ef42d264b7d93c18f920d6a5399016da33
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+ broken="exr crate errors on big endian"
+fi
+
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*|mips*) broken="unresolved import 'std::sync::atomic::AtomicU64'";;
From 8b1b30d9d906dec419443cf5a255fe059084de6f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 22 Jun 2022 20:08:38 +0200
Subject: [PATCH 068/609] chromium: update to 103.0.5060.53.
---
.../files/musl-patches/musl-tid-caching.patch | 81 ++++++++
.../musl-patches/quiche-arena-size.patch | 11 +
srcpkgs/chromium/patches/9d080c0.patch | 196 ------------------
srcpkgs/chromium/patches/9d080c0.patch.args | 1 -
...omium-102-fenced_frame_utils-include.patch | 25 ---
.../chromium-102-regex_pattern-array.patch | 14 --
.../patches/chromium-libxml-unbundle.patch | 10 -
srcpkgs/chromium/patches/sndio.patch | 6 +-
.../chromium/patches/xxx-ppc64le-libvpx.patch | 71 ++-----
.../patches/xxx-ppc64le-support.patch | 118 -----------
srcpkgs/chromium/template | 4 +-
11 files changed, 113 insertions(+), 424 deletions(-)
create mode 100644 srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
create mode 100644 srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
diff --git a/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
new file mode 100644
index 000000000000..cec0ffd551f3
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
@@ -0,0 +1,81 @@
+--- ./sandbox/linux/services/namespace_sandbox.cc.orig
++++ ./sandbox/linux/services/namespace_sandbox.cc
+@@ -209,6 +209,70 @@
+ return base::LaunchProcess(argv, launch_options_copy);
+ }
+
++#if defined(__aarch64__) || defined(__arm__) || defined(__powerpc__)
++#define TLS_ABOVE_TP
++#endif
++
++struct musl_pthread
++{
++ /* Part 1 -- these fields may be external or
++ * internal (accessed via asm) ABI. Do not change. */
++ struct pthread *self;
++#ifndef TLS_ABOVE_TP
++ uintptr_t *dtv;
++#endif
++ struct pthread *prev, *next; /* non-ABI */
++ uintptr_t sysinfo;
++#ifndef TLS_ABOVE_TP
++#ifdef CANARY_PAD
++ uintptr_t canary_pad;
++#endif
++ uintptr_t canary;
++#endif
++
++/* Part 2 -- implementation details, non-ABI. */
++ int tid;
++ int errno_val;
++ volatile int detach_state;
++ volatile int cancel;
++ volatile unsigned char canceldisable, cancelasync;
++ unsigned char tsd_used:1;
++ unsigned char dlerror_flag:1;
++ unsigned char *map_base;
++ size_t map_size;
++ void *stack;
++ size_t stack_size;
++ size_t guard_size;
++ void *result;
++ struct __ptcb *cancelbuf;
++ void **tsd;
++ struct {
++ volatile void *volatile head;
++ long off;
++ volatile void *volatile pending;
++ } robust_list;
++ int h_errno_val;
++ volatile int timer_id;
++ locale_t locale;
++ volatile int killlock[1];
++ char *dlerror_buf;
++ void *stdio_locks;
++
++ /* Part 3 -- the positions of these fields relative to
++ * the end of the structure is external and internal ABI. */
++#ifdef TLS_ABOVE_TP
++ uintptr_t canary;
++ uintptr_t *dtv;
++#endif
++};
++
++void MaybeUpdateMuslTidCache()
++{
++ pid_t real_tid = sys_gettid();
++ pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
++ *cached_tid_location = real_tid;
++}
++
+ // static
+ pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
+ const pid_t pid =
+@@ -226,6 +290,7 @@
+ #if defined(LIBC_GLIBC)
+ MaybeUpdateGlibcTidCache();
+ #endif
++ MaybeUpdateMuslTidCache();
+ return 0;
+ }
+
diff --git a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
new file mode 100644
index 000000000000..1c9182dbc810
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
@@ -0,0 +1,11 @@
+--- ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
++++ ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
+@@ -69,7 +69,7 @@
+
+ // QuicConnections currently use around 1KB of polymorphic types which would
+ // ordinarily be on the heap. Instead, store them inline in an arena.
+-using QuicConnectionArena = QuicOneBlockArena<1248>;
++using QuicConnectionArena = QuicOneBlockArena<1504>;
+
+ } // namespace quic
+
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
deleted file mode 100644
index 885ab5a1b82a..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
-From: Dylan Cutler <dylancutler@google.com>
-Date: Wed, 26 May 2021 16:39:52 +0000
-Subject: [PATCH] Reland "Replace 'blacklist' with 'ignorelist' in
- ./tools/msan/."
-
-This is a reland of 3b6263f2eece1264b052dfdcbc03b851d5abfb48
-
-Relanding now that https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2897974 is merged
-
-Original change's description:
-> Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
->
-> Bug: 1097272, 1097268
-> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
-> Commit-Queue: Dylan Cutler <dylancutler@google.com>
-> Reviewed-by: Nico Weber <thakis@chromium.org>
-> Reviewed-by: Jonathan Metzman <metzman@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#883035}
-
-Bug: 1097272
-Bug: 1097268
-Change-Id: I11a5bc8972680c95fb1dab95ed3b707ed76f4667
-Cq-Include-Trybots: luci.chromium.try:chromeos-amd64-generic-cfi-thin-lto-rel
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911096
-Commit-Queue: Dylan Cutler <dylancutler@google.com>
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#886773}
----
- build/config/sanitizers/BUILD.gn | 44 ++++++++++----------
- build_overrides/build.gni | 14 +++----
- tools/msan/{blacklist.txt => ignorelist.txt} | 0
- 3 files changed, 29 insertions(+), 29 deletions(-)
- rename tools/msan/{blacklist.txt => ignorelist.txt} (100%)
-
-diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
-index aaaad023474d1..55b388a437439 100644
---- a/build/config/sanitizers/BUILD.gn
-+++ b/build/config/sanitizers/BUILD.gn
-@@ -272,11 +272,11 @@ config("asan_flags") {
- if (is_asan) {
- cflags += [ "-fsanitize=address" ]
- if (is_win) {
-- if (!defined(asan_win_blacklist_path)) {
-- asan_win_blacklist_path =
-+ if (!defined(asan_win_blocklist_path)) {
-+ asan_win_blocklist_path =
- rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
- }
-- cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
-+ cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
- }
- }
- }
-@@ -306,13 +306,13 @@ config("link_shared_library") {
- config("cfi_flags") {
- cflags = []
- if (is_cfi && current_toolchain == default_toolchain) {
-- if (!defined(cfi_blacklist_path)) {
-- cfi_blacklist_path =
-+ if (!defined(cfi_ignorelist_path)) {
-+ cfi_ignorelist_path =
- rebase_path("//tools/cfi/ignores.txt", root_build_dir)
- }
- cflags += [
- "-fsanitize=cfi-vcall",
-- "-fsanitize-blacklist=$cfi_blacklist_path",
-+ "-fsanitize-ignorelist=$cfi_ignorelist_path",
- ]
-
- if (use_cfi_cast) {
-@@ -409,14 +409,14 @@ config("msan_flags") {
- if (is_msan) {
- assert(is_linux || is_chromeos,
- "msan only supported on linux x86_64/ChromeOS")
-- if (!defined(msan_blacklist_path)) {
-- msan_blacklist_path =
-- rebase_path("//tools/msan/blacklist.txt", root_build_dir)
-+ if (!defined(msan_ignorelist_path)) {
-+ msan_ignorelist_path =
-+ rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
- }
- cflags = [
- "-fsanitize=memory",
- "-fsanitize-memory-track-origins=$msan_track_origins",
-- "-fsanitize-blacklist=$msan_blacklist_path",
-+ "-fsanitize-ignorelist=$msan_ignorelist_path",
- ]
- }
- }
-@@ -424,13 +424,13 @@ config("msan_flags") {
- config("tsan_flags") {
- if (is_tsan) {
- assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
-- if (!defined(tsan_blacklist_path)) {
-- tsan_blacklist_path =
-+ if (!defined(tsan_ignorelist_path)) {
-+ tsan_ignorelist_path =
- rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
- }
- cflags = [
- "-fsanitize=thread",
-- "-fsanitize-blacklist=$tsan_blacklist_path",
-+ "-fsanitize-ignorelist=$tsan_ignorelist_path",
- ]
- }
- }
-@@ -438,8 +438,8 @@ config("tsan_flags") {
- config("ubsan_flags") {
- cflags = []
- if (is_ubsan) {
-- if (!defined(ubsan_blacklist_path)) {
-- ubsan_blacklist_path =
-+ if (!defined(ubsan_ignorelist_path)) {
-+ ubsan_ignorelist_path =
- rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
- }
- cflags += [
-@@ -456,7 +456,7 @@ config("ubsan_flags") {
- "-fsanitize=signed-integer-overflow",
- "-fsanitize=unreachable",
- "-fsanitize=vla-bound",
-- "-fsanitize-blacklist=$ubsan_blacklist_path",
-+ "-fsanitize-ignorelist=$ubsan_ignorelist_path",
- ]
-
- # Chromecast ubsan builds fail to compile with these
-@@ -486,8 +486,8 @@ config("ubsan_no_recover") {
-
- config("ubsan_security_flags") {
- if (is_ubsan_security) {
-- if (!defined(ubsan_security_blacklist_path)) {
-- ubsan_security_blacklist_path =
-+ if (!defined(ubsan_security_ignorelist_path)) {
-+ ubsan_security_ignorelist_path =
- rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
- }
- cflags = [
-@@ -495,7 +495,7 @@ config("ubsan_security_flags") {
- "-fsanitize=shift",
- "-fsanitize=signed-integer-overflow",
- "-fsanitize=vla-bound",
-- "-fsanitize-blacklist=$ubsan_security_blacklist_path",
-+ "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
- ]
- }
- }
-@@ -508,13 +508,13 @@ config("ubsan_null_flags") {
-
- config("ubsan_vptr_flags") {
- if (is_ubsan_vptr) {
-- if (!defined(ubsan_vptr_blacklist_path)) {
-- ubsan_vptr_blacklist_path =
-+ if (!defined(ubsan_vptr_ignorelist_path)) {
-+ ubsan_vptr_ignorelist_path =
- rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
- }
- cflags = [
- "-fsanitize=vptr",
-- "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
-+ "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
- ]
- }
- }
-diff --git a/build_overrides/build.gni b/build_overrides/build.gni
-index 82627b03653f1..f3e563ab701bf 100644
---- a/build_overrides/build.gni
-+++ b/build_overrides/build.gni
-@@ -42,15 +42,15 @@ declare_args() {
- # Allows different projects to specify their own suppression/ignore lists for
- # sanitizer tools.
- # asan_suppressions_file = "path/to/asan_suppressions.cc"
--# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
-+# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
- # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
- # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
--# tsan_blacklist_path = "path/to/tsan/ignores.txt"
--# msan_blacklist_path = "path/to/msan/blacklist.txt"
--# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
--# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
--# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
--# cfi_blacklist_path = "path/to/cfi/ignores.txt"
-+# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
-+# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
-+# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
-+# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
-+# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
-+# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
-
- declare_args() {
- # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
-diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt
-similarity index 100%
-rename from tools/msan/blacklist.txt
-rename to tools/msan/ignorelist.txt
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
deleted file mode 100644
index 8bbbbe948363..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch b/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
deleted file mode 100644
index 61f904bad6a4..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 Apr 2022 16:01:01 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
-
----
- third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-index 9e2d3ad..68f4823 100644
---- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-@@ -4,6 +4,8 @@
-
- #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
-
-+#include <cstring>
-+
- #include "base/guid.h"
- #include "base/strings/string_util.h"
-
---
-2.35.1
-
diff --git a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch b/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
deleted file mode 100644
index 18058b1faa45..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/components/autofill/core/browser/BUILD.gn
-+++ b/components/autofill/core/browser/BUILD.gn
-@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
- }
-
- static_library("browser") {
-+ if (is_clang) {
-+ cflags = [
-+ "-fbracket-depth=1000",
-+ ]
-+ }
- sources = [
- "address_normalization_manager.cc",
- "address_normalization_manager.h",
diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
deleted file mode 100644
index 5699bc8f8eaf..000000000000
--- a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
- ":xml_reader",
- ":xml_writer",
- "//base/test:test_support",
-+ "//services/data_decoder:lib",
- "//services/data_decoder:xml_parser_fuzzer_deps",
- ]
- sources = [
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index bac8a63bc24f..df668d13b2a3 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -865,13 +865,13 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-
diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
--- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200
+++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200
-@@ -119,6 +119,9 @@
+@@ -125,6 +125,9 @@
# Enables runtime selection of ALSA library for audio.
use_alsa = false
+ # Enable runtime selection of sndio(7)
+ use_sndio = false
+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+ # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS
+ # video builds).
if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
index 6d423d4091c5..05384cd360ba 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
@@ -1,72 +1,33 @@
-Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
-and add --enable-vsx, and change generic to ppc for the rtcd header.
+commit 981437bc846fcdb854062e89fd3d86f112e5f426
+Author: q66 <daniel@octaforge.org>
+Date: Sat Jun 25 12:35:37 2022 +0200
-From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Sep 2020 19:08:25 +0200
-Subject: [PATCH] enable generation of ppc64 libvpx bits
+ Use generic target for now.
+
+ This is because the source tree is missing vsx optimizations that
+ then do not get included and result in failed linking such as:
+
+ ld.lld: error: undefined symbol: vpx_mse16x16_vsx
-this doesn't update the gni file, that's done from
-the template by running the appropriate scripts
----
- third_party/libvpx/BUILD.gn | 4 ++++
- third_party/libvpx/generate_gni.sh | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
-index 7198e59..3300485 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -336,6 +336,8 @@ static_library("libvpx") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_ppc64
- }
-
- configs -= [ "//build/config/compiler:chromium_code" ]
-diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
-index bcf84b0..8a3f4f1 100755
+diff --git a/third_party/libvpx/generate_gni.sh b/third_party/libvpx/generate_gni.sh
+index 7429080..43ee29a 100755
--- a/third_party/libvpx/generate_gni.sh
+++ b/third_party/libvpx/generate_gni.sh
-@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
+@@ -374,7 +374,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
-+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+-gen_config_files linux/ppc64 "--target=ppc64le-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu ${all_platforms}"
gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
-@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd
- lint_config linux/arm64-highbd
- lint_config linux/mipsel
- lint_config linux/mips64el
-+lint_config linux/ppc64
- lint_config linux/generic
- lint_config win/arm64
- lint_config win/ia32
-@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
+@@ -430,7 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
gen_rtcd_header linux/arm64-highbd armv8
gen_rtcd_header linux/mipsel mipsel
gen_rtcd_header linux/mips64el mips64el
+-gen_rtcd_header linux/ppc64 ppc
+gen_rtcd_header linux/ppc64 generic
gen_rtcd_header linux/generic generic
gen_rtcd_header win/arm64 armv8
gen_rtcd_header win/ia32 x86 "${require_sse2}"
-@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then
-
- echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
-
-+ echo "Generate ppc64 source list."
-+ config=$(print_config_basic linux/ppc64)
-+ make_clean
-+ make libvpx_srcs.txt target=libs $config > /dev/null
-+ convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
-+
- echo "Generate NaCl source list."
- config=$(print_config_basic nacl)
- make_clean
---
-2.28.0
-
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index e626f8130d43..d9a2724e1e22 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3275,58 +3275,6 @@ index 30a2ab21d..60509f21d 100644
#endif
}
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 6b4566fc3..c07f732ad 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -184,6 +184,8 @@ static_library("dav1d_8bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -212,6 +214,8 @@ static_library("dav1d_10bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
- defines = [ "PREFIX" ]
- }
-
-+ cflags = dav1d_copts
-+ }
-+} else if (current_cpu == "ppc64") {
-+ static_library("dav1d_ppc") {
-+ sources = [
-+ "libdav1d/src/ppc/cpu.c",
-+ "libdav1d/src/ppc/cpu.h",
-+ ]
-+
-+ configs -= [ "//build/config/compiler:chromium_code" ]
-+ configs += [
-+ "//build/config/compiler:no_chromium_code",
-+ ":dav1d_config",
-+ ]
-+
- cflags = dav1d_copts
- }
- }
-@@ -292,5 +311,7 @@ static_library("dav1d") {
- }
- } else if (current_cpu == "arm" || current_cpu == "arm64") {
- deps += [ ":dav1d_arm" ]
-+ } else if (current_cpu == "ppc64") {
-+ deps += [ ":dav1d_ppc" ]
- }
- }
diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h
new file mode 100644
index 000000000..9fbbf75cc
@@ -3372,33 +3320,6 @@ index 000000000..9fbbf75cc
+
+#define HAVE_UNISTD_H 1
+
-diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni
-index c59cb0821..3060284a8 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -82,6 +82,11 @@ arm_template_sources = [
- "libdav1d/src/arm/mc_init_tmpl.c",
- ]
-
-+ppc64_template_sources = [
-+ "libdav1d/src/ppc/cdef_init_tmpl.c",
-+ "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
- "libdav1d/src/cdef_apply_tmpl.c",
- "libdav1d/src/cdef_tmpl.c",
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -61,6 +61,8 @@
- _Glob("libdav1d/src/arm/64/*_tmpl.S") + ["libdav1d/src/arm/64/util.S"])
- _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
-
-+ _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
-+
- template_sources = _Glob("libdav1d/src/*_tmpl.c")
- _WriteArray(fd, "template_sources", template_sources)
-
diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
index 0b4bd72f0..a0caa5e71 100644
--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
@@ -3450,17 +3371,6 @@ index 9b065bd..df3af02 100644
} else {
cpu_arch_full = current_cpu
}
-diff --git a/third_party/libgav1/options.gni b/third_party/libgav1/options.gni
-index 11af801..4b13d05 100644
---- a/third_party/libgav1/options.gni
-+++ b/third_party/libgav1/options.gni
-@@ -12,5 +12,5 @@ declare_args() {
- is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
- use_libgav1_parser =
- (is_chromeos || is_linux || is_win) &&
-- (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
-+ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
- }
diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
index e4ac22644..1c57015db 100644
--- a/third_party/lss/linux_syscall_support.h
@@ -3585,34 +3495,6 @@ index 245070d4f..b25164e95 100644
# define SQLITE_BYTEORDER 1234
# elif defined(sparc) || defined(__ppc__) || \
defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-index 4f0c5430c..54ee0829e 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
-
- if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
-- // For ARM and MIPS processors, always use C version.
-- // TODO(hclam): Implement a NEON version.
-- diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = GetCPUInfo(kSSE2) != 0;
- // For x86 processors, check if SSE2 is supported.
- if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- } else {
- diff_proc = &VectorDifference_C;
- }
-+#else
-+ // For other processors, always use C version.
-+ // TODO(hclam): Implement a NEON version.
-+ diff_proc = &VectorDifference_C;
- #endif
- }
-
diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h
index be2367b85..be4ee4233 100644
--- a/third_party/webrtc/rtc_base/system/arch.h
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 1f385fd186df..b546c7f3918f 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=102.0.5005.115
+version=103.0.5060.53
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
+checksum=0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
lib32disabled=yes
From 1ad77aa6d4368d8c443d73c19f01767207643048 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Thu, 23 Jun 2022 22:00:47 -0700
Subject: [PATCH 069/609] python3-pycryptodomex: update to 3.15.0.
---
srcpkgs/python3-pycryptodomex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index c6e0618f9640..622501a2e2ab 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pycryptodomex'
pkgname=python3-pycryptodomex
-version=3.14.1
+version=3.15.0
revision=1
wrksrc="pycryptodomex-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Public Domain, BSD-2-Clause"
homepage="https://www.pycryptodome.org/"
changelog="https://www.pycryptodome.org/en/latest/src/changelog.html"
distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
-checksum=2ce76ed0081fd6ac8c74edc75b9d14eca2064173af79843c24fa62573263c1f2
+checksum=7341f1bb2dadb0d1a0047f34c3a58208a92423cdbd3244d998e4b28df5eac0ed
post_install() {
vlicense LICENSE.rst
From 9202628d4d8d3357771ef1d6ac5f5c0e45d88b46 Mon Sep 17 00:00:00 2001
From: Chloris <chloris@freedommail.ch>
Date: Tue, 21 Jun 2022 17:38:52 +0200
Subject: [PATCH 070/609] New package: hunspell-sl_SI-2020.12.31
---
srcpkgs/hunspell-sl_SI/template | 18 ++++++++++++++++++
srcpkgs/hunspell-sl_SI/update | 1 +
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/hunspell-sl_SI/template
create mode 100644 srcpkgs/hunspell-sl_SI/update
diff --git a/srcpkgs/hunspell-sl_SI/template b/srcpkgs/hunspell-sl_SI/template
new file mode 100644
index 000000000000..26f2fb319c7e
--- /dev/null
+++ b/srcpkgs/hunspell-sl_SI/template
@@ -0,0 +1,18 @@
+# Template file for 'hunspell-sl_SI'
+pkgname=hunspell-sl_SI
+version=2020.12.31
+revision=1
+create_wrksrc=yes
+hostmakedepends="unzip"
+short_desc="Slovenian dictionary for hunspell"
+maintainer="Chloris <chloris@freedommail.ch>"
+license="MPL-2.0"
+homepage="https://extensions.libreoffice.org/en/extensions/show/slovenian-dictionary-pack"
+distfiles="https://extensions.libreoffice.org/assets/downloads/752/pack-sl.oxt>pack-sl.zip"
+checksum="0183eb7472a7da234be9dab8f89c0eb93b2fdf660b5ff2f80718ab4281189d00"
+
+do_install() {
+ vinstall sl_SI.aff 644 usr/share/hunspell
+ vinstall sl_SI.dic 644 usr/share/hunspell
+ vdoc README_sl_SI.txt
+}
diff --git a/srcpkgs/hunspell-sl_SI/update b/srcpkgs/hunspell-sl_SI/update
new file mode 100644
index 000000000000..2f02bd37cbe7
--- /dev/null
+++ b/srcpkgs/hunspell-sl_SI/update
@@ -0,0 +1 @@
+pattern='<span>\K[\d.]+(?=</span>)'
From 7ba78570f56096ae6f200ddcb08b66b01aa67a8e Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 13:45:48 +0300
Subject: [PATCH 071/609] nerdctl: update to 0.18.0.
---
srcpkgs/nerdctl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index 4c52d4a26b25..b3e47cf76e3e 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,6 +1,6 @@
# Template file for 'nerdctl'
pkgname=nerdctl
-version=0.16.1
+version=0.18.0
revision=1
build_style=go
go_import_path=github.com/containerd/nerdctl
@@ -10,4 +10,4 @@ maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
license="Apache-2.0"
homepage="https://github.com/containerd/nerdctl"
distfiles="https://github.com/containerd/nerdctl/archive/refs/tags/v$version.tar.gz"
-checksum=be19ceed51703a71f847bfff3afcf25e0efd4c012fd8ec1ff02c545d6773989d
+checksum=d6f858d649271b323a42dcf876b1d80f262416aa03236e30ca9d648cd80536bf
From e54ea1c8c6be534a164ebcdfe4a1ab73629c69a0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 3 Jan 2022 09:57:05 +0100
Subject: [PATCH 072/609] atlantis: update to 0.19.2.
---
srcpkgs/atlantis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index 66ff39e0ef15..84512cabbfc4 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,6 +1,6 @@
# Template file for 'atlantis'
pkgname=atlantis
-version=0.17.6
+version=0.19.2
revision=1
build_style=go
go_import_path=github.com/runatlantis/atlantis
@@ -10,4 +10,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
homepage="https://runatlantis.io"
distfiles="https://github.com/runatlantis/atlantis/archive/v${version}.tar.gz"
-checksum=79124d4df5d2d1bfa7ae8367cdb413fd752b6521812154dfafb74d7cab02b73a
+checksum=5c0da4efc288a2cd3f0456619e3048922542a421798ebb834b8800fc4dcf124c
From 7df2959daf59d69083bba93986107da81ba1ddc4 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Thu, 23 Jun 2022 22:15:37 +0100
Subject: [PATCH 073/609] usql: update to 0.10.0.
---
srcpkgs/usql/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index 45687345c30c..943f3c55768b 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,15 +1,16 @@
# Template file for 'usql'
pkgname=usql
-version=0.9.5
+version=0.10.0
revision=1
build_style=go
go_import_path=github.com/xo/usql
+go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"
short_desc="Universal command-line interface for SQL databases"
maintainer="Alan Brown <adbrown@rocketmail.com>"
license="MIT"
homepage="https://github.com/xo/usql"
distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=10de92f1d7d8a85c4c8173296e928f24fc933c733c1a71b5b8e33b832bd95b4d
+checksum=d0f012b0937a5b75f08207efce644b96a49780f1312f20fa9c7ea1f4e662037f
post_install() {
vlicense LICENSE
From 0fe9189d1e96f6ee09d55fcc38424acc40bbcd0a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 26 Jun 2022 08:43:40 +0200
Subject: [PATCH 074/609] linux5.4: update to 5.4.201.
---
srcpkgs/linux5.4/files/arm-dotconfig | 2 +-
srcpkgs/linux5.4/files/arm64-dotconfig | 2 +-
srcpkgs/linux5.4/files/i386-dotconfig | 2 +-
srcpkgs/linux5.4/files/ppc-dotconfig | 2 +-
srcpkgs/linux5.4/files/ppc64-dotconfig | 2 +-
srcpkgs/linux5.4/files/ppc64le-dotconfig | 2 +-
srcpkgs/linux5.4/files/x86_64-dotconfig | 2 +-
srcpkgs/linux5.4/template | 4 ++--
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/linux5.4/files/arm-dotconfig b/srcpkgs/linux5.4/files/arm-dotconfig
index 80ab5329caa4..1ed2792085e7 100644
--- a/srcpkgs/linux5.4/files/arm-dotconfig
+++ b/srcpkgs/linux5.4/files/arm-dotconfig
@@ -3285,7 +3285,7 @@ CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set
# end of Character devices
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 21f6ee83333d..fa817bd05fa2 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -4333,7 +4333,7 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XILLYBUS_OF=m
# end of Character devices
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig
index fa6a30fd7091..9ad39afed993 100644
--- a/srcpkgs/linux5.4/files/i386-dotconfig
+++ b/srcpkgs/linux5.4/files/i386-dotconfig
@@ -3911,7 +3911,7 @@ CONFIG_XILLYBUS_PCIE=m
# end of Character devices
# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index 05ea4272d4d2..272515f2ced8 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -3426,7 +3426,7 @@ CONFIG_DEVPORT=y
# end of Character devices
CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/ppc64-dotconfig b/srcpkgs/linux5.4/files/ppc64-dotconfig
index 99d0ad4c1e7d..e5734d6c40b3 100644
--- a/srcpkgs/linux5.4/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64-dotconfig
@@ -4010,7 +4010,7 @@ CONFIG_XILLYBUS_OF=m
# end of Character devices
# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/ppc64le-dotconfig b/srcpkgs/linux5.4/files/ppc64le-dotconfig
index efbb130dc1c1..3fcbaec21dfd 100644
--- a/srcpkgs/linux5.4/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64le-dotconfig
@@ -3846,7 +3846,7 @@ CONFIG_XILLYBUS_OF=m
# end of Character devices
# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig
index 0ecfe841959e..71a859468c44 100644
--- a/srcpkgs/linux5.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.4/files/x86_64-dotconfig
@@ -3984,7 +3984,7 @@ CONFIG_XILLYBUS_PCIE=m
# end of Character devices
# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index c0f59b5ea1c0..538c74794441 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.200
+version=5.4.201
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=eae97c9bbf0228bef165be60283ec42cfc9531cea5c641aa3ba131f2125525b8
+checksum=813dd73120c1f72e69feda9c029902450ebfbac6323fe4cf3c5547a298c36e61
python_version=3
nodebug=yes # -dbg package is generated below manually
From 8742ea35022668ef83cfd6efc2cdeecd26b590fc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 26 Jun 2022 08:59:13 +0200
Subject: [PATCH 075/609] linux4.19: update to 4.19.249.
---
srcpkgs/linux4.19/files/arm-dotconfig | 4 ++--
srcpkgs/linux4.19/files/arm64-dotconfig | 4 ++--
srcpkgs/linux4.19/files/i386-dotconfig | 5 +++--
srcpkgs/linux4.19/files/ppc-dotconfig | 5 +++--
srcpkgs/linux4.19/files/ppc64-dotconfig | 4 +++-
srcpkgs/linux4.19/files/ppc64le-dotconfig | 3 ++-
srcpkgs/linux4.19/files/x86_64-dotconfig | 5 +++--
srcpkgs/linux4.19/template | 4 ++--
8 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/linux4.19/files/arm-dotconfig b/srcpkgs/linux4.19/files/arm-dotconfig
index 3ec21e84f6f0..23c73f8374f5 100644
--- a/srcpkgs/linux4.19/files/arm-dotconfig
+++ b/srcpkgs/linux4.19/files/arm-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.230 Kernel Configuration
+# Linux/arm 4.19.249 Kernel Configuration
#
#
@@ -2768,7 +2768,6 @@ CONFIG_MISDN_W6692=m
# CONFIG_MISDN_NETJET is not set
CONFIG_MISDN_IPAC=m
CONFIG_MISDN_ISAR=m
-# CONFIG_NVM is not set
#
# Input device support
@@ -3094,6 +3093,7 @@ CONFIG_HW_RANDOM_OMAP=m
# CONFIG_TCG_TPM is not set
CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig
index 8268b16af7fc..6a5079c3fcec 100644
--- a/srcpkgs/linux4.19/files/arm64-dotconfig
+++ b/srcpkgs/linux4.19/files/arm64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.236 Kernel Configuration
+# Linux/arm64 4.19.249 Kernel Configuration
#
#
@@ -3177,7 +3177,6 @@ CONFIG_IEEE802154_HWSIM=m
# CONFIG_NETDEVSIM is not set
CONFIG_NET_FAILOVER=m
# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
#
# Input device support
@@ -3605,6 +3604,7 @@ CONFIG_TCG_ATMEL=m
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/i386-dotconfig b/srcpkgs/linux4.19/files/i386-dotconfig
index 4552d18061c8..ed13503b7af5 100644
--- a/srcpkgs/linux4.19/files/i386-dotconfig
+++ b/srcpkgs/linux4.19/files/i386-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.19.241 Kernel Configuration
+# Linux/i386 4.19.249 Kernel Configuration
#
#
@@ -19,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
CONFIG_HAVE_KERNEL_GZIP=y
@@ -3681,6 +3681,7 @@ CONFIG_DEVPORT=y
CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index b5025b4536cf..915a218b0e95 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.241 Kernel Configuration
+# Linux/powerpc 4.19.249 Kernel Configuration
#
#
@@ -2101,6 +2101,7 @@ CONFIG_MACINTOSH_DRIVERS=y
CONFIG_ADB=y
CONFIG_ADB_CUDA=y
CONFIG_ADB_PMU=y
+CONFIG_ADB_PMU_EVENT=y
CONFIG_ADB_PMU_LED=y
# CONFIG_ADB_PMU_LED_DISK is not set
CONFIG_PMAC_APM_EMU=m
@@ -3290,7 +3291,7 @@ CONFIG_IPWIRELESS=m
# CONFIG_TCG_TPM is not set
CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set
-CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig
index ca44b106df42..87827b692bae 100644
--- a/srcpkgs/linux4.19/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.241 Kernel Configuration
+# Linux/powerpc 4.19.249 Kernel Configuration
#
#
@@ -2484,6 +2484,7 @@ CONFIG_FIREWIRE_NET=m
CONFIG_FIREWIRE_NOSY=m
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_ADB_PMU=y
+CONFIG_ADB_PMU_EVENT=y
CONFIG_ADB_PMU_LED=y
CONFIG_ADB_PMU_LED_DISK=y
CONFIG_PMAC_SMU=y
@@ -3791,6 +3792,7 @@ CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
CONFIG_XILLYBUS_OF=m
# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/ppc64le-dotconfig b/srcpkgs/linux4.19/files/ppc64le-dotconfig
index 0c14831463ab..9f61fbb57682 100644
--- a/srcpkgs/linux4.19/files/ppc64le-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.241 Kernel Configuration
+# Linux/powerpc 4.19.249 Kernel Configuration
#
#
@@ -3634,6 +3634,7 @@ CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
CONFIG_XILLYBUS_OF=m
# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/x86_64-dotconfig b/srcpkgs/linux4.19/files/x86_64-dotconfig
index 0bcdb8d876cb..d488ad4e7ff3 100644
--- a/srcpkgs/linux4.19/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.19/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.19.241 Kernel Configuration
+# Linux/x86_64 4.19.249 Kernel Configuration
#
#
@@ -19,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
CONFIG_HAVE_KERNEL_GZIP=y
@@ -3750,6 +3750,7 @@ CONFIG_DEVPORT=y
CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 56ffecea4c26..29b67f43ea24 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.19'
pkgname=linux4.19
-version=4.19.248
+version=4.19.249
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c40fd171bbe33c996e12303be71773ceaef5e585f372c502a77a046aa6a3ae31
+checksum=ce4bbd420271bb9b6c09842c0d7201c7ba9d136f7025cf0fd7500c95e3f55191
python_version=3
nodebug=yes # -dbg package is generated below manually
From 1d4a41c78d32b3a625d07182f64e3057435958bf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 26 Jun 2022 09:42:16 +0200
Subject: [PATCH 076/609] linux5.4: no longer broken on aarch64*
---
srcpkgs/linux5.4/template | 4 ----
1 file changed, 4 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 538c74794441..cda95ec80d98 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -25,10 +25,6 @@ _kernver="${version}_${revision}"
triggers="kernel-hooks"
kernel_hooks_version="${_kernver}"
-case "$XBPS_TARGET_MACHINE" in
- aarch64*) broken="https://build.voidlinux.org/builders/aarch64_builder/builds/37218/steps/shell_3/logs/stdio";;
-esac
-
# These files could be modified when an external module is built.
mutable_files="
From 8cdd9d2212f7a8b5ad088f9fc59f1a5cecb12506 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Jun 2022 17:18:14 +0200
Subject: [PATCH 077/609] bzip3: update to 1.1.4.
---
srcpkgs/bzip3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bzip3/template b/srcpkgs/bzip3/template
index b7de15d1c2ec..10cd3adcadfe 100644
--- a/srcpkgs/bzip3/template
+++ b/srcpkgs/bzip3/template
@@ -1,6 +1,6 @@
# Template file for 'bzip3'
pkgname=bzip3
-version=1.1.3
+version=1.1.4
revision=1
build_style=gnu-configure
short_desc="Better and stronger spiritual successor to bzip2"
@@ -9,7 +9,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/kspalaiologos/bzip3"
#changelog=""
distfiles="https://github.com/kspalaiologos/bzip3/releases/download/${version}/bzip3-${version}.tar.xz"
-checksum=9ee90e5b07a81e581515a89e263917f1738d8d28dbec05b3ded4524c79977c3c
+checksum=4948c4cd62a995346a03087fc35183d7b9289a9cade491b6bb005d1dd80ab108
bzip3-devel_package() {
short_desc+=" - development files"
From 5a2fb78f454547a3b635d7abab923822bb811bc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Jun 2022 17:19:37 +0200
Subject: [PATCH 078/609] skaffold: update to 1.39.1.
---
srcpkgs/skaffold/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index af2d37f0aeb6..81555a927f40 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
# Template file for 'skaffold'
pkgname=skaffold
-version=1.38.0
+version=1.39.1
revision=1
build_style=go
go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://skaffold.dev/"
changelog="https://github.com/GoogleContainerTools/skaffold/releases"
distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=42f8f8a6f8f55f8031c87de3c3d35334f2e1f71c2a2120d3cc1a15f8ed71ba31
+checksum=f285e554257c914c5ab247a0a1a2e28e66926c6cda8959365869328b2af61c51
From a460a1e370e940bcf950bec0defb90711011d9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 26 Jun 2022 16:21:51 +0200
Subject: [PATCH 079/609] dasel: update to 1.25.0.
---
srcpkgs/dasel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index 1f4e0d9fb800..c6e2e67cce19 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,6 +1,6 @@
# Template file for 'dasel'
pkgname=dasel
-version=1.24.3
+version=1.25.0
revision=1
build_style=go
go_import_path=github.com/tomwright/dasel
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://daseldocs.tomwright.me/"
changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
-checksum=86d497e7dcfe63901ef0aeddb31e3989959d60d785a04f98fc6a88b6f497980a
+checksum=49f7a34b31c87d27ef5c5a32b87a603ac6d7d4d1a52533942676429b747e1f7e
post_install() {
vlicense LICENSE
From 0e0382f56cc2531bbbc26d88cf8d36a977b4155d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 25 Jun 2022 21:43:24 +0700
Subject: [PATCH 080/609] nss: update to 3.80.
---
srcpkgs/nss/patches/native-nsinstall-cflags.patch | 9 ++++-----
srcpkgs/nss/template | 8 +++++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/nss/patches/native-nsinstall-cflags.patch b/srcpkgs/nss/patches/native-nsinstall-cflags.patch
index e2734e700d4d..249d281becf4 100644
--- a/srcpkgs/nss/patches/native-nsinstall-cflags.patch
+++ b/srcpkgs/nss/patches/native-nsinstall-cflags.patch
@@ -1,11 +1,10 @@
---- nss-3.68.orig/nss/coreconf/nsinstall/Makefile
-+++ nss-3.68/nss/coreconf/nsinstall/Makefile
-@@ -32,6 +32,8 @@ endif
+--- nss-3.80.orig/nss/coreconf/nsinstall/Makefile
++++ nss-3.80/nss/coreconf/nsinstall/Makefile
+@@ -32,6 +32,7 @@ endif
ifdef NATIVE_FLAGS
OS_CFLAGS=$(NATIVE_FLAGS)
+XCFLAGS = $(NATIVE_FLAGS)
-+LDFLAGS = $(LDFLAGS_FOR_BUILD)
endif
- include $(DEPTH)/coreconf/rules.mk
+ ifdef NATIVE_LDFLAGS
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 7ea39f1c3182..0d9c200fe637 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
_nsprver=4.34
pkgname=nss
-version=3.79
+version=3.80
revision=1
hostmakedepends="perl which"
makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=ebdf2d6a96613b6fe70ad579e9f983e0e94e0110171cfb2999db633d3394a514
+checksum=c0bf1fd2c7e29a6b02b309622baafc443eec90c8934bb155da4bb98988784b6a
export NS_USE_GCC=1
export LIBRUNPATH=
@@ -60,7 +60,9 @@ do_build() {
export XCFLAGS="${CFLAGS}"
make -C nss ${makejobs} \
${CROSS_BUILD:+CROSS_COMPILE=1} OS_TEST="${_ARCH}" \
- NATIVE_CC="${BUILD_CC}" NATIVE_FLAGS="${BUILD_CFLAGS}" \
+ NATIVE_CC="${CC_FOR_BUILD}" \
+ NATIVE_FLAGS="${CFLAGS_FOR_BUILD}" \
+ NATIVE_LDFLAGS="${LDFLAGS_FOR_BUILD}" \
CCC="$CXX" ${_use64} \
all
}
From cdc077147576818b621fc4fa8d3caec9e8aca9ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Jun 2022 07:54:38 +0700
Subject: [PATCH 081/609] ca-certificates: update to 20211016+3.80.
Close: #37682
---
srcpkgs/ca-certificates/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index eaa70fc7a22b..ca95efa092d7 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,6 +1,6 @@
# Template file for 'ca-certificates'
pkgname=ca-certificates
-version=20211016+3.77
+version=20211016+3.80
revision=1
_nss_version=${version#*+}
bootstrap=yes
@@ -8,7 +8,7 @@ conf_files="/etc/ca-certificates.conf"
create_wrksrc=yes
build_wrksrc="work"
hostmakedepends="openssl"
-depends="openssl<=2.0_1 run-parts"
+depends="openssl run-parts"
short_desc="Common CA certificates for SSL/TLS from Mozilla"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, MPL-2.0"
@@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs"
distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88
- 825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd"
+ c0bf1fd2c7e29a6b02b309622baafc443eec90c8934bb155da4bb98988784b6a"
post_extract() {
cp ${FILESDIR}/* $build_wrksrc/mozilla
From f6952865c65d1b5243601bc6ca877667e9aa83bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
<sigrid@ftrv.se>
Date: Sun, 26 Jun 2022 18:48:22 +0200
Subject: [PATCH 082/609] bindfs: update to 1.16.1, adopt
---
srcpkgs/bindfs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index beb18d37dcc1..e810fd4335a2 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,16 +1,16 @@
# Template file for 'bindfs'
pkgname=bindfs
-version=1.16.0
+version=1.16.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="fuse3-devel"
short_desc="FUSE filesystem for mounting a directory to another location"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>"
license="GPL-2.0-or-later"
homepage="https://bindfs.org"
changelog="https://bindfs.org/docs/ChangeLog.utf8.txt"
distfiles="https://bindfs.org/downloads/bindfs-${version}.tar.gz"
-checksum=02ebefaaa64e1b044fc5c743c5829aad21ed6f7145f4db0723bcc45f085781f6
+checksum=55ea3d2aa8e48d0bea23b7c0b03950cfeb492355bfd8dbb8a173a1e383f228bc
#cannot mount
make_check=no
From 3fa2ca369449ae4071934837c65d735e088e8577 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Wed, 9 Mar 2022 07:56:03 +0700
Subject: [PATCH 083/609] New package: hblock-3.4.0
---
srcpkgs/hblock/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/hblock/template
diff --git a/srcpkgs/hblock/template b/srcpkgs/hblock/template
new file mode 100644
index 000000000000..c067f59f9aba
--- /dev/null
+++ b/srcpkgs/hblock/template
@@ -0,0 +1,18 @@
+# Template file for 'hblock'
+pkgname=hblock
+version=3.4.0
+revision=1
+build_style=gnu-makefile
+depends="curl"
+short_desc="Adblocker that creates a hosts file from multiple sources"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
+license="MIT"
+homepage="https://github.com/hectorm/hblock"
+distfiles="https://github.com/hectorm/${pkgname}/archive/v${version}.tar.gz"
+checksum=762dbe5f2a0ea84078b194190f4fb51b9fe3e6ef043c1899fdda6a083328225f
+
+do_install() {
+ make DESTDIR=$DESTDIR prefix=/usr install
+
+ vlicense LICENSE.md
+}
From 3e6bde43d1a3bab7d090f76c9678f567d01d9576 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 26 Jun 2022 11:32:37 +0400
Subject: [PATCH 084/609] nghttp2: update to 1.48.0.
---
srcpkgs/nghttp2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index fe824a39cd44..146badf0ca36 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,6 +1,6 @@
# Template file for 'nghttp2'
pkgname=nghttp2
-version=1.47.0
+version=1.48.0
revision=1
build_style=gnu-configure
# build system errors out if python isn't available
@@ -14,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
-checksum=68271951324554c34501b85190f22f2221056db69f493afc3bbac8e7be21e7cc
+checksum=47d8f30ee4f1bc621566d10362ca1b3ac83a335c63da7144947c806772d016e4
python_version=3
post_install() {
From c912ef924a7a8a68dd7f5e45274637d540c56a46 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 26 Jun 2022 00:14:49 -0300
Subject: [PATCH 085/609] oil: update to 0.11.0
---
srcpkgs/oil/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 8866e01d7f94..6648b5255576 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
# Template file for 'oil'
pkgname=oil
-version=0.10.0
+version=0.11.0
revision=1
build_style=configure
configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,8 +11,8 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=cf7da9494ba9f0f101d27f0d0b5e248f8a54721ddeec13dd54652c9528580296
-register_shell="/usr/bin/osh"
+checksum=e5e00ae776852c41233efc0a310219968523485680714d2dcec500af63d00208
+register_shell="/usr/bin/osh /usr/bin/oil"
nocross="Build systems gets confused with host and cross toolchains/headers"
nostrip=yes
@@ -27,8 +27,9 @@ pre_build() {
do_install() {
# Install binaries
vbin _bin/oil.ovm
- # Symlink osh, oshc to oil.ovm.
+ vman doc/osh.1
+ # Symlink osh, oil to oil.ovm.
cd "${DESTDIR}"/usr/bin
ln -s oil.ovm osh
- ln -s oil.ovm oshc
+ ln -s oil.ovm oil
}
From 0563edfc4ecae64f4b99354a097384e86ceda607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 26 Mar 2022 17:37:06 +0100
Subject: [PATCH 086/609] New package: prs-0.3.4
---
srcpkgs/prs-gtk3 | 1 +
srcpkgs/prs/template | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 120000 srcpkgs/prs-gtk3
create mode 100644 srcpkgs/prs/template
diff --git a/srcpkgs/prs-gtk3 b/srcpkgs/prs-gtk3
new file mode 120000
index 000000000000..c38bf7a251b6
--- /dev/null
+++ b/srcpkgs/prs-gtk3
@@ -0,0 +1 @@
+prs
\ No newline at end of file
diff --git a/srcpkgs/prs/template b/srcpkgs/prs/template
new file mode 100644
index 000000000000..bdaf183af206
--- /dev/null
+++ b/srcpkgs/prs/template
@@ -0,0 +1,22 @@
+# Template file for 'prs'
+pkgname=prs
+version=0.3.4
+revision=1
+build_style=cargo
+make_install_args="--path ./cli"
+hostmakedepends="pkg-config gnupg git python3"
+makedepends="glib-devel cairo-devel pango-devel atk-devel gdk-pixbuf-devel gtk+3-devel"
+depends="gnupg git"
+short_desc="Pass compatible password manager written in Rust"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-only"
+homepage="https://timvisee.com/projects/prs/"
+distfiles="https://github.com/timvisee/prs/archive/refs/tags/v${version}.tar.gz"
+checksum=a0fb15751263a60c398169aeeb6b92799652f1079875b0ae2e832764070cbddc
+
+prs-gtk3_package() {
+ short_desc="GTK3 frontend for prs"
+ pkg_install() {
+ vbin target/${RUST_TARGET}/release/prs-gtk3-copy prs-gtk3
+ }
+}
From 77d2f98976611d1920cc5e525128c24b35526581 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 14 May 2022 22:49:26 +0200
Subject: [PATCH 087/609] winetricks: update to 20220411
---
srcpkgs/winetricks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template
index 8db89c6a521d..a9cc9c3cd8a9 100644
--- a/srcpkgs/winetricks/template
+++ b/srcpkgs/winetricks/template
@@ -1,6 +1,6 @@
# Template file for 'winetricks'
pkgname=winetricks
-version=20210825
+version=20220411
revision=1
build_style=gnu-makefile
depends="cabextract unzip xmessage" # actually it depends on wine
@@ -9,5 +9,5 @@ maintainer="mater11234 <mater11234@riseup.net>"
license="LGPL-3.0-or-later"
homepage="http://wiki.winehq.org/winetricks"
distfiles="https://github.com/Winetricks/winetricks/archive/$version.tar.gz"
-checksum=bac77918ef4d58c6465a1043fd996d09c3ee2c5a07f56ed089c4c65a71881277
+checksum=c16e09ee4e5fda48a49ae9515a9c6d175713792be1b85ea92624d93e37effbd0
make_check=no # Needs python3-bashate
From 2051594a2b2a70802cbeced2eb7516b6865554bb Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Mon, 23 May 2022 00:30:25 -0500
Subject: [PATCH 088/609] libnfs: Update to 5.0.1
---
common/shlibs | 2 +-
srcpkgs/libnfs/patches/fix-musl.patch | 6 +++---
srcpkgs/libnfs/template | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8231f48d36a3..a7540ef7b2db 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1199,7 +1199,7 @@ librlog.so.5 librlog-1.4_1
libtinyxml.so.0 tinyxml-2.6.2_1
libtinyxml2.so.9 tinyxml2-9.0.0_1
libbluray.so.2 libbluray-1.0.0_1
-libnfs.so.13 libnfs-4.0.0_1
+libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
diff --git a/srcpkgs/libnfs/patches/fix-musl.patch b/srcpkgs/libnfs/patches/fix-musl.patch
index 18a3657c649c..6d599b49e431 100644
--- a/srcpkgs/libnfs/patches/fix-musl.patch
+++ b/srcpkgs/libnfs/patches/fix-musl.patch
@@ -1,10 +1,10 @@
--- a/include/nfsc/libnfs.h
+++ b/include/nfsc/libnfs.h
-@@ -24,6 +24,7 @@
- #define _LIBNFS_H_
+@@ -28,6 +28,7 @@
+ #endif
#include <stdint.h>
+#include <sys/time.h>
- #if defined(__ANDROID__) || defined(AROS) \
+ #if defined(__ANDROID__) || defined(AROS) || defined(__PPU__) \
|| ( defined(__APPLE__) && defined(__MACH__) )
#include <sys/time.h>
diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template
index f1e27dd15f57..1946fdceb307 100644
--- a/srcpkgs/libnfs/template
+++ b/srcpkgs/libnfs/template
@@ -1,6 +1,6 @@
# Template file for 'libnfs'
pkgname=libnfs
-version=4.0.0
+version=5.0.1
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/sahlberg/libnfs"
distfiles="https://github.com/sahlberg/libnfs/archive/${pkgname}-${version}.tar.gz"
-checksum=6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d
+checksum=7ef445410b42f36b9bad426608b53ccb9ccca4101e545c383f564c11db672ca8
pre_configure() {
autoreconf -fi
From a04c4c79d17e969bc8e3da1238f3218d2a2ee22d Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Sat, 25 Jun 2022 17:36:30 -0500
Subject: [PATCH 089/609] mpd: rebuild for libnfs-5.0.1
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 7249957f2113..bf6aa8c73770 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.7
-revision=2
+revision=3
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From b95d033e9ad5b77c8569f3cc7ee2d68e0a05ec8c Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Sat, 25 Jun 2022 17:36:51 -0500
Subject: [PATCH 090/609] kodi: rebuild for libnfs-5.0.1
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index b4eeacdab624..d3e9a13afdd5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=2
+revision=3
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From 96f4e4c33e8346044a24e991efa92fef956bdffd Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Sat, 25 Jun 2022 17:37:21 -0500
Subject: [PATCH 091/609] gvfs: rebuild for libnfs-5.0.1
---
srcpkgs/gvfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 71be065310ef..6adb51e279bd 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
# Template file for 'gvfs'
pkgname=gvfs
version=1.48.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
-Dman=true"
From 6eb31b857e70ff06ef1d2327c9c97ccee8645faa Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Sat, 25 Jun 2022 17:37:40 -0500
Subject: [PATCH 092/609] qemu: rebuild for libnfs-5.0.1
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 17655fdbdda8..042ba79299e1 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=6.2.0
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From c185cd9d90989e3083c2c69b3b5bbe51242fa341 Mon Sep 17 00:00:00 2001
From: wael <40663@proton.me>
Date: Sat, 25 Jun 2022 06:02:34 +0300
Subject: [PATCH 093/609] New package: ps_mem-3.14
---
srcpkgs/ps_mem/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/ps_mem/template
diff --git a/srcpkgs/ps_mem/template b/srcpkgs/ps_mem/template
new file mode 100644
index 000000000000..8766b8338f3c
--- /dev/null
+++ b/srcpkgs/ps_mem/template
@@ -0,0 +1,12 @@
+# Template file for 'ps_mem'
+pkgname=ps_mem
+version=3.14
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Utility to accurately report the core memory usage for a program"
+maintainer="wael <40663@proton.me>"
+license="LGPL-2.1-only"
+homepage="https://github.com/pixelb/ps_mem"
+distfiles="https://github.com/pixelb/ps_mem/archive/refs/tags/v${version}.tar.gz"
+checksum=ad8bf87f9b9acd9b0b4997445bd99a8eeace4d816b207d56b03c5a83fec00514
From dca11ce27f71d0d44b21ea3d085750fb203b55de Mon Sep 17 00:00:00 2001
From: xolophreny <xolophreny@protonmail.ch>
Date: Sun, 27 Feb 2022 20:34:20 +0500
Subject: [PATCH 094/609] vkBasalt: update to 0.3.2.5
---
srcpkgs/vkBasalt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vkBasalt/template b/srcpkgs/vkBasalt/template
index b7f93dd8803e..d00eb3d4a376 100644
--- a/srcpkgs/vkBasalt/template
+++ b/srcpkgs/vkBasalt/template
@@ -1,6 +1,6 @@
# Template file for 'vkBasalt'
pkgname=vkBasalt
-version=0.3.2.4
+version=0.3.2.5
revision=1
build_style=meson
hostmakedepends="glslang pkg-config"
@@ -10,4 +10,4 @@ maintainer="xolophreny <xolophreny@protonmail.ch>"
license="Zlib"
homepage="https://github.com/DadSchoorse/vkBasalt"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f45d513d9f212e9a1e1ec49448e72c5f2510d62303c38fdb5015b9a3afd42b26
+checksum=837cf63737302de7ab9c4a190a1ed3b8a1174630d3753f7a8478b140294b3b39
From 1519808d45a9b06d2e182aac827ca4fe15be99c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 27 Apr 2022 22:10:40 +0200
Subject: [PATCH 095/609] tectonic: update to 0.9.0.
---
srcpkgs/tectonic/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 920576d17e60..19c18335fb2a 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
# Template file for 'tectonic'
pkgname=tectonic
-version=0.8.2
-revision=2
+version=0.9.0
+revision=1
wrksrc="tectonic-tectonic-${version}"
build_style=cargo
configure_args="--features=external-harfbuzz"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://tectonic-typesetting.github.io"
changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/release/CHANGELOG.md"
distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=1f92a5ff25725a9a4c0eefd4ea306da1e63f57c40d4ceb0972c7e5bb73297b4f
+checksum=a239ca85bff1955792b2842fabfa201ba9576d916ece281278781f42c7547b9f
post_install() {
vlicense LICENSE
From 2f2562f44eb5581bcd53d5f53d49c81536fdc51c Mon Sep 17 00:00:00 2001
From: bitofhope <bitofhope@kapsi.fi>
Date: Sun, 26 Jun 2022 20:58:03 +0300
Subject: [PATCH 096/609] man-db: update to 2.10.2.
---
.../add-missing-stdlib_h-include.patch | 10 ---
.../patches/guard-glibc-iconv-ext.patch | 63 ++++++++++---------
srcpkgs/man-db/template | 8 +--
3 files changed, 36 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch
diff --git a/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch b/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch
deleted file mode 100644
index 8687d550b0bb..000000000000
--- a/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libdb/db_btree.c
-+++ b/libdb/db_btree.c
-@@ -29,6 +29,7 @@
- #ifdef BTREE
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-
diff --git a/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch b/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch
index 8e47da8a2192..d8857cfd6b85 100644
--- a/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch
+++ b/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch
@@ -1,19 +1,38 @@
+ src/convert.c | 4 ++++
src/manconv.c | 7 ++++++-
src/manconv_client.c | 4 ++++
- src/whatis.c | 4 ++++
3 files changed, 14 insertions(+), 1 deletion(-)
-diff --git src/manconv.c src/manconv.c
-index b9ac8d3a..8f5bdaee 100644
+diff --git a/src/convert.c b/src/convert.c
+index 447240c6..231f5c14 100644
+--- a/src/convert.c
++++ b/src/convert.c
+@@ -55,10 +55,14 @@ static void close_conv_to_locale (void *ignored MAYBE_UNUSED)
+ char * ATTRIBUTE_MALLOC convert_to_locale (char *string)
+ {
+ if (!conv_to_locale_initialized) {
++#ifdef __GLIBC__
+ char *locale_charset = xasprintf
+ ("%s//IGNORE", get_locale_charset ());
+ conv_to_locale = iconv_open (locale_charset, "UTF-8");
+ free (locale_charset);
++#else /* __GLIBC__ */
++ conv_to_locale = iconv_open (get_locale_charset (), "UTF-8");
++#endif /* ! __GLIBC__ */
+ if (conv_to_locale != (iconv_t) -1)
+ push_cleanup (close_conv_to_locale, NULL, 0);
+ conv_to_locale_initialized = true;
+diff --git a/src/manconv.c b/src/manconv.c
+index 18ae307a..e2e6aa33 100644
--- a/src/manconv.c
+++ b/src/manconv.c
-@@ -111,9 +111,14 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to,
+@@ -301,9 +301,14 @@ static tried_iconv try_iconv (decompress *decomp, const char *try_from_code,
iconv_t cd_utf8, cd = NULL;
bool to_utf8 = STREQ (try_to_code, "UTF-8") ||
STRNEQ (try_to_code, "UTF-8//", 7);
- const char *utf8_target = last ? "UTF-8//IGNORE" : "UTF-8";
bool ignore_errors = (strstr (try_to_code, "//IGNORE") != NULL);
- int ret = 0;
+ tried_iconv ret = TRIED_ICONV_OK;
+#ifdef __GLIBC__
+ const char *utf8_target = last ? "UTF-8//IGNORE" : "UTF-8";
+#else /* __GLIBC__ */
@@ -23,37 +42,19 @@ index b9ac8d3a..8f5bdaee 100644
debug ("trying encoding %s -> %s\n", try_from_code, try_to_code);
-diff --git src/manconv_client.c src/manconv_client.c
-index 0c41bec6..2a7f1398 100644
+diff --git a/src/manconv_client.c b/src/manconv_client.c
+index 55289ff4..6e7861f5 100644
--- a/src/manconv_client.c
+++ b/src/manconv_client.c
-@@ -102,7 +102,11 @@ void add_manconv (pipeline *p, const char *source, const char *target)
- gl_list_add_last (codes->from, xstrdup (source));
- name = appendstr (name, "UTF-8:", source, (void *) 0);
+@@ -111,7 +111,11 @@ void add_manconv (pipeline *p,
+ gl_list_add_last (codes->from, xstrdup (source_encoding));
+ name = appendstr (name, "UTF-8:", source_encoding, (void *) 0);
}
-+#ifdef __GLIBC__
- codes->to = xasprintf ("%s//IGNORE", target);
++#ifdef __GBLIBC__
+ codes->to = xasprintf ("%s//IGNORE", target_encoding);
+#else /* __GLIBC__ */
-+ codes->to = xasprintf ("%s", target);
++ codes->to = xasprintf ("%s", target_encoding);
+#endif /* ! __GLIBC__ */
/* informational only; no shell quoting concerns */
name = appendstr (name, " -t ", codes->to, (void *) 0);
if (quiet >= 2)
-diff --git src/whatis.c src/whatis.c
-index d2559169..ec80c117 100644
---- a/src/whatis.c
-+++ b/src/whatis.c
-@@ -945,9 +945,13 @@ int main (int argc, char *argv[])
- display_seen = new_string_set (GL_HASH_SET);
-
- #ifdef HAVE_ICONV
-+#ifdef __GLIBC__
- locale_charset = xasprintf ("%s//IGNORE", get_locale_charset ());
- conv_to_locale = iconv_open (locale_charset, "UTF-8");
- free (locale_charset);
-+#else /* __GLIBC__ */
-+ conv_to_locale = iconv_open(get_locale_charset (), "UTF-8");
-+#endif /* ! __GLIBC__ */
- #endif /* HAVE_ICONV */
-
- if (regex_opt) {
diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index c8b873771d27..3d60f4e91878 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,6 +1,6 @@
# Template file for 'man-db'
pkgname=man-db
-version=2.9.4
+version=2.10.2
revision=1
build_style=gnu-configure
configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
@@ -16,11 +16,11 @@ depends="bzip2 coreutils grep groff gzip less"
conf_files="/etc/man_db.conf"
short_desc="On-line manual database"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
+license="GPL-3.0-or-later"
homepage="https://www.nongnu.org/man-db/"
-changelog="https://git.savannah.gnu.org/cgit/man-db.git/plain/NEWS"
+changelog="https://gitlab.com/cjwatson/man-db/-/raw/main/NEWS.md"
distfiles="${NONGNU_SITE}/man-db/man-db-${version}.tar.xz"
-checksum=b66c99edfad16ad928c889f87cf76380263c1609323c280b3a9e6963fdb16756
+checksum=ee97954d492a13731903c9d0727b9b01e5089edbd695f0cdb58d405a5af5514d
provides="man-0_1"
lib32disabled=yes
system_accounts="_man"
From 7fd5fe7cc5c4fd1db8e354f0f2472ca090487bfd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 26 Jun 2022 23:45:26 +0200
Subject: [PATCH 097/609] diffutils: update to 3.8.
---
srcpkgs/diffutils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template
index 80186106e7d9..b5954a0db2ce 100644
--- a/srcpkgs/diffutils/template
+++ b/srcpkgs/diffutils/template
@@ -1,6 +1,6 @@
# Template file for 'diffutils'
pkgname=diffutils
-version=3.7
+version=3.8
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/diffutils"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26
+checksum=a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec
if [ "$XBPS_TARGET_LIBC" = musl ]; then
export ac_cv_lib_error_at_line=no
From e82002cc5b72c0f7a398d00714b14c273de4c100 Mon Sep 17 00:00:00 2001
From: jgart <47760695+jgarte@users.noreply.github.com>
Date: Thu, 17 Feb 2022 01:12:29 -0500
Subject: [PATCH 098/609] roswell: Reword short description.
---
srcpkgs/roswell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/roswell/template b/srcpkgs/roswell/template
index c656f94fb1cc..03f45af726ad 100644
--- a/srcpkgs/roswell/template
+++ b/srcpkgs/roswell/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="automake libcurl"
makedepends="libcurl-devel"
-short_desc="Lisp installer and launcher for major environment that just works"
+short_desc="Installer and launcher for a major lisp environment that just works"
maintainer="Liam Howley <liam.howley@hotmail.com>"
license="MIT"
homepage="https://github.com/roswell/roswell"
From ca8525cb132c3862795b4863a50d74dd5cf36929 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sat, 16 Apr 2022 07:56:48 -0400
Subject: [PATCH 099/609] New package: gst-rtsp-server-1.20.1
Closes: #36722 [via git-merge-pr]
---
srcpkgs/gst-rtsp-server/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/gst-rtsp-server/template
diff --git a/srcpkgs/gst-rtsp-server/template b/srcpkgs/gst-rtsp-server/template
new file mode 100644
index 000000000000..7fc2d57201f5
--- /dev/null
+++ b/srcpkgs/gst-rtsp-server/template
@@ -0,0 +1,14 @@
+# Template file for 'gst-rtsp-server'
+pkgname=gst-rtsp-server
+version=1.20.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gst-plugins-bad1-devel gobject-introspection
+ libcgroup-devel ffmpeg-devel gst-plugins-good1 python3-gobject-devel"
+short_desc="GStreamer multimedia graph framework - rtsp server"
+maintainer="1is7ac3 <isaac.qa13@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gstreamer.freedesktop.org"
+distfiles="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${version}.tar.xz"
+checksum=4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509
From 35e83bd657443850fc86c518c7dff58b22ca1d87 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 May 2022 22:28:10 +0300
Subject: [PATCH 100/609] sudo: update to 1.9.10.
---
srcpkgs/sudo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 659e78a013ca..46a20f757d5f 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
# Template file for 'sudo'
pkgname=sudo
-version=1.9.8p2
+version=1.9.10
revision=1
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://www.sudo.ws/"
changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=9e3b8b8da7def43b6e60c257abe80467205670fd0f7c081de1423c414b680f2d
+checksum=44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4
conf_files="/etc/pam.d/sudo /etc/sudoers"
lib32disabled=yes
@@ -33,7 +33,7 @@ pre_install() {
post_install() {
vinstall ${FILESDIR}/sudo.pam 644 etc/pam.d sudo
- vlicense doc/LICENSE
+ vlicense LICENSE.md
# remove unused stuff.
rm -rf ${DESTDIR}/usr/share/doc
rm -rf ${DESTDIR}/usr/include
From 03d834a1ccdd89327b97558dcf134eb5a664687b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 06:00:47 +1100
Subject: [PATCH 101/609] binwalk: fix checks
---
srcpkgs/binwalk/patches/fix-2.3.3-test.patch | 14 ++++++++++++++
srcpkgs/binwalk/template | 9 +++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/binwalk/patches/fix-2.3.3-test.patch
diff --git a/srcpkgs/binwalk/patches/fix-2.3.3-test.patch b/srcpkgs/binwalk/patches/fix-2.3.3-test.patch
new file mode 100644
index 000000000000..bce5ed7c8f39
--- /dev/null
+++ b/srcpkgs/binwalk/patches/fix-2.3.3-test.patch
@@ -0,0 +1,14 @@
+https://github.com/ReFirmLabs/binwalk/issues/566
+https://github.com/ReFirmLabs/binwalk/issues/569
+
+--- a/testing/tests/test_firmware_zip.py
++++ b/testing/tests/test_firmware_zip.py
+@@ -10,6 +10,8 @@
+ '''
+ expected_results = [
+ [0, 'Zip archive data, at least v1.0 to extract, name: dir655_revB_FW_203NA/'],
++ [51, 'Zip archive data, at least v2.0 to extract, compressed size: 6395868, uncompressed size: 6422554, name: dir655_revB_FW_203NA/DIR655B1_FW203NAB02.bin'],
++ [6395993, 'Zip archive data, at least v2.0 to extract, compressed size: 14243, uncompressed size: 61440, name: dir655_revB_FW_203NA/dir655_revB_release_notes_203NA.doc'],
+ [6410581, 'End of Zip archive, footer length: 22'],
+
+ ]
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index 739c0c2ccc44..f3838109bfb2 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -3,10 +3,9 @@ pkgname=binwalk
version=2.3.3
revision=1
build_style=python3-module
-pycompile_module="binwalk"
hostmakedepends="python3"
depends="python3"
-checkdepends="python3-coverage python3-nose"
+checkdepends="python3-coverage python3-nose tar"
short_desc="Easy tool for analyzing/reversing/extracting firmware images"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
@@ -16,6 +15,12 @@ checksum=7e32b94dc77632b51d18732b5456e2a3ef85e4521d7d4a54410e36f93859501f
post_extract() {
vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py
+
+ if [ $(id -u) -eq 0 ]; then
+ # CI container has different privileges than expected in tests.
+ # Append " **{'run-as' : 'root'}," to "binwalk.scan(input_vector_file,".
+ vsed -i -e "/binwalk.scan(input_vector_file,/ s/$/ **{'run-as' : 'root'},/" testing/tests/test_*.py
+ fi
}
do_check() {
From b6b48672059125536995e730372c8a032919059d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 26 Jun 2022 20:10:39 -0400
Subject: [PATCH 102/609] supercat: update to 0.5.8
---
srcpkgs/supercat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/supercat/template b/srcpkgs/supercat/template
index b323db335498..a155c840a076 100644
--- a/srcpkgs/supercat/template
+++ b/srcpkgs/supercat/template
@@ -1,6 +1,6 @@
# Template file for 'supercat'
pkgname=supercat
-version=0.5.7
+version=0.5.8
revision=1
build_style=gnu-configure
short_desc="Colorizes text based on matching regular expressions/strings/characters"
@@ -8,4 +8,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://supercat.nosredna.net"
distfiles="http://supercat.nosredna.net/supercat-${version}.tar.gz"
-checksum=ecc0f34117733bdac617e0ad6623622c68ef791059899750bd1d90012a058a50
+checksum=3c017bb42d9d599302a78953abfabdd4d4d91e371292507cd44020f0c8cb6b2a
From 8ac6e992c753da1b795012bf0767477e87ee0469 Mon Sep 17 00:00:00 2001
From: Yuriy Chumak <yuriy.chumak@mail.com>
Date: Mon, 13 Jun 2022 19:09:03 +0300
Subject: [PATCH 103/609] ol: update to 2.3.5.
---
srcpkgs/ol/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ol/template b/srcpkgs/ol/template
index e3c29a71f176..40317b4324c7 100644
--- a/srcpkgs/ol/template
+++ b/srcpkgs/ol/template
@@ -1,6 +1,6 @@
# Template file for 'ol'
pkgname=ol
-version=2.3
+version=2.3.5
revision=1
build_style=gnu-makefile
hostmakedepends="xxd"
@@ -8,8 +8,9 @@ short_desc="Purely functional dialect of Lisp"
maintainer="rc-05 <rc23@email.it>"
license="LGPL-3.0-or-later, MIT"
homepage="https://yuriy-chumak.github.io/ol/"
+changelog="https://raw.githubusercontent.com/yuriy-chumak/ol/master/doc/CHANGELOG.md"
distfiles="https://github.com/yuriy-chumak/ol/archive/${version}.tar.gz"
-checksum=99b43cb7c510b2f9345fc2ff976540689131c563a883d1bd0699124466e155a8
+checksum=1f3da2d3b2e47f5c626bfe2727b649db3fd8f53e700dad2a984314275ee7a6ff
CFLAGS="-lm"
From 3cc3fc798ff212ad18f6c88ea6af722a3bf016d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 27 Jun 2022 10:37:20 -0400
Subject: [PATCH 104/609] python3-prompt_toolkit: update to 3.0.30.
---
srcpkgs/python3-prompt_toolkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 27fdeb83dab2..663bb18d5a93 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
# Template file for 'python3-prompt_toolkit'
pkgname=python3-prompt_toolkit
-version=3.0.29
+version=3.0.30
revision=1
wrksrc="prompt_toolkit-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7
+checksum=859b283c50bde45f5f97829f77a4674d1c1fcd88539364f1b28a37805cfd89c0
conflicts="python3-prompt_toolkit2<=2.0.9_4"
post_install() {
From 23fc55bf23a9390f025a9a5dcc436b6a18c32153 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 27 Jun 2022 10:37:45 -0400
Subject: [PATCH 105/609] python3-pytools: update to 2022.1.12.
---
srcpkgs/python3-pytools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 4dad3d984738..5c2ed5c5e1f8 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytools'
pkgname=python3-pytools
-version=2022.1.11
+version=2022.1.12
revision=1
wrksrc=${pkgname#*-}-${version}
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="X11"
homepage="https://pypi.org/project/pytools"
distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=810173d62d5d6c391b137a6666be4a1616eae05df24d5ddbc0eada684a0180a2
+checksum=4d62875e9a2ab2a24e393a9a8b799492f1a721bffa840af3807bfd42871dd1f4
post_install() {
vlicense LICENSE
From 01f619f92d802fe55e25b4254e0fcee03abc9459 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 27 Jun 2022 13:33:07 -0400
Subject: [PATCH 106/609] subfinder: update to 2.5.2
---
srcpkgs/subfinder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index 9c5ac3e7269e..859b723b57e5 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,6 +1,6 @@
# Template file for 'subfinder'
pkgname=subfinder
-version=2.4.9
+version=2.5.2
revision=1
build_wrksrc=v2
build_style=go
@@ -11,7 +11,7 @@ maintainer="w. fnintr <wfnintr@null.net>"
license="MIT"
homepage="https://github.com/projectdiscovery/subfinder"
distfiles="https://github.com/projectdiscovery/subfinder/archive/refs/tags/v${version}.tar.gz"
-checksum=0163626e69aa4ea4642633ab447ca2afcf2e06f7aec16c2aa95ec5ce301250cf
+checksum=3f99323effbbc0d8f1d5181ac4cc1c5bd31b50a1eb792866269ec44acf308f1d
post_install() {
vlicense ../LICENSE.md
From 0dbefd1d9acb8d2b478728018809c1ce10e90578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 27 Jun 2022 15:25:01 +0200
Subject: [PATCH 107/609] dunst: update to 1.9.0.
---
srcpkgs/dunst/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index 686ed171ff8c..789219ee6ca7 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,6 +1,6 @@
# Template file for 'dunst'
pkgname=dunst
-version=1.8.1
+version=1.9.0
revision=1
build_style=gnu-makefile
make_check_target=test
@@ -18,7 +18,7 @@ license="BSD-3-Clause"
homepage="https://dunst-project.org"
changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=90325a4004626ce516ac7b5b0ed1aaab11c5315385d31f781d6f26064601c3a1
+checksum=b7b8d7d6560bb241b1e4d37eba770cdf19b9d5dbfc1d4d47572ad676f3f7c98a
build_options="wayland"
build_options_default="wayland"
From 9777f398af3e8fb898cd633a0d365c3b73ec035b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 27 Jun 2022 17:15:19 +0300
Subject: [PATCH 108/609] sudo: update to 1.9.11p3.
---
srcpkgs/sudo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 46a20f757d5f..b28ced997ea8 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
# Template file for 'sudo'
pkgname=sudo
-version=1.9.10
+version=1.9.11p3
revision=1
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://www.sudo.ws/"
changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4
+checksum=4687e7d2f56721708f59cca2e1352c056cb23de526c22725615a42bb094f1f70
conf_files="/etc/pam.d/sudo /etc/sudoers"
lib32disabled=yes
From 91d76e5d6b10eb59eb0c3bddb2ad6dda12aed7b7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 27 Jun 2022 16:14:46 -0400
Subject: [PATCH 109/609] starship: update to 1.9.1
---
srcpkgs/starship/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index f4cffc0cfb8d..ec4691a96956 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,6 +1,6 @@
# Template file for 'starship'
pkgname=starship
-version=1.8.0
+version=1.9.1
revision=1
build_style=cargo
build_helper=qemu
@@ -13,7 +13,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
license="ISC"
homepage="https://starship.rs"
distfiles="https://github.com/starship/starship/archive/refs/tags/v${version}.tar.gz"
-checksum=398bf5b413ce5dfe4d3c5acceb0025f773478f28016609869821cf385448dcf5
+checksum=2b54bee07bf67504a1bb170d37dc8d6accab4594d35731bbdf0e8a631c8d1585
post_build() {
STARSHIP="target/${RUST_TARGET}/release/starship"
From 1abe0aac06a923012f802c989fed65cc7586f917 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 27 Jun 2022 11:25:26 -0400
Subject: [PATCH 110/609] miniserve: update to 0.20.0
---
srcpkgs/miniserve/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index fcf8884708bf..d1ddc81a1c80 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -1,6 +1,6 @@
# Template file for 'miniserve'
pkgname=miniserve
-version=0.19.5
+version=0.20.0
revision=1
build_style=cargo
checkdepends="curl"
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/svenstaro/miniserve"
changelog="https://raw.githubusercontent.com/svenstaro/miniserve/master/CHANGELOG.md"
distfiles="https://github.com/svenstaro/miniserve/archive/v${version}.tar.gz"
-checksum=6c758467bd546327505717ecab1a0f78a07226509dd5de098112065221882474
+checksum=77aca0e3660564cc2b9a7f318c5d9065d471f3c5ab0a7d1b6850a5cb6e21904f
make_check=ci-skip # port binding succeeds locally but fails in CI
case "$XBPS_TARGET_MACHINE" in
From 6f9a99444d54489e0562ed06596007c9f67944ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 27 Jun 2022 09:59:34 +0200
Subject: [PATCH 111/609] newsboat: update to 2.28.
---
srcpkgs/newsboat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 09f30180a19c..371b6dcc9a7a 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,6 +1,6 @@
# Template file for 'newsboat'
pkgname=newsboat
-version=2.27
+version=2.28
revision=1
build_style=configure
build_helper="rust"
@@ -17,7 +17,7 @@ license="MIT"
homepage="https://newsboat.org/"
changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=fd5a40096689d4fc0f18441319197769fa377709821b1a3f1b2ba1f006625285
+checksum=2508713ac850f1f2ae156e4b42cbc75a1c9e399d804e007b5773019115d3b0ec
# tests fail when run by superuser
# they always fail on musl, see https://github.com/newsboat/newsboat/issues/1216
From d249e67de2b307b558a27fcfdde7fb297d2ef8f7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 27 Jun 2022 17:44:54 +0300
Subject: [PATCH 112/609] mupdf: update to 1.20.0.
---
srcpkgs/mupdf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 93286959c402..c7814cf7f53c 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,6 +1,6 @@
# Template file for 'mupdf'
pkgname=mupdf
-version=1.19.1
+version=1.20.0
revision=1
wrksrc="${pkgname}-${version}-source"
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
@@ -14,8 +14,8 @@ short_desc="Lightweight PDF and XPS viewer"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="AGPL-3.0-only"
homepage="https://mupdf.com"
-distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.xz"
-checksum=b5eac663fe74f33c430eda342f655cf41fa73d71610f0884768a856a82e3803e
+distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.lz"
+checksum=68dbb1cf5e31603380ce3f1c7f6c431ad442fa735d048700f50ab4de4c3b0f82
pre_build() {
# libmupdf-{threads,pkcs7}.a are required by fbpdf
From b78e92f82f78f90f607553dacb6edec465747561 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 26 Jun 2022 22:55:45 -0400
Subject: [PATCH 113/609] NetworkManager: update to 1.38.2
---
srcpkgs/NetworkManager/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d3ba80c81650..f95ac17414ba 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.0
+version=1.38.2
revision=1
build_style=meson
build_helper="gir qemu"
@@ -33,9 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
-changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=82a4cf07ddfeb0816787b67c0f5058ae6c50d6259c0b0541a24e35156062b2ef
+checksum=9cffd2adc68651316df2d2f8a09e1717bb1d0c2ea389cfc721a0109db9b35826
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
From 431abfbb49f3ee4cac40377efeb0008962dd163f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 26 Jun 2022 22:48:46 -0400
Subject: [PATCH 114/609] zoxide: update to 0.8.2
---
srcpkgs/zoxide/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index f5dca73b732d..9391834fc8cc 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
# Template file for 'zoxide'
pkgname=zoxide
-version=0.8.1
+version=0.8.2
revision=1
build_style=cargo
short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/ajeetdsouza/zoxide"
changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=55f4bf374421f842f5541d95db14d7a63f5d24e269613fb95f769f00cdb9ffc3
+checksum=3a977960284bc06f3c7f02ec93b6f269fd9f5bf933115828e6f46cf6c2601f5e
post_install() {
vlicense LICENSE
From 8ee89ec09f778c2d5d46b1cb29e7e5d96481f081 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 27 Jun 2022 22:40:26 +0200
Subject: [PATCH 115/609] python-b2sdk: update to 1.17.2.
---
srcpkgs/python-b2sdk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index bdc6d758e732..ed5e4a57f998 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,7 +1,7 @@
# Template file for 'python-b2sdk'
# keep python-b2sdk name to revert this package
pkgname=python-b2sdk
-version=1.16.0
+version=1.17.2
revision=1
wrksrc="b2sdk-${version}"
build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://pypi.org/project/b2sdk"
distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=cbffff1163bb8e7cc920c76b29f5e889369d7f5ef1b7b53c89fd5bb79f5ea9c5
+checksum=c20a9e9951da17c65d2b0aa3b9551404d4e8a6e76dedab02816704fd406edcb9
post_install() {
vlicense LICENSE
From efa725c769a24c3c132ff70c2e3d31ceae36559b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 27 Jun 2022 23:26:57 +0200
Subject: [PATCH 116/609] terragrunt: update to 0.38.1.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index ce0ca8b85f6a..6e18fd4d8be3 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.37.1
+version=0.38.1
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c8bfad7cea4a165af474cff2f7386f91ee0d571a12cd897569b9641f2bbd0e93
+checksum=7c8b187a5a516e3e90467960c161c7ef20b105ac9c391ddde27b0cbf98b0ea4c
post_install() {
vlicense LICENSE.txt
From 5aca2dc2e732c268f9c68dee6736b4483d362cfc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 27 Jun 2022 21:02:09 -0400
Subject: [PATCH 117/609] wsjtx: add changelog, fix update detection
---
srcpkgs/wsjtx/template | 1 +
srcpkgs/wsjtx/update | 3 +++
2 files changed, 4 insertions(+)
create mode 100644 srcpkgs/wsjtx/update
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index b798d0a21208..c1838dd7cf51 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -14,6 +14,7 @@ short_desc="Weak-signal Amateur Radio communication program"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+changelog="https://physics.princeton.edu/pulsar/K1JT/Release_Notes.txt"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
diff --git a/srcpkgs/wsjtx/update b/srcpkgs/wsjtx/update
new file mode 100644
index 000000000000..b5cc9bd4f17d
--- /dev/null
+++ b/srcpkgs/wsjtx/update
@@ -0,0 +1,3 @@
+site='https://physics.princeton.edu/pulsar/K1JT/Release_Notes.txt'
+pattern='Release: WSJT-X \K[\d\w.-]+(?=)'
+ignore='*-rc*'
From 2f577c3214eb7b1d6e8139781c325fd308a81705 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 27 Jun 2022 16:53:25 +0200
Subject: [PATCH 118/609] minify: update to 2.11.11.
---
srcpkgs/minify/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 668b65eb92c8..26e335a515c7 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
# Template file for 'minify'
pkgname=minify
-version=2.11.10
+version=2.11.11
revision=1
build_style=go
go_import_path="github.com/tdewolff/minify/v2"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/tdewolff/minify"
distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=ace21c2009e094c3e985865f52b51e6f20d2b257c3a1335a9d7f3e48b38f6530
+checksum=13b3d9973a4fc1ead30dd24addb89a522bce174e1bced7a418067eb6a6fce0cf
post_install() {
vlicense LICENSE
From 644b8d0e4f3fefd567d82b8f7ff275621976f594 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:21:28 +0200
Subject: [PATCH 119/609] jpm: update to 1.1.0.
---
srcpkgs/jpm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/jpm/template b/srcpkgs/jpm/template
index ff847ba872e1..9aa12fe85471 100644
--- a/srcpkgs/jpm/template
+++ b/srcpkgs/jpm/template
@@ -1,7 +1,7 @@
# Template file for 'jpm'
pkgname=jpm
-version=1.0.0
-revision=2
+version=1.1.0
+revision=1
hostmakedepends="janet"
depends="janet janet-devel"
short_desc="Janet Project Manager"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/janet-lang/jpm"
distfiles="https://github.com/janet-lang/jpm/archive/refs/tags/v${version}.tar.gz"
-checksum=858d4ef2f6ac78222c53154dd91f8fb5994e3c3cbe253c9b0d3b9d52557eeb9b
+checksum=337c40d9b8c087b920202287b375c2962447218e8e127ce3a5a12e6e47ac6f16
do_install() {
PREFIX=/usr DESTDIR=$DESTDIR janet bootstrap.janet
From a267717b0c57272403f18ab6487c3a90e9b04b01 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:22:20 +0200
Subject: [PATCH 120/609] ocaml-camlp-streams: update to 5.0.1.
---
srcpkgs/ocaml-camlp-streams/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
index ce728427d280..edccf5495260 100644
--- a/srcpkgs/ocaml-camlp-streams/template
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -1,6 +1,6 @@
# Template file for 'ocaml-camlp-streams'
pkgname=ocaml-camlp-streams
-version=5.0
+version=5.0.1
revision=1
wrksrc="camlp-streams-${version}"
makedepends="ocaml dune"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
homepage="https://github.com/ocaml/camlp-streams"
distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
-checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+checksum=ad71f62406e9bb4e7fb5d4593ede2af6c68f8b0d96f25574446e142c3eb0d9a4
nocross=yes
disable_parallel_build=yes
From de0640567e198b6944559288184c15a0c5f63f9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:23:30 +0200
Subject: [PATCH 121/609] wireguard-dkms: update to 1.0.20220627.
---
srcpkgs/wireguard-dkms/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wireguard-dkms/template b/srcpkgs/wireguard-dkms/template
index ed6aa026e171..84f0befaac15 100644
--- a/srcpkgs/wireguard-dkms/template
+++ b/srcpkgs/wireguard-dkms/template
@@ -1,6 +1,6 @@
# Template file for 'wireguard-dkms'
pkgname=wireguard-dkms
-version=1.0.20211208
+version=1.0.20220627
revision=1
wrksrc="wireguard-linux-compat-${version}"
build_wrksrc="src"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.wireguard.com/"
distfiles="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"
-checksum=c0e607138a17daac656f508d8e63ea3737b5221fa5d9288191ddeb099f5a3b92
+checksum=362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
dkms_modules="wireguard ${version}"
From 5833072316c3cf4796deb4b7a7c7056b5ab69d78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:31:11 +0200
Subject: [PATCH 122/609] python: update to 2.7.18.5.
---
srcpkgs/python/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 3cbe4673172c..bae1327ad821 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
#
pkgname=python
-version=2.7.18.4
+version=2.7.18.5
revision=1
wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Python-2.0"
homepage="https://www.python.org"
distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=003a4fbd03fa0dbb3cf88d894c40311ef30dd17b2aa85291c3136393148b1362
+checksum=a046ddfd75f439ec2e65af840caa267d1edb4d914d7777d2fbd2f88041c6f3a2
alternatives="
python:idle:/usr/bin/idle2.7
From 8e65ac3069188abed4d489a15152ba0621b25c03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:31:15 +0200
Subject: [PATCH 123/609] python-tkinter: update to 2.7.18.5.
---
srcpkgs/python-tkinter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 58658eda5272..94667653def5 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -7,7 +7,7 @@
_desc="Interpreted, interactive, object-oriented programming language"
pkgname=python-tkinter
-version=2.7.18.4
+version=2.7.18.5
revision=1
wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7/lib-tk"
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Python-2.0"
homepage="https://www.python.org"
distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=003a4fbd03fa0dbb3cf88d894c40311ef30dd17b2aa85291c3136393148b1362
+checksum=a046ddfd75f439ec2e65af840caa267d1edb4d914d7777d2fbd2f88041c6f3a2
pre_configure() {
# Ensure that internal copies of expat, libffi and zlib are not used.
From cfe99393d26765a97cdc5cdd4a78a7135031adcd Mon Sep 17 00:00:00 2001
From: Barbaross <cullen.ross@proton.me>
Date: Tue, 28 Jun 2022 10:21:59 -0400
Subject: [PATCH 124/609] keyd: update to 2.4.1.
---
srcpkgs/keyd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keyd/template b/srcpkgs/keyd/template
index e8c4a1c45a39..39b6aeaff0ae 100644
--- a/srcpkgs/keyd/template
+++ b/srcpkgs/keyd/template
@@ -1,6 +1,6 @@
# Template file for 'keyd'
pkgname=keyd
-version=2.4.0
+version=2.4.1
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/rvaiya/keyd"
changelog="https://raw.githubusercontent.com/rvaiya/keyd/master/docs/CHANGELOG.md"
distfiles="https://github.com/rvaiya/keyd/archive/refs/tags/v${version}.tar.gz"
-checksum=100007894ac4fa6e95f5de5c2fe992c8b00e68d9df76c4bcdd8402a29d7b4058
+checksum=23e6eac529b0c07ad99420c2a8a75967b7cadb0c3509284cc0f7633056dc50e2
system_groups="keyd"
post_install() {
From cd594dfd1cd2b99fcaf297dd3c43b6589c6dfac5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 28 Jun 2022 17:19:27 +0300
Subject: [PATCH 125/609] exo: use raw changelog.
---
srcpkgs/exo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index df5c22224d59..b15a2be8ddd1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -11,7 +11,7 @@ short_desc="Extension library for the Xfce desktop environment"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://docs.xfce.org/xfce/exo/start"
-changelog="https://gitlab.xfce.org/xfce/exo/-/blob/master/NEWS"
+changelog="https://gitlab.xfce.org/xfce/exo/-/raw/master/NEWS"
distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
checksum=722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6
From 0ef7159f84445e97d6c17ff258167cf7ec1dfee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Rubio?= <engolianth@protonmail.com>
Date: Tue, 28 Jun 2022 08:51:18 +0200
Subject: [PATCH 126/609] New package: hunspell-ca_ES-3.0.6
---
srcpkgs/hunspell-ca_ES/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/hunspell-ca_ES/template
diff --git a/srcpkgs/hunspell-ca_ES/template b/srcpkgs/hunspell-ca_ES/template
new file mode 100644
index 000000000000..b9aa920b50e1
--- /dev/null
+++ b/srcpkgs/hunspell-ca_ES/template
@@ -0,0 +1,18 @@
+# Template file for 'hunspell-ca_ES'
+pkgname=hunspell-ca_ES
+version=3.0.6
+revision=1
+create_wrksrc=yes
+hostmakedepends="unzip"
+short_desc="Catalan dictionary for hunspell"
+maintainer="Adrià Rubio <engolianth@protonmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://www.softcatala.org/projectes/corrector-ortografic/"
+distfiles="https://github.com/Softcatala/catalan-dict-tools/releases/download/v${version}/ca-hunspell.zip"
+checksum=1652bd89c43a17f576470b467da2d4fbe128683d6054d1c6a31f9967ae067fcd
+
+do_install() {
+ vinstall catalan.aff 644 /usr/share/hunspell ca_ES.aff
+ vinstall catalan.dic 644 /usr/share/hunspell ca_ES.dic
+ vdoc README.txt
+}
From 32d7a2b2e3a5addae6bbf80c1fcdb87f39567b95 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 28 Jun 2022 10:35:06 +0200
Subject: [PATCH 127/609] slack-desktop: update to 4.27.154
---
srcpkgs/slack-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 6ab5acf70145..6b30c8158717 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'slack-desktop'
pkgname=slack-desktop
-version=4.26.1
+version=4.27.154
revision=1
archs="x86_64"
hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="custom:Proprietary"
homepage="https://slack.com/"
distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=c13fa42fa7f63afbcffb315dd4c2bb626f98d680be86483543f7db78bd63835b
+checksum=65c47c7312de88e6ecf3fcffcf494ca4c1ff2c41c472933a61b05d0713168b98
restricted=yes
repository="nonfree"
nopie=yes
From 86622495aa9f3006e57444e97d09e1932f60ced7 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Mon, 21 Feb 2022 13:19:55 +0530
Subject: [PATCH 128/609] uhubctl: update to 2.4.0
---
srcpkgs/uhubctl/patches/Makefile.patch | 15 ++-------------
srcpkgs/uhubctl/template | 6 ++++--
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/uhubctl/patches/Makefile.patch b/srcpkgs/uhubctl/patches/Makefile.patch
index 429a805e354c..cd24ad3870a3 100644
--- a/srcpkgs/uhubctl/patches/Makefile.patch
+++ b/srcpkgs/uhubctl/patches/Makefile.patch
@@ -1,21 +1,10 @@
-diff --git Makefile Makefile
-index f6d69d3..58a9d98 100644
--- a/Makefile
+++ b/Makefile
-@@ -4,7 +4,7 @@ UNAME_S := $(shell uname -s)
-
- DESTDIR ?=
- prefix ?= /usr
--sbindir ?= $(prefix)/sbin
-+sbindir ?= $(prefix)/bin
-
- INSTALL := install
- INSTALL_DIR := $(INSTALL) -m 755 -d
-@@ -14,7 +14,7 @@ RM := rm -rf
+@@ -14,7 +14,7 @@
CC ?= gcc
CFLAGS ?= -g -O0
CFLAGS += -Wall -Wextra -std=c99 -pedantic
--GIT_VERSION := $(shell git describe --abbrev=8 --dirty --always --tags)
+-GIT_VERSION := $(shell git describe --match "v[0-9]*" --abbrev=8 --dirty --tags | cut -c2-)
+GIT_VERSION := $(shell basename "$(CURDIR)" | cut -d '-' -f 2)
ifeq ($(GIT_VERSION),)
GIT_VERSION := $(shell cat VERSION)
diff --git a/srcpkgs/uhubctl/template b/srcpkgs/uhubctl/template
index 748b10a9b32a..8f14794092e5 100644
--- a/srcpkgs/uhubctl/template
+++ b/srcpkgs/uhubctl/template
@@ -1,13 +1,15 @@
# Template file for 'uhubctl'
pkgname=uhubctl
-version=2.1.0
+version=2.4.0
revision=1
build_style=gnu-makefile
make_use_env=yes
+make_install_args="sbindir=/usr/bin"
+hostmakedepends="pkg-config which"
makedepends="libusb-devel"
short_desc="USB hub per-port power control"
maintainer="Pavel Fatin <mail@pavelfatin.com>"
license="GPL-2.0-only"
homepage="https://github.com/mvp/uhubctl"
distfiles="https://github.com/mvp/uhubctl/archive/v${version}.tar.gz"
-checksum=227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b
+checksum=391f24fd1f89cacce801df38ecc289b34c3627bc08ee69eec515af7e1a283d97
From 0c00df2fe5a5616f80836a73b1c12c87a5884672 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 14 Mar 2022 10:02:42 +0100
Subject: [PATCH 129/609] scid_vs_pc: update to 4.23
---
srcpkgs/scid_vs_pc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/scid_vs_pc/template b/srcpkgs/scid_vs_pc/template
index ed2e13d5d235..4551c49fe0b2 100644
--- a/srcpkgs/scid_vs_pc/template
+++ b/srcpkgs/scid_vs_pc/template
@@ -1,6 +1,6 @@
# Template file for 'scid_vs_pc'
pkgname=scid_vs_pc
-version=4.22
+version=4.23
revision=1
build_style=configure
hostmakedepends="tcl"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://scidvspc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/scidvspc/source/scid_vs_pc-${version}.tgz"
-checksum=3d21c33eb7e1248fc3c845502e8f0291aae0a9ffe2506e4f82f51b3bfe163493
+checksum=e182a4370adce21c579f5f93f4d56eec5c6e19c486bb893dc1f514ff2f070e89
do_configure() {
./configure CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
From 8bb03a4f6a993cb548cba987f0e79ea1e86e01b4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 13:17:24 +0100
Subject: [PATCH 130/609] New package: japa-0.9.4
---
srcpkgs/japa/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/japa/template
diff --git a/srcpkgs/japa/template b/srcpkgs/japa/template
new file mode 100644
index 000000000000..3ac435617fd5
--- /dev/null
+++ b/srcpkgs/japa/template
@@ -0,0 +1,15 @@
+# Template file for 'japa'
+pkgname=japa
+version=0.9.4
+revision=1
+build_wrksrc=source
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel
+ alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
+short_desc="JACK and ALSA Perceptual Analyser"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
+distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
+checksum=b7dc2566bfa9139bbac93a404d60d0b1e0bfadfe1315bb46d17f6d9d376407c2
From 12a7e9cbe66b2dc78bde562717dff60e5acd57aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 28 Jun 2022 12:08:53 +0200
Subject: [PATCH 131/609] hcloud: update to 1.30.0.
---
srcpkgs/hcloud/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 18fd46f72bfc..70a9abba9d2c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
# Template file for 'hcloud'
pkgname=hcloud
-version=1.29.5
+version=1.30.0
revision=1
wrksrc="cli-${version}"
build_style=go
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="MIT"
homepage="https://github.com/hetznercloud/cli"
distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=8a8a0a8ee86eaae329090657f236c8f736c5c67209fedf5047977f8ef8c2afb8
+checksum=12110363deb3d4bb66f4ab0350b3ee220c38d9f9a4bda94bb8396c32c9025e33
post_install() {
vlicense LICENSE
From f5240c0d8c105d13651b78c7360f35ba03572990 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 6 Mar 2022 17:54:03 -0800
Subject: [PATCH 132/609] srb2: update to 2.2.10
---
srcpkgs/srb2/patches/comptime.patch | 19 +++++++++++++++++++
srcpkgs/srb2/patches/libadd-execinfo.patch | 12 ------------
srcpkgs/srb2/template | 14 +++++++-------
3 files changed, 26 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/srb2/patches/comptime.patch
delete mode 100644 srcpkgs/srb2/patches/libadd-execinfo.patch
diff --git a/srcpkgs/srb2/patches/comptime.patch b/srcpkgs/srb2/patches/comptime.patch
new file mode 100644
index 000000000000..5d0c2167b2ac
--- /dev/null
+++ b/srcpkgs/srb2/patches/comptime.patch
@@ -0,0 +1,19 @@
+diff -Naur comptime.sh comptime.sh.new
+--- a/SRB2-SRB2_release_2.2.10/comptime.sh 2022-03-06 13:52:43.000000000 -0800
++++ b/SRB2-SRB2_release_2.2.10/comptime.sh 2022-03-06 17:05:02.725041025 -0800
+@@ -40,13 +40,14 @@
+ const char* compbranch = "Unknown";
+ const char* comprevision = "illegal";
+ EOF
++exit 0
+ }
+
+ compversion() {
+ touch $path/comptime.c
+-versionfake
+ test -d $path/.svn && versionsvn
+ test -d $path/../.git && versiongit
++versionfake
+ exit 1
+ }
+
diff --git a/srcpkgs/srb2/patches/libadd-execinfo.patch b/srcpkgs/srb2/patches/libadd-execinfo.patch
deleted file mode 100644
index faa8fb25a687..000000000000
--- a/srcpkgs/srb2/patches/libadd-execinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg SRB2-SRB2_release_2.2.9.orig/src/sdl/MakeNIX.cfg
---- a/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-07 00:06:51.901546000 -0700
-+++ b/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-06 19:38:24.000000000 -0700
-@@ -22,7 +22,7 @@
- OPTS=-DUNIXCOMMON
-
- #LDFLAGS = -L/usr/local/lib
-+ LIBS+=-lm
-- LIBS=-lm
- ifdef LINUX
- LIBS+=-lrt
- ifdef NOTERMIOS
diff --git a/srcpkgs/srb2/template b/srcpkgs/srb2/template
index a181643caa8e..f966b5e88a6c 100644
--- a/srcpkgs/srb2/template
+++ b/srcpkgs/srb2/template
@@ -1,7 +1,7 @@
# Template file for 'srb2'
pkgname=srb2
-version=2.2.9
-revision=2
+version=2.2.10
+revision=1
create_wrksrc=true
build_wrksrc="SRB2-SRB2_release_${version}"
build_style=gnu-makefile
@@ -16,8 +16,8 @@ license="GPL-2.0-or-later"
homepage="https://srb2.org/"
distfiles="https://github.com/STJr/SRB2/archive/SRB2_release_${version}.tar.gz
https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${version//./}-Full.zip"
-checksum="5f7eeb08e90323e28cdcb02ad25c904eef25ce75316720609b995a1e4ffd154a
- 48e644604bed81b5ce6b12ef23a2f4042d0118d0ba70f18c534dfe86ebe6f37d"
+checksum="feb3a95a15ea04218282e5c4f01ae3733672e14d219e2792dcfc500dcf89a3c2
+ e69ac5cacc86f85eeaba14644a37cad932f7d7031b667892d2f9ba9bfb437d25"
restricted=yes
case "$XBPS_TARGET_MACHINE" in
@@ -28,7 +28,7 @@ esac
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
- export LIBS="-lexecinfo"
+ export LDFLAGS="-lexecinfo"
fi
if [ -n "$CROSS_BUILD" ]; then
@@ -36,7 +36,7 @@ if [ -n "$CROSS_BUILD" ]; then
fi
do_install() {
- vbin bin/Linux/Release/${pkgname}
+ vbin bin/${pkgname}
PROGRAM_NAME="${pkgname}" PROGRAM_DESCRIPTION="${short_desc}" \
PACKAGE_INSTALL_PATH="/usr/bin" PROGRAM_FILENAME="${pkgname}" \
@@ -45,7 +45,7 @@ do_install() {
vinstall srb2.png 644 /usr/share/pixmaps/
vinstall srb2.desktop 644 /usr/share/applications/
vmkdir /usr/share/games/SRB2
- for f in {music,player}.dta {srb2,zones,patch,patch_music}.pk3 models models.dat; do
+ for f in {music,player}.dta {srb2,zones}.pk3 models models.dat; do
vcopy ../${f} /usr/share/games/SRB2
done
}
From 93f1a00454ad1ae0b90fce96b727e1318e6da32d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 13:30:23 +0100
Subject: [PATCH 133/609] ddgr: update to 2.0.
---
srcpkgs/ddgr/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ddgr/template b/srcpkgs/ddgr/template
index b53bfe8196b3..99e88022e36b 100644
--- a/srcpkgs/ddgr/template
+++ b/srcpkgs/ddgr/template
@@ -1,13 +1,13 @@
# Template file for 'ddgr'
pkgname=ddgr
-version=1.9
-revision=2
+version=2.0
+revision=1
build_style=gnu-makefile
-depends="python3-requests"
+depends="python3"
short_desc="DuckDuckGo from the terminal"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/jarun/ddgr"
-changelog="https://github.com/jarun/ddgr/raw/master/CHANGELOG"
+changelog="https://raw.githubusercontent.com/jarun/ddgr/main/CHANGELOG"
distfiles="https://github.com/jarun/ddgr/archive/v${version}.tar.gz"
-checksum=3dfe82fab649f1cec904a1de63f78692be329a3b6928c1615f22c76f6e21c36f
+checksum=7e46430b0a8c479a5feca832adb73f2f09804bf603dedc50f4cf2e1da4c75f88
From 28a1064e221eba52c1a74363a864c21a4a2cb5fa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 17:08:13 +0200
Subject: [PATCH 134/609] qemu: move INSTALL.msg to README.voidlinux
---
srcpkgs/qemu/{INSTALL.msg => files/README.voidlinux} | 0
srcpkgs/qemu/template | 2 ++
2 files changed, 2 insertions(+)
rename srcpkgs/qemu/{INSTALL.msg => files/README.voidlinux} (100%)
diff --git a/srcpkgs/qemu/INSTALL.msg b/srcpkgs/qemu/files/README.voidlinux
similarity index 100%
rename from srcpkgs/qemu/INSTALL.msg
rename to srcpkgs/qemu/files/README.voidlinux
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 042ba79299e1..823caa111ba9 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -75,6 +75,8 @@ pre_configure() {
}
post_install() {
+ vdoc "${FILESDIR}/README.voidlinux"
+
# qemu-bridge-helper must be setuid for non privileged users.
chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
From 0da7513ade2a5e212e42d6f4a0bcfe9f6d422ee8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 17:48:17 +0200
Subject: [PATCH 135/609] vim: update to 9.0.0000.
Adopted.
---
srcpkgs/vim/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 2e55873e45c3..e1ff9731c83c 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,6 +1,6 @@
# Template file for 'vim'
pkgname=vim
-version=8.2.5083
+version=9.0.0000
revision=1
hostmakedepends="gettext glib-devel pkg-config"
makedepends="acl-devel ncurses-devel
@@ -9,11 +9,11 @@ makedepends="acl-devel ncurses-devel
$(vopt_if huge 'lua53-devel perl python3-devel ruby-devel')"
depends="vim-common>=${version}"
short_desc="Vim editor (vi clone)"
-maintainer="Neel Chotai <neel@chot.ai>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Vim"
homepage="https://www.vim.org"
distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=6a40f4eb8db1e3d5ac453a281886551afdf4f54dafa334676bf4bf663bee3243
+checksum=1b3cd3732eb7039cf58a9321de26ab1a12d81c2f6760eb03c5d7b60d548f4587
python_version=3
build_options="x11 gtk3 huge"
From 1d454833117445ecfabb87e15af7f38c91a2eebd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jun 2022 09:38:17 -0400
Subject: [PATCH 136/609] python3-pamqp: update to 3.2.0.
---
srcpkgs/python3-pamqp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pamqp/template b/srcpkgs/python3-pamqp/template
index 1a22fec84fad..fc2e5ba8f8b8 100644
--- a/srcpkgs/python3-pamqp/template
+++ b/srcpkgs/python3-pamqp/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pamqp'
pkgname=python3-pamqp
-version=3.1.0
+version=3.2.0
revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://github.com/gmr/pamqp"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9fc37561f68bde122e2a86ddb8caf9c758d9780519ee2bdcc1d3ce3a34941e3f
+checksum=56bd552a3baa3b506845727eb9acf0f1a00c5272f4ef7fcf5fa4c4d6e476502e
post_install() {
vlicense LICENSE
From 44d45c823539f53608fde4bd123f9a7e001a028a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jun 2022 09:40:33 -0400
Subject: [PATCH 137/609] vkQuake: update to 1.20.0.
---
srcpkgs/vkQuake/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 1ca876fe6927..88e2b0eaf0eb 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
# Template file for 'vkQuake'
pkgname=vkQuake
-version=1.13.1
+version=1.20.0
revision=1
build_wrksrc="Quake"
build_style=gnu-makefile
@@ -12,7 +12,12 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/Novum/vkQuake"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ceb9ee46135309f7caf94267539cae70b47ef8edf104e3901b89d3aee7b0b874
+checksum=2ff682a4b289607c56200d9d0920e3a360fe1b8aeb8cb39d4e0f4b460f4ad744
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+ LDFLAGS+=" -latomic"
+fi
do_install() {
vbin vkquake
From 0bfc3d555dc6104b1bfb8638a57bc43d71d0b70c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jun 2022 11:46:32 -0400
Subject: [PATCH 138/609] zfsbootmenu: update to 2.0.0.
---
srcpkgs/zfsbootmenu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 47c4211f859a..3e27d86b9c0d 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,9 +1,8 @@
# Template file for 'zfsbootmenu'
pkgname=zfsbootmenu
-version=1.12.0
+version=2.0.0
revision=1
build_style=gnu-makefile
-conf_files="/etc/zfsbootmenu/config.yaml"
depends="dracut zfs kexec-tools fzf bash pigz mbuffer ncurses
perl-Config-IniFiles perl-Sort-Versions perl-boolean perl-YAML-PP"
short_desc="ZFS Boot Environment menu, implemented in Dracut"
@@ -12,7 +11,8 @@ license="MIT"
homepage="https://github.com/zbm-dev/zfsbootmenu"
changelog="https://raw.githubusercontent.com/zbm-dev/zfsbootmenu/master/CHANGELOG.md"
distfiles="https://github.com/zbm-dev/zfsbootmenu/archive/v${version}.tar.gz"
-checksum=b90b1a055fe5744fb34a49718b49265e800f8f6e19456c3fa3619a48a036f359
+checksum=466496e896a992fea9d46c55e48c6fcec1ab62b7022476571f0c41c015e31b13
+conf_files="/etc/zfsbootmenu/config.yaml /etc/zfsbootmenu/mkinitcpio.conf"
post_install() {
vlicense LICENSE
From b79b59fae9be2da660823daa45d559dfd9a91631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
<sigrid@ftrv.se>
Date: Tue, 28 Jun 2022 17:44:49 +0200
Subject: [PATCH 139/609] cpufrequtils: enable on aarch64*
---
srcpkgs/cpufrequtils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index f29bb4155f6c..7b3bb14774e7 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -15,7 +15,7 @@ homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git
distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95
-archs="i686* x86_64* ppc*"
+archs="i686* x86_64* ppc* aarch64*"
post_extract() {
sed -i "s|/usr/bin/install|install|g" Makefile
From dab9211501ac75aea6bf149c72fc900feb4f436b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Jun 2022 11:07:14 -0400
Subject: [PATCH 140/609] synapse: update to 1.61.1.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index ce748cc3a452..6490cdf94035 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.61.0
+version=1.61.1
revision=1
build_style=python3-pep517
make_check_target=tests
@@ -22,7 +22,7 @@ license="Apache-2.0"
homepage="https://github.com/matrix-org/synapse"
changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=3602b4a01688edae8365973877220a0511cb3970ff4e32eec759ca070066a684
+checksum=79b216330a22711521d0ff6694c9f12e40de7e7345a1601bac22021fcace36fc
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
From 98e1836aa4a21bbd1694b9d1da87ca7d21b1815b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 27 Jun 2022 20:05:57 -0400
Subject: [PATCH 141/609] qownnotes: update to 22.6.2
---
srcpkgs/qownnotes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index db79662ba4bf..a961314e3908 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
# Template file for 'qownnotes'
pkgname=qownnotes
-version=22.4.0
+version=22.6.2
revision=1
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
homepage="https://www.qownnotes.org"
changelog="https://www.qownnotes.org/changelog.html"
distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=96b682608ecdf303e2c5d5eb2341812db3c3848e15bc4832ba5d426f01bdbd66
+checksum=adb3be2cc6d5fa24f2e9e383c8843c7d795c34f0b85263efa1580f935600c99a
pre_build() {
vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
From 583296d24e7fbbf30644911b645ab66fce218273 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sun, 26 Jun 2022 17:17:34 +0200
Subject: [PATCH 142/609] cpuid: update to 20220620.
Closes: #37695 [via git-merge-pr]
---
srcpkgs/cpuid/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 4c651ab451cd..aded1c55f137 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
# Template file for 'cpuid'
pkgname=cpuid
-version=20220224
+version=20220620
revision=1
archs="i686* x86_64*"
build_style=gnu-makefile
@@ -10,4 +10,6 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://www.etallen.com/cpuid.html"
distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=4a19de2a118aee44f856cd1becfa5a192574b5957795372a86e37dca24da1f9d
+checksum=9159a1c095a6e44c6ca6306c5080bfe2a7bcde25e8dc16f06f5f874d7732cb1a
+
+conflicts="msr-tools"
From 1758a354c6b9c951ba9d793f5ec6dbec11677e4b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 16:36:54 +0200
Subject: [PATCH 143/609] firefox: update to 102.0.
---
srcpkgs/firefox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 59d0c5cf1866..0684b67f6f13 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=101.0.1
+version=102.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b4c76e8bdf81f473f3e56b2f69dbe5119bba5cab38e36ab0f3f38cf0cdc4a9c2
+checksum=01797f04bd8d65f4c7f628d7ce832bf52a0874433886e4d0d78ef33c1ca66abf
lib32disabled=yes
From c0d07248645ae4984234bf2a204e83fb4272c65d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 16:37:04 +0200
Subject: [PATCH 144/609] firefox-i18n: update to 102.0.
---
srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
1 file changed, 97 insertions(+), 97 deletions(-)
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index f1d8480adcf4..c767f1254fdc 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=101.0.1
+version=102.0
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
}
}
-checksum="ed5be7552b72589432c44cef4446208bc7f94fdbbf8c7a46aafc83f223a6d436
- 0aceb525734b1e5647f75d6c0ac3b14131594c7fe1e7fcf7a7c8be8d920c8a61
- 02c4c0d865eaa1508a8c660f312ba3947bd15ede09eb9dfcbf25e31bd6370d63
- d71038f9da1773305ee7ff69808ddcd460196795049a5cfa97167fd224345f49
- e400acc7af52b6d7bf2bff2fcd4d325345cba5b3d1f8d417023020cd1a1e2eec
- 15de0f52e2484e77be071f987dcadac15f05f93c4cb676f023d037ff64f8408b
- ee849e83a50c3a69b22ba93e253d5a99a9793be738232ffb3bac0c078c78bb52
- 1feefc2c94b6dfacb868c91ae1aed6e63b233b4e3a2f1043caaeb8161e62be74
- e8657525629fc6dc35149b629a379bebd006b1b9d41845be098f3bb8ec6ace67
- cab077c643a57f10b9c474277bd0b191cb6e25638788ac15c9e176ee393d2393
- 5ae7f71bfd39956b8553446feaebb047ddfc520459f275e8765bf917696ff4f0
- 19c322ee28a0b89bedcc7f20fb85857fb1d5bbcc6c6183d54f965165d42962d9
- 2c6ecd3ed59d14cbd5834259b4a258fc1513f6d8e09aa14e96467f5821ecd6bb
- 03f4fc349e1631d5883b5c2a5f601e57e01ce7945f3f08f970f413b5a8411f77
- 3c889dff21cdf6e6c261e160c723e21bcbe87dc28c3c5687275b35bcc42ecf47
- 569db6c6aef1a3dcd634c7f3dad0cd4ef5d7fdd9bc4b7e37003fb8fc9ca52d04
- 1abf5e0077367234e2363c4b531a37c6e0c229794c3aca5f2ff83cfb661f0576
- 88dc29afeb4e10b81a352902804705ed1b0e3abd03aa9f20e5896dcd0febd185
- 14e0a939d23596c8370b03189fc0d0bc0a6eebbfa40b00cfe2e5368c0282b33d
- c286bd9ab2237fc2262b5e08230209254ef545fffb0e3fe36645f12ef14d4cda
- 66875ff542436d2f6c725efb81c820c7a7ede37f0e925c2305c44999544133aa
- 5472ee129514179a5ed866564e8778af1092b9516206aef9c8d80e028386c5bb
- 694a1f37b26486ebe10347ee7253db720aa1fd560417a35bcce05e2522846946
- 1a99f781645c1d20a0b00bab9fb7fc5c51f298648225751d3f6fd6f8702cb8aa
- f741d5c6acfcc9cc5b856b1061eba22e4c441a1b4911d5d9c2ebc0cfcda8d0e2
- 787fb1a1e55ae88a1511a118bca51a94cbee52bb1d735aead9a53642f8a9896f
- 204ca0c4a8007b027042affe98f68a06ed931daaa240801ba0d8a6504a41f292
- 7cff5d7e596e7b1016d62032e676e6d9ec241f0b2d2662d2aa85978d8797ca41
- 173cf3f1db9977cfe8970b10b4b2488bf17a95b5d70f7aee105f57c975c74b98
- a190cbcf63bee079efa4efefe8374729208150959176546b9ac4f4dd67dcff31
- c55e07086edcb10b74d0948ec7807fdd86b51527023f7d48e600544f54eacda4
- fc6b2f5d1ffa0334e2323c0dbea4acea081854b76e458e3d03ef723e72f042c1
- 65b1d5b59587860e8851bbcdb43908d9fafb2e82b8f453b6f7679af80db10c11
- 7c0c575216db5741975ddf6fac5515654f965a294c55a4b7c4dc260ca32ecc96
- 472325c726434a8b1415afcb2f1f4beb4e64e84cd7bfeeeb325b170f83608467
- fb5738328cc412fa9d766d60046b2f48368db912bd2fa77e58ef108053c4d700
- 307786457a572b4c3a4944aa9786ce5f15556cf025355add2296d4b509f97e1f
- e20d65ca34bc1de29484f18c4f2d419737419b4d9d974a9a1ea50b622019a22c
- 32dc9d36318a6b5b4c5b5b043499d32da01ca5766087fb04d6b407c2e23799c6
- ad87c861c2534d56a8552dc27cdf765dc13769c11bf93afcfd3643cba7fd342d
- 75bad5529ff59be3ba641fffc7e419b459cf9b8b788ca79b6ad0c34d8301a67a
- 3ad4c7510b8ea15e7374b16ce67c7d9573f34d918b769fd618567bb5fefaa21a
- 80443ab4873bf78bfa97b640bf7870db5b0539c658d52bce442de2f9087c61fd
- c264effcb13fcb8ff69aee2f297998b6707253f1c60c135c0bd3a6c31101e91c
- d32b27498f9ca1211d585dceaa07c502f4dc113aa8f69ab8898f3a7abb9bf983
- 275f4da7e7f99544ef11f3ba29eed96fa1fe46f3300b5642c3b552003909309c
- 8a37e9727154f77e502ad8cc1e692287662a600adf99aeb534adbed751c1e2fc
- fc8c453a640b329fd86e8711ff9f5c2c2a810fba4231f42d551cb881261042ef
- 4617409870b80e777b5831e13bc50537bc881b860a99d89721e8cd0123ecc095
- b24c7fa37c8db9a31e180495e881447df8d186df1e600983010fa8d24e102665
- b280609c17a7fa30b40e06b123515752b0cc31015bc737705bcd596f5b54194f
- 7c680a3447c386bbe787c94ebbf53422792230be6e5fe8317cf570ea4fa81160
- 01306b4cf4455eb0c8ba4511e586ef6e0dbaadb8001696ad46b5cc11c50e5dde
- 351b9e1a91ce19449f0bfb444fefc67ae7e3c9cb284c121e5275fe6ebd1a32ae
- bae7bc95eb40c272efd4cbabd053c88c58b32e0797f1109a33bac26acdd3269f
- 7a0e0a3b0bca1c85c754a90da279bfa9c81aa23bccbc3beff48367bdf99e061e
- 459abe53c247de6ffaa15ffdc4076fd7eb98329ab721a9b7d046f2dde9080f10
- eabfa6ed9c4fd559bb95a7afac8e0d72bd761c0fd25f9b2fbc2dfc4e561b7c19
- a9c3a787c4ecac6e0e0893a27c04347d919fcd8e45eb9a527d8d3408e93c8ff7
- 31b0eaddbb4637a65994576d969c14b53049161e26475c8446d209f149f51ba7
- 7e6eb8f127014388b1f46da1849e033caf80b351c341a1a345e6556d7b419098
- 56168c028d5cde120c1319d902cf8086d9993d76a32ba9233a09ade20897ae4f
- 7a14c159efd1bd940cb4c1d7c019b14e7f8fddef8a70f1416fc0d5d9c03a64e9
- 0f87061b5f9f3241eeeef54808023eb8dc5b5da542b6bb5dcce3ac7028eac667
- 850048e1edd47f618df235e396fb425ed95d5966da392cd5a775db1fd369a116
- ec12fe50526317b04d19b559aeb728b36b4cac323266f2d509ebda41c6571a1a
- 86e157ffa5e04dccf08ac54d9d9f6a7cc3d5dd8a6a159d076d79e28e6a7efeae
- fa3d06b57a1c497841238818e0235872e3eaa92a1285fff72652da8a33629709
- 10e2ae7d974c094644ea0bc942bafc724a92c593d301af38105d4d38f670b444
- 33a05876f3db5b4759ac0fbb183d4a148bc2c21e02a98ba399e55e07db4fc243
- 1fe5bb3bd6704d67219013d14054a85329c31a7ba4d0102d31f6e92d7c8d853d
- dc4bcc6f83176bcf3b4592e42028c313336e7fcbf923640db3421dfc683457a5
- ecfa7cbd39c083217975570ca9ead77b0a9652d6ad0900a59a46a74fe3b0a83b
- 90e4366784389fc2ecc1eca995c65d49de03e18c5027884e830ed41ede1795d7
- 9a8de63c5ea8613174efd78951b7d07782eb340a3112dde85cc7298edbcf2a8b
- cb260111748e7ca714e8ed19259fcd42e29f52269191ef42e584d501436cde93
- 0b07daee1594196377e8fa8cde38440781ce528d37e32fa396c9ebda24a5d38b
- 6080231954304e786b4511fceced3430a43708399bc43421ee032efc13fa4be8
- efd3f46a9894cf014fcab2c0440d424f9845576f23af975b81c8ec417004876a
- 2af0504ec8e35a7737be66320e0bff2d3fe06ab0b463b3bbeb563e8ff5a4d9da
- 5ddbb04a69131a4b909d91c99334f3821de1f7cc4b4b435f247f94970d36016d
- c846e1ed79a76994714a7cd1341cfa4e87b7e7bc874a305732d207451bfa7510
- 2bda954e26ce2d640a6be009171feec861fa7206e798fa39119341831448a25a
- 64bda1ee9682427bffc30607eb9eff48cd0f362186e3fe6a746671b33552893b
- d081fd3c0d75f96503fa7092fcbe127b98f41c69eb75a2f776de66bdd413f2a6
- b02caec19d30f1f123ff6ef303e55d36192c9b9fd18c887f264ff7cd49386515
- 0a54a6dffc32d7782b05c6696304510be94e3ab25fb941973b68801660fa990d
- 1714f28f03c6a655957f428573c26054b4bf6d558724844325d63c9154fee1d0
- 6f42d07f07fa58096c97106d632d5319c516d9306ab94b874a8716d4da59e761
- 0a7c14d11ba323b0fbc6e111d6e641cadd1e0e3bff9b1ce0d6dba6712c575c99
- eae673d6dafa7ac0f030392bb096d10b81b04f479f59b0c53987d1d76ddf0da6
- d48527ed3cd53ff6519804de1dcca284e548d08e145849e0e5cd1a179ab00279
- 753b92a8524164a261668594482d62a5c7c46068561ad08b8c06a9526ff9d413
- 794972ec101968df6317a076a6a7c9300abffb697e04cd51f81885ab23b6cfbe
- dd2e57795f858d01aba47dde88e75b9c238e7cb15888c1f39dcce28214b356f3
- bf6078b5ca9ea99acb41ee8484bf692498b9f14aa94b52facbe4ccccc2e21987"
+checksum="25377f70be3b157611ba7a23422ba5d56a27bc83dff3664a7659d1f0ed29385e
+ 0ae9e26a2dae23a158a88a3b1d0aba7d7ca47510fa1f0c3318d0434eda6ccc15
+ f74bc0f0eeea4f6cf6308e48f5e9bd7465bbd29addb2040f5f9c8fa2120e9871
+ debe58b15334f4dcb95be4a8e9903702564eeccf2eb70f4d711782ba062999d6
+ b361440b296e8657cc6fea1966d4b4eb875e09240ece4996ad0e8bc3d6bfe8c4
+ eaf1d5514d0da291fd5e7f71bf4fdc9f7ad9f3b917f865ce5c9b99d51a1b79f2
+ 9d2b466b49543b45fd8a76c33a541cb84b091541148d6d537ee06ff40d2367c2
+ f11fb7f609c8f7b79717d7e600f8d158bcd3d0d45e09f4141c8da81be4eb773c
+ 6fd073f9ca64d0c570373dc51e238c2d7330b3d2e59c49e5238b6f34a26388f6
+ 55ab7157f0ffb6a353585345d0d7ef5438f93776850f71860c3379e887781a54
+ 2470882400d197973dfb89f33002ff08a20e750048d524e566e28fa0a55a98c2
+ 5fe0df8ea7af8e78a61263afefc6b2cf926ae7f265303a68fe08133ba0630e74
+ 908654c162e05561600220ed6717df9a58c01676450dec5473d19eb1dfb05277
+ 2ee25d54f2279fe5e9c152858d62c49e099466c7eecef1c116f9318b12eced09
+ beb27d76bc8006310e9db3a3737b6d5ce4ac6cd382a3fe7f856768cddea4cd4a
+ b2ca58e0053763bcaa7c5e7b1422daa1bd4f1977fabc1408fcb5aa00b5132e76
+ 5b06916ad46a261e399087ef0add54ab754f73cc6375959a5a484256ecd1ddb8
+ 9f47ebcd12c7d77eaba1cf86c159644d33529778eaf9734effc6667aa737d040
+ 66be782cf1c15a8c89febb594a2984c5c01f4f6adcc9cc90a32790e5da721874
+ af995cbe813fc58ed5db3e298e55af4c89c392854efb03f73a4c0532b9b9e9f2
+ 41bb36c560832efc235a4d2b6dc3c9bf482e7e54e23a7ca086031b2c78eaa4d5
+ fb46a6806a1afe016afcba95b8790a631c0ac93d87c575d5533e2f302bd4aa72
+ 3d7cd55f4dc1a8c30dfa20696d81e4c30258fc7a0450e22a56a398d79008f8f4
+ 28701f521eb95414acba715c4d3e38626ae3a2c5ba39a9cae78ff9783c17d1f2
+ 2fe1ac59bd8ee2d813723fb941a3aac234dea60d3966d1fbb436d21bbcaf7544
+ dd751857ce60a1a8f203f6541477abb3eb9c37a9ea720ec94e15e1a151500caf
+ a11beef824c3c59bc567c5e582b832b31ee43020b085e3d16d1611b670b0be4d
+ f6cc564e119061e545163eeb1e21dd9e6009259f135bed8311bddb0c9fdf2da8
+ 40d28a7f4ebbbc50f0a75e2a1b99c60c6b48b333b0d361b02692b5b34d666efd
+ 97f3825f0cd1a72e86b5f27ef4a39b59f9a5cd23a3871b85f9d35f6a5a0e56a2
+ 742e978e7f2f3866c99225faf6b441e80d8185c2496fe6a578e782fc448164d8
+ 75dc712421be5ca9df31fb24a98aa814a59760246c0500daf9fdba58873573d3
+ c8bb018f9015e71f53b84e84e3788ea36ce67e68df1a73b9e390a1bcfe54bdae
+ 89b3f698bbe3767920cbd1774afc42640a96b0b47f9012b19a824cf8284d470e
+ cfdfd54e4af8984c9d0c7f2c7ba1394870a0c09ca8a356204daf7bacab9e487f
+ 6b1eee73028edd3bbdfb69edcbe72c346ede385ec8689da70cc7a6aed435e6d1
+ d7a3a0710e450af2ea0e3887bea396bcb7f8618b5077b764a57cb5c622dbd6ef
+ a32f4403ac5a271994360670015754f70e44049fd64dcc04b84e34c2b6a6a8b5
+ cbbbeb833be4649eec828b4dd4230be95c1d4b44ea07350424532d3753eb105b
+ 171dd89ce80cc9834931f54d4704fbc18efc4bf24c0bd8ebedfb2a8294ad9c6f
+ dae98ac17129518186a8977726540f898f289a606a98e4984e282c0297347224
+ 676eb31cc4b56817584734dc78819836c6add0a46dae97462625fc6ee6ffa19c
+ 606779e0cd35849af072153235e2e607e1ea2365721e5a85b3acb7a145aadde3
+ 3d370f7ed9bc65553eadcada425ea4aec7bd2acdbd6802f09781def4fafda88c
+ 6b1c30670eb2b4b6cdca086e44ada1958de18dcb2d405304dbec15ff846ad009
+ 789facabc76813995b8a6e156f9941cfbaa0dbb63e969625ed10f90fd9859afe
+ 53674e753e7144698b15be7811313c618a3fac0a3fd58928b0276edaa5b3c211
+ 4755c156f3300673edc4dc8d268ce522ee52f31252230295bc96f761779fca47
+ 4070ea5c60459128f5e5686b70a7edd6429769e6ccf701759346f8fbfb24119d
+ c15cff8a847748c1dd08e882d040514c696a2a514f803a055f145e157d8fd72c
+ 0a23a489ebdc3c16fd1fbf837620e8424b185819a7ecce709baa5a8a9aebeec0
+ f8032c6af9aadd277fa0de7f13fbeb52d32ad444d9f112fe8add3232e2dd16fd
+ 5e1a9a559b5da812fc51a5a8fcb1a94b6a86be1703e44f3ed075302cc4071b1c
+ 387cb04f594820410f0fa4d530b810e2a04c03b70e84d021623e644bbabfd5e7
+ 6527ec912e51885c5a3e2c007f7bcb88fce91ed106df71a10c6435f7e686ed04
+ f5071a4db9872d687fd5b8ef4e0c51de6db3f30e8cb07f4847a5674f7e7d5008
+ 21eadd5ffc305c7f0a3959b341177509318ed0c4b6758831248ab37fcdfff806
+ f008c0c0efb76842f110749662a2026c2517786a60ce0026f124845ad34ebd0d
+ dfca65617d92f564e25e08edfe0672cf16562f0998684e6f0819e3e9e150702e
+ d58c76e234c70b822072677324cc73f0979846813d06033dc17eaa0a63672460
+ dfae73801171a2923bf5c27f4a72feba091934cadae06d6d736ca6d2a16d6e82
+ f41a20958b14becd880a6ac7d0c21fc390ea0bf63617c96a049933f5dbce7f66
+ a83ac8437ecb29d0baeb5d64e4cd6050a1efa1bf6459ebe7f6d991110c6615d4
+ cb54e39194fa58cd755bc7881cec7b8657588427826209d11737c415ccd3c640
+ 34327a1035b5b292e1c46e164f48ccfceb0415f34f83d82b0744c92f4cf28d30
+ b73aa26d1be066a6bcbdf0b11bb5b5ad8bae2b7e0c6773bfd62454bea8ae481a
+ bcfdb924ea6f3b4cdbf5521295ed22033d5c8115520c145f753077fb2d727479
+ 379a31c14fd2f8b8e76acfeccff61f67ad1abdfbf886e81aee47162a3cde4c09
+ b720183fc8b170c34667c1b0be47bebcf2d6a30eb20da4177a317c11fa038555
+ 6f8a589a8b09650637bf8ae278125ec4a1a28fa8ef563d90789e9a182616abb8
+ 0a672a833fe8295e351c660f55aad2be99833da2f64265e1750db6380cff718c
+ ad5b61df6118cf2d6758510c0edd76ee4fa5e9ea66fc0f8385eae7b204ea36ea
+ 2b54612de252ad8d265158080248568315ffbb4642862a33fc3df23d0f7b7c1a
+ f04afa4dc0f17bffa28cee2c7f95cf55b23aa03356ec2fc09cc4964f787a2fab
+ 056d3aa6a9b0357640657124071939df409aa6b8147891b0c2328ccf3ff2ac7a
+ 6ad37899cc9c2c2f1ca4c500fb3d94b01d6ef7c793386ae1c37270173d26ffac
+ d3c5ea071789528330ff1b611615292bdaec0469161aacd7aaf752998a7557f9
+ 4cd4cf50780abd1a59eca4a47a528990fa671d8469b686d4066a77750cfa5963
+ c34654930dcc9aa4f53e1fdc483301353d6142df8c811fdb9185239bbdb0f604
+ 326e2fb597e013b617b74b01fc82c4bac661e1602290f37ef357babbcf4c1c4f
+ 7e70f23a8e3c2c249e561d5bd8ecb161d338d312a7f9abff84a1b1d5f277685c
+ a58146804a5a35f298d9a8218dfeb86050738587a836c0a7cbbfdb487dfb34ba
+ 9c80904e23a9c3478eb714f06b2c32d93553a8cb446f02b02d1d652f64527a77
+ c979e494142bfc96903cdb0086f62fe55238e1591da50f36f14ec0a8c7616c41
+ 0dbd12b279e1b4cd14b4b8b7679c96a19f118b57db4ff4eed000bfe862292e30
+ 53fc2bbeb3e9293eb64136951448ec18992e3db9793b691b848de581e4fd4075
+ ba2609b95599e9de602c823a4c8d9261dc46ec00fadcadb230f8dcba4c2af4fc
+ 12e3246e7f0e899f7f0a0fed599d498d7bbdb4c9b879f6bfc87056ccc2797188
+ b81715fe9f6183e6cb464201b338b74c1cac801230670af5756b07dfed879a3f
+ 59b04edcc84cb780ca88cab59f174e31c784290a74db26834ace3736d222ba1e
+ c0029cc6ff583e661f47f8e72bc506e3ede3dd1b5589a90057ef8450f06a53bf
+ 248a74746a834cfaba19efb4bcafd7e50cd42786155cd902d35f77f8ad8e6f7f
+ a4d636d08218c5a866bd405e79f16b9efe7e3692b56fb306e4b16f07ef0c0e53
+ a3544cc263415916a1fa5492298d91a37de08edbccabdf0f4f08cae1eea8d014
+ 585ba6b38a0e05b44889c5b3a228248b239c5ff5da613ca6f27a87cace35cf45
+ 768fbd9d0bd85f99d955d5a426319c8e07af7edc98178cc066a5984175c87d18"
From 0ecb7a3c6bd1a1e340f5fd0b6ecac93cf25fd96a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 19:59:45 +0200
Subject: [PATCH 145/609] dialog: update to 1.3.20220526.
---
srcpkgs/dialog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..00f5be8f5b48 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
# Template file for 'dialog'
pkgname=dialog
-version=1.3.20210621
+version=1.3.20220526
revision=1
_distver=${version%.*}
_date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
homepage="https://invisible-island.net/dialog/"
changelog="https://invisible-island.net/dialog/CHANGES"
distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=858c9a625b20fde19fb7b19949ee9e9efcade23c56d917b1adb30e98ff6d6b33
post_install() {
rm -r ${DESTDIR}/usr/lib
From ce86cde9c5afa5b1d5cc33747089fa3f241283f4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 20:00:53 +0200
Subject: [PATCH 146/609] dateutils: update to 0.4.10.
---
srcpkgs/dateutils/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dateutils/template b/srcpkgs/dateutils/template
index 0f08283ec917..6bb758dba919 100644
--- a/srcpkgs/dateutils/template
+++ b/srcpkgs/dateutils/template
@@ -1,17 +1,17 @@
# Template file for 'dateutils'
pkgname=dateutils
-version=0.4.9
+version=0.4.10
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
checkdepends="tzdata"
short_desc="Nifty command line date and time utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://www.fresse.org/dateutils/"
changelog="http://www.fresse.org/dateutils/changelog.html"
distfiles="https://bitbucket.org/hroptatyr/dateutils/downloads/${pkgname}-${version}.tar.xz"
-checksum=790256d9949b96001fdcc3f7c42226dde4fcc87eb580717c7aabf51a1334c9c3
+checksum=3c508e2889b9d5aecab7d59d7325a70089593111a1230a496dab0f5ad677cdec
post_extract() {
vsed -i '/sysctl\.h/d' build-aux/yuck.c
From e4494fe0dbf5681fc64da605db8f80c3bb28d57c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 27 Jun 2022 18:46:55 -0400
Subject: [PATCH 147/609] rofi-rbw: fix wofi support
---
srcpkgs/rofi-rbw/patches/wofi.patch | 28 ++++++++++++++++++++++++++++
srcpkgs/rofi-rbw/template | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/rofi-rbw/patches/wofi.patch
diff --git a/srcpkgs/rofi-rbw/patches/wofi.patch b/srcpkgs/rofi-rbw/patches/wofi.patch
new file mode 100644
index 000000000000..9627b6771b3c
--- /dev/null
+++ b/srcpkgs/rofi-rbw/patches/wofi.patch
@@ -0,0 +1,28 @@
+From d059d0a4f352d295c116639798f8b5e110967e4f Mon Sep 17 00:00:00 2001
+From: Fabian Winter <5821180+fdw@users.noreply.github.com>
+Date: Mon, 27 Jun 2022 20:55:21 +0200
+Subject: [PATCH] Return correct values from wofi
+
+Returning no targets might not be the best idea...
+
+Issue: #51
+---
+ src/rofi_rbw/selector.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rofi_rbw/selector.py b/src/rofi_rbw/selector.py
+index d2c9844..e5d8696 100644
+--- a/src/rofi_rbw/selector.py
++++ b/src/rofi_rbw/selector.py
+@@ -198,9 +198,9 @@ def show_selection(
+ encoding='utf-8'
+ )
+ if wofi.returncode == 0:
+- return [], DEFAULT(), wofi.stdout
++ return DEFAULT(), DEFAULT(), wofi.stdout
+ else:
+- return [], CANCEL(), wofi.stdout
++ return CANCEL(), CANCEL(), wofi.stdout
+
+ def select_target(
+ self,
diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template
index 37dc916c12d6..5a2ef1eedcec 100644
--- a/srcpkgs/rofi-rbw/template
+++ b/srcpkgs/rofi-rbw/template
@@ -1,7 +1,7 @@
# Template file for 'rofi-rbw'
pkgname=rofi-rbw
version=1.0.0
-revision=1
+revision=2
build_style=python3-pep517
make_install_target="rofi_rbw-${version}-py3-none-any.whl"
hostmakedepends="python3-setuptools python3-wheel"
From 15e1a50b41f26c6422987b05bae441ba5abed333 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:02:16 -0500
Subject: [PATCH 148/609] mesa: update to 22.1.2.
---
srcpkgs/mesa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e57a4b116683..481a3ec15b63 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=22.1.1
+version=22.1.2
revision=1
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=46940865ffe794db73ac2bc7ab7ff2570042a0b61a8ac43ca1688863e2bc0ef1
+checksum=0971226b4a6a3d10cfc255736b33e4017e18c14c9db1e53863ac1f8ae0deb9ea
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false"
From 7da114e4d371d6f4dcfa6a5bde1d3c9d63c8aed2 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:49:10 -0500
Subject: [PATCH 149/609] mesa: Enable llvmpipe for i686*
---
srcpkgs/mesa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 481a3ec15b63..79d1c638443f 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -32,7 +32,7 @@ fi
# especially on big endian it's all kinds of broken, and e.g. on
# 32-bit powerpc it does not work at all, so fall back to softpipe
case "$XBPS_TARGET_MACHINE" in
- x86_64*|aarch64*|ppc64le*|arm*) ;;
+ i686*|x86_64*|aarch64*|ppc64le*|arm*) ;;
*) configure_args+=" -Ddraw-use-llvm=false" ;;
esac
From 2aa8483ec5e5c8d73f6d8a7ecfe78c0920943ea8 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:52:56 -0500
Subject: [PATCH 150/609] mesa: Re-add HoneyComb LX2K patch for aarch64*
---
...ch64-force-persistent-buffers-to-GTT.patch | 39 +++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
new file mode 100644
index 000000000000..725a306ec30b
--- /dev/null
+++ b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
@@ -0,0 +1,39 @@
+https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
+
+From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
+From: Jon Nettleton <jon@solid-run.com>
+Date: Fri, 14 Aug 2020 13:36:08 +0200
+Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
+
+This fixes a glamore corruption issue on the HoneyComb and by
+internet reports should also fix problems seen on Huaweii
+Kunpeng hardware.
+
+The root cause of the corruption needs to be worked out, but
+this patch also adds a noticable performance improvement. The
+aquarium webgl demo under chromium increases from 39-49 FPS
+when 5000 fish being rendered is selected. Glmark scores also
+improve by ~200 with no specific tests showing any regression.
+
+Signed-off-by: Jon Nettleton <jon@solid-run.com>
+---
+ src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
+index 6b58aebee2d..c9e983367a0 100644
+--- a/src/gallium/drivers/radeonsi/si_buffer.c
++++ b/src/gallium/drivers/radeonsi/si_buffer.c
+@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
+ */
+ if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
+ res->domains = RADEON_DOMAIN_GTT;
++
++#if defined(PIPE_ARCH_AARCH64)
++ res->domains = RADEON_DOMAIN_GTT;
++#endif
+ }
+
+ /* Tiled textures are unmappable. Always put them in VRAM. */
+--
+2.26.2
From 9429b6b76e565ef62b45de7d5c1416df59bd6dad Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sun, 26 Jun 2022 21:43:15 +0200
Subject: [PATCH 151/609] sqlite: update to 3.39.0.
---
srcpkgs/sqlite/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 5ca279068b5d..75ca796cef16 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
# Template file for 'sqlite'
pkgname=sqlite
-version=3.38.5
+version=3.39.0
revision=1
_amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -11,9 +11,9 @@ short_desc="SQL Database Engine in a C Library"
maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="Public Domain"
homepage="https://sqlite.org/"
-changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
+changelog="https://www.sqlite.org/changes.html"
distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=5af07de982ba658fd91a03170c945f99c971f6955bc79df3266544373e39869c
+checksum=e90bcaef6dd5813fcdee4e867f6b65f3c9bfd0aec0f1017f9f3bbce1e4ed09e2
CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
-DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
From 4e7d2af3ca4cc16daebfcc7b42a3eaa359d59fa4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 20:50:25 +0200
Subject: [PATCH 152/609] botan: update to 2.19.2.
---
srcpkgs/botan/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 65a626714fdf..330cbcc93314 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,17 +1,18 @@
# Template file for 'botan'
pkgname=botan
-version=2.19.1
+version=2.19.2
revision=1
wrksrc="${pkgname^}-${version}"
build_style=gnu-makefile
hostmakedepends="doxygen python3"
-makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
short_desc="Crypto library written in C++"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://botan.randombit.net/"
+changelog="https://botan.randombit.net/news.html"
distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
-checksum=e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560
+checksum=3af5f17615c6b5cd8b832d269fb6cb4d54ec64f9eb09ddbf1add5093941b4d75
python_version=3
LDFLAGS="-pthread"
@@ -22,7 +23,6 @@ do_configure() {
_args="--prefix=/usr"
_args+=" --os=linux"
_args+=" --with-doxygen"
- _args+=" --with-openssl"
_args+=" --with-bzip2"
_args+=" --with-lzma"
_args+=" --with-zlib"
@@ -75,10 +75,6 @@ do_configure() {
${_args}
}
-do_check() {
- make check
-}
-
post_install() {
vlicense license.txt
}
From c944bc1e86888b05db77aa1ed799ddc82c8e0186 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 27 Jun 2022 18:14:00 +0300
Subject: [PATCH 153/609] ffmpeg: update to 4.4.2.
libfaac support was removed way back in ffmpeg 3.2.
Closes: #37710 [via git-merge-pr]
Co-authored-by: Duncaen <duncaen@voidlinux.org>
---
srcpkgs/ffmpeg/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 7545d83ef849..f42c6a1c0aa6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.1
-revision=6
+version=4.4.2
+revision=1
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02
+checksum=af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93
hostmakedepends="pkg-config perl yasm"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -19,7 +19,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
libbs2b-devel libvidstab-devel $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if x265 x265-devel) $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
- $(vopt_if v4l2 v4l-utils-devel) $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel)
+ $(vopt_if v4l2 v4l-utils-devel) $(vopt_if fdk_aac fdk-aac-devel)
$(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel)
$(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
$(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
@@ -29,9 +29,13 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
$(vopt_if srt srt-devel) $(vopt_if rist librist-devel)"
depends="ffplay>=${version}_${revision}"
-build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio
+build_options="x265 v4l2 vaapi vdpau vpx fdk_aac aom nvenc sndio pulseaudio
dav1d zimg webp sofa vulkan drm svtav1 srt rist"
build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm srt rist"
+desc_option_srt="Enable support for SRT (Secure, Reliable, Transport)"
+desc_option_rist="Enable support for RIST (Reliable Internet Stream Transport)"
+desc_option_sofa="Enable support for AES SOFA"
+desc_option_webp="Enable support for WebP"
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";;
@@ -102,7 +106,6 @@ do_configure() {
$(vopt_enable pulseaudio libpulse) --enable-libfreetype --enable-libmodplug \
--enable-libspeex --enable-libcelt --enable-libass \
--enable-libopus --enable-librtmp --enable-libjack $(vopt_enable nvenc) \
- $(vopt_if faac '--enable-nonfree --enable-libfaac') \
$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
--disable-libopencore_amrnb --disable-libopencore_amrwb \
--disable-libopenjpeg \
From 65f0babe91b23343f145de363a691a8caa9fa69f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 28 Jun 2022 14:58:38 -0400
Subject: [PATCH 154/609] cinnamon-control-center: fix network settings
segfault
fixes #37723
---
.../patches/network-fix.patch | 58 +++++++++++++++++++
srcpkgs/cinnamon-control-center/template | 3 +-
2 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cinnamon-control-center/patches/network-fix.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/network-fix.patch b/srcpkgs/cinnamon-control-center/patches/network-fix.patch
new file mode 100644
index 000000000000..116c9a3058d3
--- /dev/null
+++ b/srcpkgs/cinnamon-control-center/patches/network-fix.patch
@@ -0,0 +1,58 @@
+From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 31 Jan 2022 08:56:28 -0500
+Subject: [PATCH] network: Remove old workaround for openvpn widgets.
+
+I can't reproduce the original issue anymore, and NMACertChooser
+is removed in network-manager-openvpn 1.8.34.
+
+Fixes #10616
+
+ref:
+6db4961fd3a002182984d0e71ec364c9befdd93b
+---
+ meson.build | 2 --
+ panels/network/cc-network-panel.c | 10 ----------
+ 2 files changed, 12 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f1f213b..c4d7d86 100644
+--- a/meson.build
++++ b/meson.build
+@@ -56,8 +56,6 @@ else
+ libnma= dependency('', required: false)
+ endif
+
+-config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0'))
+-
+ if get_option('modemmanager')
+ if not get_option('networkmanager')
+ error('*** NetworkManager is required by ModemManager ***')
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index a4289de..d1925e4 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -47,10 +47,6 @@
+ #include <libmm-glib.h>
+ #endif
+
+-#ifdef HAVE_NMA_18
+-#include <nma-cert-chooser.h>
+-#endif
+-
+ CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
+
+ #define NETWORK_PANEL_PRIVATE(o) \
+@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
+ return;
+ }
+
+-#ifdef HAVE_NMA_18
+- /* some newer VPN plugins pre-require internal resources from libnma */
+- /* this solution is really ugly, but works clean */
+- gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE));
+-#endif
+-
+ panel->priv->cancellable = g_cancellable_new ();
+
+ panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 692e838d5061..1449c05709fd 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=5.2.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel
@@ -19,6 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://github.com/linuxmint/cinnamon-control-center"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=977ac52cf8bcdea99c03c6455f29276a57a605839cf16d190db2088df243366d
+# requires X and wacom devices?
make_check=no
libcinnamon-control-center_package() {
From 8f25439e6561b2579655131c50c3b31d02e83fd2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 20 Jun 2022 13:13:33 -0700
Subject: [PATCH 155/609] ibus: update to 1.5.26
---
srcpkgs/ibus/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index f12d7ec92ed0..750470cea083 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,19 +1,20 @@
# Template file for 'ibus'
pkgname=ibus
-version=1.5.23
-revision=4
+version=1.5.26
+revision=1
build_style=gnu-configure
build_helper="gir"
-configure_args="--enable-ui --enable-gtk3 --disable-tests
- --disable-schemas-compile --enable-memconf --enable-dconf
- --enable-wayland --with-python=/usr/bin/python3
+configure_args="--enable-ui --enable-gtk3 --enable-gtk4
+ --disable-tests --disable-schemas-compile --disable-systemd-services
+ --enable-memconf --enable-dconf --enable-wayland
+ --with-python=/usr/bin/python3
$(vopt_enable dicts emoji-dict) $(vopt_enable dicts unicode-dict)
--enable-introspection --enable-vala $(vopt_enable ibus_setup setup)"
hostmakedepends="automake gettext-devel libtool pkg-config intltool dconf
python3 glib-devel $(vopt_if vala vala)
$(vopt_if dicts 'cldr-emoji-annotation unicode-character-database unicode-emoji')"
-makedepends="dconf-devel gtk+-devel hicolor-icon-theme iso-codes
- json-glib-devel libnotify-devel librsvg-devel python3-xdg
+makedepends="dconf-devel gtk+-devel gtk4-devel hicolor-icon-theme
+ iso-codes json-glib-devel libnotify-devel librsvg-devel python3-xdg
$(vopt_if vala vala) libXtst-devel"
depends="hicolor-icon-theme iso-codes dbus-x11 python3-xdg
$(vopt_if ibus_setup 'python3-gobject>=3.12.1_3')"
@@ -22,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/ibus/ibus"
distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
-checksum=b7e8d5bdb7d71a5ba4ee43cdf374675f77121a71c1679c9b9e7e02875bd0e150
+checksum=5c2fd118e7bfd4e9a42c3a20e6175a263426c90b6256f94989ed3d0384f4c9fc
build_options="ibus_setup dicts"
desc_option_ibus_setup="Enable support for building the ibus setup UI"
From 28aeebdd03337bc2433cdb82ded0ad034aba55f3 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Tue, 21 Jun 2022 17:02:57 -0400
Subject: [PATCH 156/609] sc-controller: update to 0.4.8.7.
---
srcpkgs/sc-controller/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sc-controller/template b/srcpkgs/sc-controller/template
index f1d641021f82..19ed5b512681 100644
--- a/srcpkgs/sc-controller/template
+++ b/srcpkgs/sc-controller/template
@@ -1,14 +1,15 @@
# Template file for 'sc-controller'
pkgname=sc-controller
-version=0.4.8.6
+version=0.4.8.7
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel zlib-devel"
-depends="gtk+3 python3-gobject python3-cairo python3-evdev"
+depends="gtk+3 python3-gobject python3-cairo python3-evdev python3-vdf"
+checkdepends="python3-pytest libusb-devel libXfixes libXext-devel python3-vdf"
short_desc="User-mode driver and GTK3 based GUI for Steam Controller"
maintainer="Henry Naguski <henry@nilsu.org>"
license="GPL-2.0-only"
homepage="https://github.com/Ryochan7/sc-controller"
distfiles="https://github.com/Ryochan7/sc-controller/archive/refs/tags/v$version.tar.gz"
-checksum=e6b8c736877acbee0a90acb3470650327c6c76ab9a4c13a3359356e6858943f5
+checksum=af96bc2f2a90207007bc5ed00c626a1927085bb2aab7efb373e7e4339d4d11ae
From 8caa105c792666b63e338eaddec8e1781c68eafa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 17 Jun 2022 21:48:53 +0300
Subject: [PATCH 157/609] eclipse: update to 4.24.
---
srcpkgs/eclipse/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index d365b6ff06e5..9bac719e07c9 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
# Template file for 'eclipse'
pkgname=eclipse
-version=4.23
+version=4.24
revision=1
#code name of version
-_release=2022-03
+_release=2022-06
archs="x86_64"
wrksrc="eclipse"
depends="openjdk11 gtk+3 webkit2gtk libXtst
@@ -19,7 +19,7 @@ _patch=R
_edition=java
_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=2905e74afac8ecbaaf2563d4c14a1a28100a7a03cb4b73b540df3607ee5bfa6f
+checksum=de5f4dc8ac87d6be77fee0d2f3cc447318fd9247551818cda80eff9cb330b60d
python_version=2
do_install() {
From 4e456ecbbaeb1d08579840dfb1bc770258ca098e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 16 Jun 2022 22:47:16 +0200
Subject: [PATCH 158/609] wireshark: update to 3.6.6.
---
srcpkgs/wireshark/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index 4d0d23c7ed50..28adc9aadaae 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
# Template file for 'wireshark'
pkgname=wireshark
-version=3.6.3
+version=3.6.6
revision=1
build_style=cmake
hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.wireshark.org"
distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
-checksum=b60364a4c0068a10811ab3fd075ca6c1eb0e75d44600271b88a20ed93a2ef631
+checksum=beba27aeb4d3bb78df6202e88dda69e1dba9b0561044957bcac47e68b6ac28ba
system_groups="wireshark"
CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
From 88830dddcbb663b598b0d9fc20342149098e1777 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 18 Jun 2022 20:03:59 -0400
Subject: [PATCH 159/609] New package: tio-1.40
Closes: #37619 [via git-merge-pr]
---
srcpkgs/tio/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/tio/template
diff --git a/srcpkgs/tio/template b/srcpkgs/tio/template
new file mode 100644
index 000000000000..8b6cd9669585
--- /dev/null
+++ b/srcpkgs/tio/template
@@ -0,0 +1,18 @@
+# Template file for 'tio'
+pkgname=tio
+version=1.40
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="inih-devel"
+short_desc="Simple serial device I/O tool"
+maintainer="0x5c <dev@0x5c.io>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/tio/tio"
+changelog="https://github.com/tio/tio/raw/master/ChangeLog"
+distfiles="https://github.com/tio/tio/archive/refs/tags/v${version}.tar.gz"
+checksum=1fe3631b9236155818cdb9bac28435499a3701a97b193c5165275952c9f56da5
+
+post_install() {
+ vcompletion "build/src/bash-completion/tio" bash tio
+}
From cfa979dec86a9022b2e4e689cc37ba199a6d90cd Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jun 2022 21:45:55 +0200
Subject: [PATCH 160/609] perl-Specio: update to 0.48
---
srcpkgs/perl-Specio/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Specio/template b/srcpkgs/perl-Specio/template
index b8eb77e5e2c1..fc2dd72e39ec 100644
--- a/srcpkgs/perl-Specio/template
+++ b/srcpkgs/perl-Specio/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Specio'
pkgname=perl-Specio
-version=0.47
-revision=2
+version=0.48
+revision=1
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -14,4 +14,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="Artistic-2.0"
homepage="https://metacpan.org/release/Specio"
distfiles="${CPAN_SITE}/Test/Specio-${version}.tar.gz"
-checksum=f41307f14444f8777e572f27eeb6a964084399e7e382c47c577827ad8a286a1c
+checksum=0c85793580f1274ef08173079131d101f77b22accea7afa8255202f0811682b2
From 19e107a098269b9a1b61fa8d5a3a9adb5484f24b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jun 2022 21:44:30 +0200
Subject: [PATCH 161/609] perl-Test-Time: update to 0.092
---
srcpkgs/perl-Test-Time/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Test-Time/template b/srcpkgs/perl-Test-Time/template
index fad5a2abe5c6..0ed775292773 100644
--- a/srcpkgs/perl-Test-Time/template
+++ b/srcpkgs/perl-Test-Time/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Test-Time'
pkgname=perl-Test-Time
-version=0.08
-revision=2
+version=0.092
+revision=1
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Test-Time"
distfiles="${CPAN_SITE}/Test/${pkgname#perl-}-${version}.tar.gz"
-checksum=b8bc3b074bb2247e8588399c1e55d071f049cf6ce1c8b4192c38cf3c24559548
+checksum=30d90f54ce840893c7ba2cac2a4d1eecd4c9cdf805910c595e3ae89dfd644738
From 42af2947f07a58f80d9a605baa85c3260920c6aa Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 11 Jun 2022 09:48:18 -0700
Subject: [PATCH 162/609] runc: update to 1.1.3
---
srcpkgs/runc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 35f011484e72..ef7d7995d07a 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,6 +1,6 @@
# Template file for 'runc'
pkgname=runc
-version=1.1.2
+version=1.1.3
revision=1
build_style=go
go_import_path=github.com/opencontainers/runc
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/opencontainers/runc"
distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz"
-checksum=78ad532465ce4c2802480644a8756c30ae99c1bf779f0243af4bca11c4d041de
+checksum=2db1f3a01ffd2f8fa3a259b9b512ca7d4dbf89be5765cc58d306e45658668453
post_build() {
make man
From df367bacbad8d03aead5ff537f2276e9f3419f0e Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 11 Jun 2022 13:19:58 +0200
Subject: [PATCH 163/609] k3d: update to 5.4.3.
---
srcpkgs/k3d/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index cb772ac1b27b..0be3def4f63d 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,6 +1,6 @@
# Template file for 'k3d'
pkgname=k3d
-version=5.4.1
+version=5.4.3
revision=1
build_style=go
build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://k3d.io/"
distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
-checksum=606cf8fc8d2732e87e92cc9e67d73e64eb73c5e093193cc03172cbba685e0ee0
+checksum=003461822e2f1987394040711d423e44f56f2de5250962fbcee67c765ef8474b
_completions="bash zsh fish"
post_build() {
From bd005adaf9bd11f0bba7dfd02b8b8ac36327ee02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 11 Jun 2022 13:16:12 +0200
Subject: [PATCH 164/609] ruplacer: update to 0.8.0.
Closes: #37511 [via git-merge-pr]
---
srcpkgs/ruplacer/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ruplacer/template b/srcpkgs/ruplacer/template
index 226155a2452a..9cf7468413e4 100644
--- a/srcpkgs/ruplacer/template
+++ b/srcpkgs/ruplacer/template
@@ -1,14 +1,15 @@
# Template file for 'ruplacer'
pkgname=ruplacer
-version=0.6.4
+version=0.8.0
revision=1
build_style=cargo
short_desc="Find and replace text in source files"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="BSD-3-Clause"
homepage="https://github.com/dmerejkowsky/ruplacer"
+changelog="https://github.com/your-tools/ruplacer/raw/main/CHANGELOG.md"
distfiles="https://github.com/dmerejkowsky/ruplacer/archive/refs/tags/v${version}.tar.gz"
-checksum=4f66e8970942e55dc287c585eef7a21394aefa49df746cef429f9e5bc6714c7a
+checksum=7109bf19c0f62ec477c952c1c509353f7c6abd19deb9169384ebc9d21ad71dc7
post_install() {
vlicense LICENSE
From 7aafc9b54b80b07a900a49c09abe830aef76f544 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Sun, 5 Jun 2022 00:04:19 +0200
Subject: [PATCH 165/609] gnupg: update to 2.2.35
---
srcpkgs/gnupg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index e62820c88888..77767cf0a22a 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,6 +1,6 @@
# Template file for 'gnupg'
pkgname=gnupg
-version=2.2.34
+version=2.2.35
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable ldap)
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnupg.org/"
distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
-checksum=562a3350dcf66cb67c5825c67ff2c2904db1e30ec8e1d353adc14efba9abf43f
+checksum=340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690
build_options="ldap"
build_options_default="ldap"
From 3b45f6f0cf685285571254a581d93995501022f8 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 28 Jun 2022 17:14:43 +0530
Subject: [PATCH 166/609] gef: update to 2022.06
---
srcpkgs/gef/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index 5f000d87b7b9..1309b0c7bffa 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,15 +1,15 @@
# Template file for 'gef'
pkgname=gef
-version=2022.01
+version=2022.06
revision=1
pycompile_dirs="usr/lib/gef"
depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
short_desc="GDB Enhanced Features for exploit devs & reversers"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
-homepage="https://gef.readthedocs.io/en/master/"
+homepage="https://hugsy.github.io/gef/"
distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=bb1070dfee440577927d7fa1aa5d310d9fb7297d87ffd786ee63cc6ae7f0f177
+checksum=ae93f55c081753203b05f427ba0fa9e9e92d25139e10e946a081cd5d6a379329
python_version="3"
do_install() {
From f7076950ef0fa50440bc347e281d84aa3375a9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 29 Jun 2022 12:06:57 +0200
Subject: [PATCH 167/609] yt-dlp: update to 2022.06.29.
---
srcpkgs/yt-dlp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index f81a997bcd5c..fe0b4d4bc732 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
# Template file for 'yt-dlp'
pkgname=yt-dlp
-version=2022.06.22.1
+version=2022.06.29
revision=1
wrksrc="$pkgname"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
homepage="https://github.com/yt-dlp/yt-dlp"
changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=fac29d5a8d4c2f1317ba5c2fc4231cf169887bcef26d0fbf0481c90ddb7826db
+checksum=3b0aa20659b7ba35a9d74b4d35e7fa1fbe13f4d3a30c3970fd2bf4ac087c407c
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 9523576b3456a32d675620971f9d8bf45650472a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 28 Jun 2022 21:17:36 -0400
Subject: [PATCH 168/609] watchexec: update to 1.20.2
---
srcpkgs/watchexec/patches/fix-tests.patch | 14 ++++++++++++++
srcpkgs/watchexec/template | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/watchexec/patches/fix-tests.patch
diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
new file mode 100644
index 000000000000..f210de15e314
--- /dev/null
+++ b/srcpkgs/watchexec/patches/fix-tests.patch
@@ -0,0 +1,14 @@
+# Remove debug notice from test case
+diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
+index b55782f022..c5642f98ce 100644
+--- a/crates/cli/tests/snapshots/help__help_unix.snap
++++ b/crates/cli/tests/snapshots/help__help_unix.snap
+@@ -2,8 +2,6 @@
+ source: crates/cli/tests/help.rs
+ expression: "String::from_utf8(output.stdout).unwrap()"
+ ---
+-⚠ DEBUG BUILD ⚠
+-
+ watchexec 1.20.2
+ Execute commands when watched files change
+
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 6e872efcd8ee..4bd08d626870 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
# Template file for 'watchexec'
pkgname=watchexec
-version=1.20.0
+version=1.20.2
revision=1
wrksrc="${pkgname}-cli-v${version}"
build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
license="Apache-2.0"
homepage="https://github.com/watchexec/watchexec"
distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=69c551090692a04943e7ded2d7f997f8777aa099c674b096a31d94983d02dbf7
+checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 596f2a13e05b7d3ae999fd91ae42b691a930ac39 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 28 Jun 2022 21:15:33 -0400
Subject: [PATCH 169/609] Manual.md: fix working directories of build phases
---
Manual.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Manual.md b/Manual.md
index 26e3b9f43413..d8358565893c 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1133,9 +1133,9 @@ Current working directory for functions is set as follows:
- For do_fetch, post_fetch: `XBPS_BUILDDIR`.
-- For do_extract, post_extract: `wrksrc`.
+- For do_extract through do_patch: `wrksrc`.
-- For pre_patch through post_install: `build_wrksrc`
+- For post_patch through post_install: `build_wrksrc`
if it is defined, otherwise `wrksrc`.
<a id="build_options"></a>
From 6389a3eb7844f7bf4d2d888402be8850c6505285 Mon Sep 17 00:00:00 2001
From: wrest64 <mrh64@pm.me>
Date: Tue, 28 Jun 2022 22:26:26 -0400
Subject: [PATCH 170/609] slock: added line in build section of template to
factor in config.h
---
srcpkgs/slock/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template
index df12400b6c98..481c5b86d168 100644
--- a/srcpkgs/slock/template
+++ b/srcpkgs/slock/template
@@ -12,6 +12,7 @@ distfiles="http://dl.suckless.org/tools/slock-${version}.tar.gz"
checksum=b53849dbc60109a987d7a49b8da197305c29307fd74c12dc18af0d3044392e6a
do_build() {
+ [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
From a8f2f6b94075855b71107f9952eb63996b54b997 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 14:03:43 +0200
Subject: [PATCH 171/609] harfbuzz: update to 4.4.1.
---
srcpkgs/harfbuzz/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 5eb9dd8310f9..4899fd5a1c38 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
-version=4.3.0
+version=4.4.1
revision=1
build_style=meson
build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT"
homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530
+checksum=c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee
libharfbuzz_package() {
short_desc+=" - runtime library"
From 79e2c4653b1bf26fbce7c44f855ab456edabc758 Mon Sep 17 00:00:00 2001
From: Skylar Hill <stellarskylark@posteo.net>
Date: Tue, 28 Jun 2022 02:12:21 -0500
Subject: [PATCH 172/609] fillets-ng: include game data
Closes: #37720 [via git-merge-pr]
---
srcpkgs/fillets-ng/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/fillets-ng/template b/srcpkgs/fillets-ng/template
index 8db27477c3c4..83741590c011 100644
--- a/srcpkgs/fillets-ng/template
+++ b/srcpkgs/fillets-ng/template
@@ -1,7 +1,7 @@
# Template file for 'fillets-ng'
pkgname=fillets-ng
version=1.0.1
-revision=2
+revision=3
create_wrksrc=yes
build_wrksrc="fillets-ng-${version}"
build_style=gnu-configure
@@ -16,3 +16,8 @@ distfiles="${SOURCEFORGE_SITE}/fillets/fillets-ng-${version}.tar.gz
checksum="329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da
f0c979fb35ec550a43246fc209add8f45ca550a382c94d6383bb3f01b1073799"
replaces="fillets-ng-data>=0"
+
+post_install() {
+ vmkdir usr/share/games/fillets-ng
+ vcopy "$wrksrc/fillets-ng-data-${version}/*" usr/share/games/fillets-ng
+}
From 3d4d49f26287d43ccb3e43bccc8850474c6541d5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 14:33:49 +0200
Subject: [PATCH 173/609] macchanger: use debian patches
The project hasn't been updated for 8 years and there are some
important bugs to be fixed.
Closes: https://github.com/void-linux/void-packages/issues/36245
---
srcpkgs/macchanger/template | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/macchanger/template b/srcpkgs/macchanger/template
index 9af205a0d0f4..6bba11bcb3fe 100644
--- a/srcpkgs/macchanger/template
+++ b/srcpkgs/macchanger/template
@@ -1,13 +1,27 @@
# Template file for 'macchanger'
pkgname=macchanger
version=1.7.0
-revision=3
+revision=4
+create_wrksrc=yes
+build_wrksrc="macchanger-${version}"
build_style=gnu-configure
configure_script="./autogen.sh"
hostmakedepends="automake texinfo"
short_desc="Small utility to change your NIC's MAC address"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/macchanger"
-distfiles="https://github.com/alobbs/macchanger/archive/${version}.tar.gz"
-checksum=1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f
+distfiles="https://github.com/alobbs/macchanger/archive/${version}.tar.gz
+ http://deb.debian.org/debian/pool/main/m/macchanger/macchanger_1.7.0-5.4.debian.tar.xz"
+checksum="1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f
+ a5f48390eb4cb50f16898740e99e38671957a3d5360105986ff0ee41db46383f"
+
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+post_patch() {
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/02-fix_usage_message.patch
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/06-update_OUI_list.patch
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/08-fix_random_MAC_choice.patch
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/check-random-device-read-errors.patch
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/verify-changed-MAC.patch
+}
From 9c22a690cbfbb7f4feadb94794bf8186146254fe Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 29 Jun 2022 17:48:57 +0530
Subject: [PATCH 174/609] black: update to 22.6.0.
Adopt.
---
srcpkgs/black/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index c197da7cc670..6e4a1f15fcab 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,6 +1,6 @@
# Template file for 'black'
pkgname=black
-version=22.3.0
+version=22.6.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-setuptools_scm"
@@ -8,21 +8,22 @@ depends="python3-click python3-platformdirs python3-tomli python3-pathspec pytho
checkdepends="${depends} python3-pytest-xdist python3-aiohttp python3-colorama python3-uvloop
python3-ipython python3-tokenize-rt"
short_desc="Uncompromising Python code formatter"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/psf/black"
changelog="https://raw.githubusercontent.com/psf/black/main/CHANGES.md"
distfiles="${PYPI_SITE}/b/black/black-${version}.tar.gz"
-checksum=35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79
+checksum=6c6d39e28aed379aec40da1c65434c77d75e65bb59a1e1c283de545fb4e7c6c9
do_check() {
- PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional jupyter \
- -m jupyter --deselect=tests/test_ipynb.py::test_set_input
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional jupyter -m jupyter
pyver=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
mv ${XBPS_MASTERDIR}/usr/lib/python${pyver}/site-packages/IPython ${XBPS_MASTERDIR}/tmp/IPython.bak
PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional no_jupyter
mv ${XBPS_MASTERDIR}/tmp/IPython.bak ${XBPS_MASTERDIR}/usr/lib/python${pyver}/site-packages/IPython
+
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m black --check src tests setup.py
}
post_install() {
From e5ab3a5b4981f27b79d556074ee3fd756daf676c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 14:40:48 +0200
Subject: [PATCH 175/609] macchanger: fix post_patch patch arguments
---
srcpkgs/macchanger/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/macchanger/template b/srcpkgs/macchanger/template
index 6bba11bcb3fe..b0363f1f70ce 100644
--- a/srcpkgs/macchanger/template
+++ b/srcpkgs/macchanger/template
@@ -1,7 +1,7 @@
# Template file for 'macchanger'
pkgname=macchanger
version=1.7.0
-revision=4
+revision=5
create_wrksrc=yes
build_wrksrc="macchanger-${version}"
build_style=gnu-configure
@@ -19,9 +19,9 @@ checksum="1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f
patch_args="-Np1 --directory=${build_wrksrc}"
post_patch() {
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/02-fix_usage_message.patch
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/06-update_OUI_list.patch
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/08-fix_random_MAC_choice.patch
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/check-random-device-read-errors.patch
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/verify-changed-MAC.patch
+ patch -Np1 <../debian/patches/02-fix_usage_message.patch
+ patch -Np1 <../debian/patches/06-update_OUI_list.patch
+ patch -Np1 <../debian/patches/08-fix_random_MAC_choice.patch
+ patch -Np1 <../debian/patches/check-random-device-read-errors.patch
+ patch -Np1 <../debian/patches/verify-changed-MAC.patch
}
From 6d6993f49249943e5d01aa8cd614b21eedc6256e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 16:12:44 +0200
Subject: [PATCH 176/609] xscreensaver: add xscreensaver-elogind subpackage
Closes: https://github.com/void-linux/void-packages/issues/36208
---
srcpkgs/xscreensaver-elogind | 1 +
srcpkgs/xscreensaver/template | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/xscreensaver-elogind
diff --git a/srcpkgs/xscreensaver-elogind b/srcpkgs/xscreensaver-elogind
new file mode 120000
index 000000000000..6a813cf9fee2
--- /dev/null
+++ b/srcpkgs/xscreensaver-elogind
@@ -0,0 +1 @@
+xscreensaver
\ No newline at end of file
diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 55d3f744c1d6..723bccd5460c 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,7 +1,7 @@
# Template file for 'xscreensaver'
pkgname=xscreensaver
version=6.04
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-pam --with-login-manager
--includedir=${XBPS_CROSS_BASE}/include
@@ -9,7 +9,7 @@ configure_args="--with-pam --with-login-manager
conf_files="/etc/pam.d/xscreensaver"
hostmakedepends="bc intltool pkg-config"
makedepends="glu-devel libXi-devel libXinerama-devel libXmu-devel libXpm-devel
- libXrandr-devel libglade-devel pam-devel gdk-pixbuf-xlib-devel"
+ libXrandr-devel libglade-devel pam-devel gdk-pixbuf-xlib-devel elogind-devel"
depends="perl perl-LWP"
short_desc="Screen saver and locker for the X Window System"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -35,3 +35,11 @@ do_install() {
sed '/^$/q' < driver/xscreensaver.c > LICENSE
vlicense LICENSE
}
+
+xscreensaver-elogind_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - elogind support"
+ pkg_install() {
+ vmove usr/libexec/xscreensaver/xscreensaver-systemd
+ }
+}
From ebbf97b37db5272c197634ae6f513f067ce1be6c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 15 May 2022 19:35:06 +0300
Subject: [PATCH 177/609] enlightenment: update to 0.25.3.
---
srcpkgs/enlightenment/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index 87e27274b4a1..66bc8539c815 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -1,6 +1,6 @@
# Template file for 'enlightenment'
pkgname=enlightenment
-version=0.25.2
+version=0.25.3
revision=1
build_style=meson
configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
@@ -16,7 +16,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="BSD-2-Clause"
homepage="http://enlightenment.org"
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=123a06815e41453deddf22ad8373c72e652b3c6553385d16fe27e51ede5e3811
+checksum=37fd49ebb537216a18efe69d5c5511e118f9cdacb5652807769331707be4cff6
lib32disabled=yes
build_options="wayland"
build_options_default="wayland"
From d3d380d28d6581a044caead3ffb69808766aa722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 11 Jun 2022 13:45:01 +0200
Subject: [PATCH 178/609] New package: hatchling-1.3.1
---
srcpkgs/hatchling/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/hatchling/template
diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template
new file mode 100644
index 000000000000..894c15c8f719
--- /dev/null
+++ b/srcpkgs/hatchling/template
@@ -0,0 +1,18 @@
+# Template file for 'hatchling'
+pkgname=hatchling
+version=1.3.1
+revision=1
+build_style=python3-pep517
+_deps="python3-pathspec python3-tomli python3-pluggy python3-packaging"
+hostmakedepends="python3-setuptools ${_deps}"
+depends="${_deps}"
+short_desc="Extensible, standards compliant build backend used by Hatch"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://hatch.pypa.io/latest/"
+distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=aaa63019c9d666053d9ff318097335e766123844547c52940155c0401c3c142f
+
+post_install() {
+ vlicense LICENSE.txt
+}
From f1afb63528a66955d3c8b40b28bfc728cefe60cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 11 Jun 2022 14:06:41 +0200
Subject: [PATCH 179/609] New package: python3-tomli-w-1.0.0
---
srcpkgs/python3-tomli-w/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-tomli-w/template
diff --git a/srcpkgs/python3-tomli-w/template b/srcpkgs/python3-tomli-w/template
new file mode 100644
index 000000000000..6268e501aedf
--- /dev/null
+++ b/srcpkgs/python3-tomli-w/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-tomli-w'
+pkgname=python3-tomli-w
+version=1.0.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+checkdepends="python3-pytest python3-tomli"
+short_desc="Lil' python TOML writer"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/hukkin/tomli-w"
+changelog="https://github.com/hukkin/tomli-w/raw/master/CHANGELOG.md"
+distfiles="https://github.com/hukkin/tomli-w/archive/refs/tags/${version}.tar.gz"
+checksum=4fe1fb4696899c01356ef4e028c975103abf62e5fa9472f31f1714100f1b065d
+
+post_install() {
+ vlicense LICENSE
+}
From df1f9502d8b583524de49538da1a708a99bc5df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 11 Jun 2022 14:20:44 +0200
Subject: [PATCH 180/609] New package: hatch-1.2.1
---
srcpkgs/hatch/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/hatch/template
diff --git a/srcpkgs/hatch/template b/srcpkgs/hatch/template
new file mode 100644
index 000000000000..f8b068a2a713
--- /dev/null
+++ b/srcpkgs/hatch/template
@@ -0,0 +1,37 @@
+# Template file for 'hatch'
+pkgname=hatch
+version=1.2.1
+revision=1
+build_style=python3-pep517
+make_check_args="--deselect tests/backend/test_build.py::test_editable
+ --deselect tests/backend/builders/test_custom.py::test_default
+ --deselect tests/backend/builders/test_custom.py::test_explicit_path
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_default_auto_detection
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_default
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_default_extra_dependencies
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_default_force_include
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_exact
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_exact_extra_dependencies
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_exact_force_include
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_pth
+ --deselect tests/cli/run/test_run.py::test_scripts_no_environment
+ --deselect tests/backend/dep/test_core.py::test_unknown_extra
+ --deselect tests/backend/dep/test_core.py::test_extra_met"
+hostmakedepends="hatchling"
+depends="python3-atomicwrites python3-click hatchling python3-httpx
+ python3-keyring python3-pexpect python3-platformdirs python3-pyperclip
+ python3-rich python3-tomli-w python3-tomlkit python3-userpath
+ python3-virtualenv"
+checkdepends="${depends} python3-pytest python3-pytest-mock
+ python3-pytest-xdist git python3-pip"
+short_desc="Modern, extensible Python project management "
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://hatch.pypa.io/latest/"
+distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=61761e1fe14474fb2be7e264555b99fc343b4e63c0ee32aa3497c651e4cdec03
+make_check_pre="env PYTHONPATH=./src"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 3db6caaee225b76c4243b9e72f7556b475434c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 26 Jun 2022 16:45:06 +0200
Subject: [PATCH 181/609] New package: hatch-vcs-0.2.0
---
srcpkgs/hatch-vcs/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/hatch-vcs/template
diff --git a/srcpkgs/hatch-vcs/template b/srcpkgs/hatch-vcs/template
new file mode 100644
index 000000000000..adac314297e0
--- /dev/null
+++ b/srcpkgs/hatch-vcs/template
@@ -0,0 +1,24 @@
+# Template file for 'hatch-vcs'
+pkgname=hatch-vcs
+version=0.2.0
+revision=1
+wrksrc="${pkgname/-/_}-${version}"
+build_style=python3-pep517
+make_check_args="--deselect tests/test_build.py::test_basic
+ --deselect tests/test_build.py::test_write
+ --deselect tests/test_build.py::test_fallback"
+hostmakedepends="hatchling"
+depends="hatchling python3-setuptools_scm"
+checkdepends="${depends} python3-pytest git"
+short_desc="Hatch plugin for VCS based versioning"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/ofek/hatch-vcs"
+changelog="https://github.com/ofek/hatch-vcs/raw/master/HISTORY.md"
+distfiles="${PYPI_SITE}/h/${pkgname/-/_}/${pkgname/-/_}-${version}.tar.gz"
+checksum=9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff
+make_check_pre="env PYTHONPATH=./"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From ba2858bd3502e0f374c8c0c02f83c6d5bb2687dd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 18:54:13 +0200
Subject: [PATCH 182/609] ferm: update to 2.7.
---
srcpkgs/ferm/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ferm/template b/srcpkgs/ferm/template
index 3b623d0dd0cc..9cdac4712eb6 100644
--- a/srcpkgs/ferm/template
+++ b/srcpkgs/ferm/template
@@ -1,15 +1,21 @@
# Template file for 'ferm'
pkgname=ferm
-version=2.6
+version=2.7
revision=1
hostmakedepends="perl"
depends="perl iptables"
+checkdepends="perl-Net-DNS-Resolver-Mock"
short_desc="Frontend for iptables"
maintainer="johannes <johannes.brechtmann@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://ferm.foo-projects.org/"
+changelog="https://github.com/MaxKellermann/ferm/raw/master/NEWS"
distfiles="http://ferm.foo-projects.org/download/${version:0:3}/ferm-${version}.tar.xz"
-checksum=689541465e7c073cbd604c9cd18f113c31c0b41bb12614726a59b17e44058885
+checksum=c00d910d5394e69675608eb5ee0f504d5cfda41e990a2d9a91baac6df93e3f92
+
+do_check() {
+ make check
+}
do_install() {
make install PREFIX=${DESTDIR}/usr
From c0044cb5aa77ffbac35fce361abba5631c58abed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jun 2022 17:31:38 +0200
Subject: [PATCH 183/609] zsh: backport https://zsh.org/workers/50325
---
srcpkgs/zsh/patches/50325.patch | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/zsh/patches/50325.patch
diff --git a/srcpkgs/zsh/patches/50325.patch b/srcpkgs/zsh/patches/50325.patch
new file mode 100644
index 000000000000..6d2007023bc2
--- /dev/null
+++ b/srcpkgs/zsh/patches/50325.patch
@@ -0,0 +1,31 @@
+Author: Bart Schaefer <schaefer@zsh.org>
+Date: Fri Jun 3 20:08:15 2022 -0700
+
+ 50325: revert 38150 and fix in calling function cfp_matcher_range() instead
+
+diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
+index bb8359f1d..56e5509a4 100644
+--- a/Src/Zle/compmatch.c
++++ b/Src/Zle/compmatch.c
+@@ -1319,7 +1319,7 @@ pattern_match_equivalence(Cpattern lp, convchar_t wind, int wmtp,
+ convchar_t lchr;
+ int lmtp;
+
+- if (!PATMATCHINDEX(lp->u.str, wind, &lchr, &lmtp)) {
++ if (!PATMATCHINDEX(lp->u.str, wind-1, &lchr, &lmtp)) {
+ /*
+ * No equivalent. No possible match; give up.
+ */
+diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
+index 59abb4cc4..77ccdebf7 100644
+--- a/Src/Zle/computil.c
++++ b/Src/Zle/computil.c
+@@ -4383,7 +4383,7 @@ cfp_matcher_range(Cmatcher *ms, char *add)
+ * word pattern.
+ */
+ if ((ind = pattern_match_equivalence
+- (m->word, ind, mt, addc)) != CHR_INVALID) {
++ (m->word, ind+1, mt, addc)) != CHR_INVALID) {
+ if (ret) {
+ if (imeta(ind)) {
+ *p++ = Meta;
From 1b704d1b703134d70811c9661174a0ae71e10dfd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jun 2022 18:51:39 +0200
Subject: [PATCH 184/609] python3-pipx: update to 1.1.0.
---
srcpkgs/python3-pipx/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index b20d67772463..597395ceda37 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,18 +1,18 @@
# Template file for 'python3-pipx'
pkgname=python3-pipx
-version=1.0.0
+version=1.1.0
revision=1
wrksrc="pipx-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-argcomplete python3-userpath python3-setuptools python3-packaging"
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-argcomplete python3-packaging python3-userpath"
short_desc="Install and Run Python Applications in Isolated Environments"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://pypa.github.io/pipx/"
changelog="https://pypa.github.io/pipx/changelog/"
distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=91e2bca934a5e82785d7b4ae44b95553611311691bd87da31915d08a0ad2df1c
+checksum=4d2f70daf15f121e90b7394b0730ee82fc39d7da514e50a7bbf8066be88883bb
post_install() {
vlicense LICENSE
From 2fd359e89342f088ccd21f4aeef99c0042918d16 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jun 2022 18:55:29 +0200
Subject: [PATCH 185/609] python3-pipenv: update to 2022.6.7.
---
srcpkgs/python3-pipenv/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 70e3a8914830..14330c5ee440 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pipenv'
pkgname=python3-pipenv
-version=2022.5.2
+version=2022.6.7
revision=1
wrksrc="pipenv-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
depends="python3 python3-pip python3-virtualenv python3-virtualenv-clone"
short_desc="Python Development Workflow for Humans"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/pypa/pipenv"
changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=71d510c20f99ea5cd3c951f8203140197bcc79fc21a0d74924f97c726a0f2bd3
+checksum=6ac0e7a8bbe02859d46c53c03d3f33136bbf49c8c7d9a6d818409e17a604eda0
conflicts="python-pipenv>=0"
post_extract() {
From 574b708e8efbc3c3a742f20ddf91837a4f1ba444 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jun 2022 18:56:50 +0200
Subject: [PATCH 186/609] mcelog: update to 183.
---
srcpkgs/mcelog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 53d5330e5dc3..cd5d0df82e44 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
# Template file for 'mcelog'
pkgname=mcelog
-version=182
+version=183
revision=1
archs="i686* x86_64*"
hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://www.mcelog.org/"
distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=ed934229ce45c1ab730fa50bc8502b649a02609c392856a8b14b951190b1475c
+checksum=1112843bc5b7451f782b06fd4da165d5ee035a2b2402a10b5ca3535002c43d81
do_build() {
make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}
From eb6cb4b0b05ade2900d26737abf1e15db128dfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 29 Jun 2022 19:02:24 +0200
Subject: [PATCH 187/609] btop: update to 1.2.8.
---
srcpkgs/btop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/btop/template b/srcpkgs/btop/template
index 62247c367b53..4935494bb04f 100644
--- a/srcpkgs/btop/template
+++ b/srcpkgs/btop/template
@@ -1,6 +1,6 @@
# Template file for 'btop'
pkgname=btop
-version=1.2.7
+version=1.2.8
revision=1
build_style=gnu-makefile
short_desc="Monitor of resources"
@@ -9,4 +9,4 @@ license="Apache-2.0"
homepage="https://github.com/aristocratos/btop"
changelog="https://raw.githubusercontent.com/aristocratos/btop/main/CHANGELOG.md"
distfiles="https://github.com/aristocratos/btop/archive/refs/tags/v${version}.tar.gz"
-checksum=60075824ca4e14c1ca920b76ffb101fc2340c5342f3ba600b5c280389b69bbbf
+checksum=7944b06e3181cc1080064adf1e9eb4f466af0b84a127df6697430736756a89ac
From cbd9468f1d2b70df8b86617939bd1175882440c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 29 Jun 2022 17:41:55 +0200
Subject: [PATCH 188/609] homebank: update to 5.5.6.
---
srcpkgs/homebank/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 84f52ed2fa7a..d203a7234f3c 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
# Template file for 'homebank'
pkgname=homebank
-version=5.5.5
+version=5.5.6
revision=1
build_style=gnu-configure
hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://homebank.free.fr/"
distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=bece05ecb52392147424aa1e5a179389777b82bf468abebd73eb70b2af9c9e67
+checksum=460e8e8c72e4c152039d7ab3a8f5c0f03c6a49dae1d93e95fe02c1343f2fc7da
post_patch() {
vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From 437574e42ca4e9e29f8546e5b5f3bb408043702f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 26 Jun 2022 16:34:19 +0200
Subject: [PATCH 189/609] neovim: update to 0.7.2.
---
srcpkgs/neovim/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 63c9247030f7..c29b7b6885a1 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,6 +1,6 @@
# Template file for 'neovim'
pkgname=neovim
-version=0.7.0
+version=0.7.2
revision=1
build_style=cmake
build_helper="qemu"
@@ -14,7 +14,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df
+checksum=ccab8ca02a0c292de9ea14b39f84f90b635a69282de38a6b4ccc8565bc65d096
alternatives="
vi:vi:/usr/bin/nvim
From 8e27f36d20c413aab98722e8ccabc69136a9f178 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 22:42:52 +0200
Subject: [PATCH 190/609] valgrind: update to 3.19.0.
---
srcpkgs/valgrind/patches/str_tester.patch | 22 -------------------
.../patches/tc20_verifywrap_musl.patch | 11 ----------
srcpkgs/valgrind/patches/test_statx.patch | 18 ---------------
srcpkgs/valgrind/template | 7 +++---
4 files changed, 4 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/valgrind/patches/str_tester.patch
delete mode 100644 srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
delete mode 100644 srcpkgs/valgrind/patches/test_statx.patch
diff --git a/srcpkgs/valgrind/patches/str_tester.patch b/srcpkgs/valgrind/patches/str_tester.patch
deleted file mode 100644
index cbf64a95e02b..000000000000
--- a/srcpkgs/valgrind/patches/str_tester.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-rawmemchar is not available on musl, guard it with defined(__GLIBC__)
-
---- a/memcheck/tests/str_tester.c 2021-10-10 14:17:32.000000000 +0000
-+++ b/memcheck/tests/str_tester.c 2021-11-16 19:37:26.950006442 +0000
-@@ -504,7 +504,7 @@
- #endif
-
- // DDD: better done by testing for the function.
--#if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
-+#if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
- static void
- test_rawmemchr (void)
- {
-@@ -1451,7 +1451,7 @@
- test_strchrnul ();
- # endif
-
--# if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
-+# if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
- /* rawmemchr. */
- test_rawmemchr ();
- # endif
diff --git a/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch b/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
deleted file mode 100644
index ad12ba01302b..000000000000
--- a/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/helgrind/tests/tc20_verifywrap.c 2021-11-16 21:01:30.020008847 +0000
-+++ b/helgrind/tests/tc20_verifywrap.c 2021-11-16 21:02:22.140008872 +0000
-@@ -20,7 +20,7 @@
-
- #if !defined(__APPLE__) && !defined(__FreeBSD__)
-
--#if defined(__sun__)
-+#if defined(__sun__) || !defined(__GLIBC__)
- /* Fake __GLIBC_PREREQ on Solaris. Pretend glibc >= 2.4. */
- # define __GLIBC_PREREQ
- #else
diff --git a/srcpkgs/valgrind/patches/test_statx.patch b/srcpkgs/valgrind/patches/test_statx.patch
deleted file mode 100644
index 7deb78fc9793..000000000000
--- a/srcpkgs/valgrind/patches/test_statx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/memcheck/tests/linux/sys-statx.c 2021-01-21 15:09:33.000000000 +0000
-+++ b/memcheck/tests/linux/sys-statx.c 2021-11-16 20:26:33.970007848 +0000
-@@ -7,11 +7,15 @@
- #include <assert.h>
- #include <string.h>
- #include <sys/syscall.h>
-+#if defined(__GLIBC__)
- #if __GLIBC_PREREQ(2,28)
- /* struct statx provided in sys/stat.h */
- #else
- #include <linux/stat.h>
- #endif
-+#else
-+#include <linux/stat.h>
-+#endif
- #include <errno.h>
-
- int check_stat2;
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 0f4a2c4ba1f8..055e3ca6e520 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,6 +1,6 @@
# Template file for 'valgrind'
pkgname=valgrind
-version=3.18.1
+version=3.19.0
revision=1
build_style=gnu-configure
configure_args="--enable-tls --without-mpicc --enable-lto=yes"
@@ -8,11 +8,12 @@ hostmakedepends="automake perl pkg-config"
makedepends="libgomp-devel"
depends="perl"
short_desc="Tool for finding memory management bugs in programs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://valgrind.org/"
+changelog="https://valgrind.org/docs/manual/dist.news.html"
distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5
+checksum=dd5e34486f1a483ff7be7300cc16b4d6b24690987877c3278d797534d6738f02
CFLAGS="-fno-stack-protector"
CXXFLAGS="-fno-stack-protector"
From a9a3aa51159aeb2130d59dd56256c7eabd97ffb3 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 2 Jun 2022 23:39:05 +0200
Subject: [PATCH 191/609] New package: gtklock-1.0.0
---
srcpkgs/gtklock/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/gtklock/template
diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template
new file mode 100644
index 000000000000..c7cf960401dc
--- /dev/null
+++ b/srcpkgs/gtklock/template
@@ -0,0 +1,20 @@
+# Template file for 'gtklock'
+pkgname=gtklock
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config wayland-devel"
+makedepends="pam-devel gtk+3-devel gtk-layer-shell-devel"
+short_desc="GTK-based lockscreen for Wayland"
+maintainer="Jovan Lanik <jox969@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/jovanlanik/gtklock"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=4dfbff5f484153e62aa0cd63f538a5baf9e32c890f8c6f62dd85274670289bc5
+
+post_install() {
+ # copying CSS example provided
+ vmkdir /usr/share/gtklock
+ vcopy assets/* /usr/share/gtklock
+}
From 9a69de441a38348f4abf4584a402430f8a80726c Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Fri, 27 May 2022 19:50:10 -0300
Subject: [PATCH 192/609] xdg-desktop-portal: update to 1.14.4
Explicitly disable systemd build, and bump fuse-devel version as fuse3 is now
required to properly build xdg-desktop-portal.
---
srcpkgs/xdg-desktop-portal/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..8318c768fe4b 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
# Template file for 'xdg-desktop-portal'
pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.4
revision=1
build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --without-systemd"
hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
libportal-devel"
checkdepends="dbus"
short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/flatpak/xdg-desktop-portal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=0590199a65daee7c4f3e5c293e3d5b287610bf9299c4515eacc3d133474f0c73
do_check() {
# some tests require a dbus session
From 1a1107fb3b712093e2828a58c8b4a6486804a96b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 1 Jun 2022 22:44:11 +0530
Subject: [PATCH 193/609] New package: wlopm-0.1.0
---
srcpkgs/wlopm/template | 18 ++++++++++++++++++
srcpkgs/wlopm/update | 2 ++
2 files changed, 20 insertions(+)
create mode 100644 srcpkgs/wlopm/template
create mode 100644 srcpkgs/wlopm/update
diff --git a/srcpkgs/wlopm/template b/srcpkgs/wlopm/template
new file mode 100644
index 000000000000..f07be45820b0
--- /dev/null
+++ b/srcpkgs/wlopm/template
@@ -0,0 +1,18 @@
+# Template file for 'wlopm'
+pkgname=wlopm
+version=0.1.0
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=gnu-makefile
+hostmakedepends="wayland-devel"
+makedepends="wayland-devel"
+short_desc="Simple client implementing zwlr-output-power-management-v1"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~leon_plickat/wlopm"
+distfiles="https://git.sr.ht/~leon_plickat/wlopm/archive/v${version}.tar.gz"
+checksum=f9a7ec03a412e602420ab11d0eea872f6d30dfe5cfee93cd3d0289e4fbbb3aa1
+
+post_install() {
+ vman wlopm.1
+}
diff --git a/srcpkgs/wlopm/update b/srcpkgs/wlopm/update
new file mode 100644
index 000000000000..a0f8bcfb49e3
--- /dev/null
+++ b/srcpkgs/wlopm/update
@@ -0,0 +1,2 @@
+site="https://git.sr.ht/~leon_plickat/wlopm/refs"
+pattern="v\K\d+\.\d+\.\d+(?=)"
From 088cac9f5d1a5daee818faea7f23dd1ef39ed55c Mon Sep 17 00:00:00 2001
From: CToID <funk443@yandex.com>
Date: Wed, 1 Jun 2022 11:39:08 +0800
Subject: [PATCH 194/609] New package: ibus-array-0.2.2
Closes: #37372 [via git-merge-pr]
Co-Authored-By: Duncaen <duncaen@voidlinux.org>
---
srcpkgs/ibus-array/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/ibus-array/template
diff --git a/srcpkgs/ibus-array/template b/srcpkgs/ibus-array/template
new file mode 100644
index 000000000000..182945a4907f
--- /dev/null
+++ b/srcpkgs/ibus-array/template
@@ -0,0 +1,20 @@
+# Template file for 'ibus-array'
+pkgname=ibus-array
+version=0.2.2
+revision=1
+wrksrc="ibus-array-release-${version}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config python3 ibus-devel gettext-devel sqlite-devel libtool"
+makedepends="ibus-devel gettext-devel sqlite-devel"
+short_desc="Array 30 engine for iBus"
+maintainer="CToID <funk443@yandex.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/lexical/ibus-array"
+distfiles="https://github.com/lexical/ibus-array/archive/refs/tags/release-${version}.tar.gz"
+checksum=736fee6de90674619f6ad9b0821dc989d91c7b9f364cd7b2b228fdecd9814f85
+
+python_version=3
+
+pre_configure() {
+ autoreconf -fi
+}
From bd24f31172d437f5d3dbbdb679affc037fe205a1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 20:04:31 +0200
Subject: [PATCH 195/609] ibus-array: remove unneeded hostmakedepends
---
srcpkgs/ibus-array/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ibus-array/template b/srcpkgs/ibus-array/template
index 182945a4907f..2b799f93d850 100644
--- a/srcpkgs/ibus-array/template
+++ b/srcpkgs/ibus-array/template
@@ -4,7 +4,7 @@ version=0.2.2
revision=1
wrksrc="ibus-array-release-${version}"
build_style=gnu-configure
-hostmakedepends="automake pkg-config python3 ibus-devel gettext-devel sqlite-devel libtool"
+hostmakedepends="automake pkg-config python3 gettext-devel libtool"
makedepends="ibus-devel gettext-devel sqlite-devel"
short_desc="Array 30 engine for iBus"
maintainer="CToID <funk443@yandex.com>"
From e3b8d8d8f1d11d5a6fd67567eca30840ce201b85 Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Wed, 25 May 2022 13:04:19 +0200
Subject: [PATCH 196/609] New package: wl-mirror-0.11.2
---
srcpkgs/wl-mirror/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/wl-mirror/template
diff --git a/srcpkgs/wl-mirror/template b/srcpkgs/wl-mirror/template
new file mode 100644
index 000000000000..fae87d95aee8
--- /dev/null
+++ b/srcpkgs/wl-mirror/template
@@ -0,0 +1,14 @@
+# Template file for 'wl-mirror'
+pkgname=wl-mirror
+version=0.11.2
+revision=1
+build_style=cmake
+configure_args="-DWLR_PROTOCOL_DIR=${wrksrc}/proto/wlr-protocols"
+hostmakedepends="wayland-devel"
+makedepends="libglvnd-devel wayland-devel wayland-protocols"
+short_desc="Simple Wayland output mirror client"
+maintainer="Tung Anh Vu <vu.tunganh96@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ferdi265/wl-mirror"
+distfiles="https://github.com/Ferdi265/wl-mirror/releases/download/v${version}/wl-mirror-${version}.tar.gz"
+checksum=6ae70c0912eded7f99af16d97f48aa68bbf0e2626ecdc50284f70e237096d6c6
From 068a675dc829e4e35ad50351b060e7a79e3e98c6 Mon Sep 17 00:00:00 2001
From: dashslash <omukou@disroot.org>
Date: Sun, 22 May 2022 20:00:05 -0500
Subject: [PATCH 197/609] libstrophe: update to 0.12.0.
---
srcpkgs/libstrophe/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 5dad32e38267..b3947a91e381 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,7 +1,7 @@
# Template file for 'libstrophe'
pkgname=libstrophe
-version=0.10.1
-revision=2
+version=0.12.0
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable cares) $(vopt_enable tls)"
hostmakedepends="automake libtool pkg-config"
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
homepage="http://strophe.im/libstrophe/"
changelog="https://raw.githubusercontent.com/strophe/libstrophe/master/ChangeLog"
distfiles="https://github.com/strophe/libstrophe/archive/${version}.tar.gz"
-checksum=5bf0bbc555cb6059008f1b748370d4d2ee1e1fabd3eeab68475263556405ba39
+checksum=f645819d8d93711c92454974dd9007c9b9e98ea0b59cb708dc626dd4c6b9d0a8
build_options="cares tls"
build_options_default="tls"
From 75612ebcc7322c08d1cf83125cfe53fa9d3181ac Mon Sep 17 00:00:00 2001
From: dashslash <omukou@disroot.org>
Date: Sun, 22 May 2022 20:00:10 -0500
Subject: [PATCH 198/609] profanity: update to 0.12.1.
---
srcpkgs/profanity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index 959da4cedb93..d5004820bcce 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,6 +1,6 @@
# Template file for 'profanity'
pkgname=profanity
-version=0.11.1
+version=0.12.1
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
homepage="https://profanity-im.github.io/"
changelog="https://raw.githubusercontent.com/profanity-im/profanity/master/CHANGELOG"
distfiles="https://github.com/boothj5/profanity/releases/download/${version}/profanity-${version}.tar.gz"
-checksum=6f1b4df6c2971f51d03d48d2bfd4f69b4404410d800b43f029ea1cf08a02bd45
+checksum=e344481e7bf3b16baf58a169d321b809c4700becffb70db6f1c39adc3fad306e
case "$XBPS_TARGET_MACHINE" in
arm*)
From f0b3d72540cce2f1f53fbfa525131d21fc74b48c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 21:13:06 +0200
Subject: [PATCH 199/609] libostree: update to 2022.4.
---
.../patches/fix-tests-musl-error-strings.patch | 12 ++++++++++++
srcpkgs/libostree/patches/musl-fixes.patch | 10 ++++++----
srcpkgs/libostree/template | 4 ++--
3 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch
diff --git a/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch b/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch
new file mode 100644
index 000000000000..e5ea3c16b925
--- /dev/null
+++ b/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch
@@ -0,0 +1,12 @@
+glibc's and musl's strerror for EOVERFLOW are different...
+
+--- a/tests/test-commit-timestamp.sh
++++ b/tests/test-commit-timestamp.sh
+@@ -40,6 +40,6 @@
+ ${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt
+ rm -rf testrepo testrepo-files
+ assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH'
+-assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range'
++assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH:'
+ assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000'
+ echo "ok commit with env timestamp"
diff --git a/srcpkgs/libostree/patches/musl-fixes.patch b/srcpkgs/libostree/patches/musl-fixes.patch
index 6eb0119bf1f3..956ab625e047 100644
--- a/srcpkgs/libostree/patches/musl-fixes.patch
+++ b/srcpkgs/libostree/patches/musl-fixes.patch
@@ -1,10 +1,8 @@
--- a/config.h.in
+++ b/config.h.in
-@@ -154,3 +154,13 @@
+@@ -1,5 +1,15 @@
+ /* config.h.in. Generated from configure.ac by autoheader. */
- /* Define to 1 if you need to in order for `stat' and other things to work. */
- #undef _POSIX_SOURCE
-+
+/* taken from glibc unistd.h and fixes musl */
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression) \
@@ -14,3 +12,7 @@
+ while (__result == -1L && errno == EINTR); \
+ __result; }))
+#endif
++
+ /* Define if we are building with asan and ubsan */
+ #undef BUILDOPT_ASAN
+
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index 96ce2464312d..50876cecf97a 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,6 +1,6 @@
# Template file for 'libostree'
pkgname=libostree
-version=2021.2
+version=2022.4
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -19,7 +19,7 @@ license="LGPL-2.0-or-later"
homepage="https://ostree.readthedocs.io/en/latest/"
changelog="https://github.com/ostreedev/ostree/releases"
distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=854008e7c71d44f6b3670f0e9b8500db0f08ff8b297d0b30a7cb9a66f34c5d7c
+checksum=14bbd351a95066f68c3b283e0bd0ddd03562e862af66f6f6d894c6c328d7eb81
build_options="gir"
build_options_default="gir"
From 69451bc60e01055137d7db29ef064e64ab26bb45 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Wed, 29 Jun 2022 21:31:41 +0200
Subject: [PATCH 200/609] gtklock: update to 1.2.0
---
srcpkgs/gtklock/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template
index c7cf960401dc..136b690aaa89 100644
--- a/srcpkgs/gtklock/template
+++ b/srcpkgs/gtklock/template
@@ -1,6 +1,6 @@
# Template file for 'gtklock'
pkgname=gtklock
-version=1.0.0
+version=1.2.0
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -11,7 +11,7 @@ maintainer="Jovan Lanik <jox969@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/jovanlanik/gtklock"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4dfbff5f484153e62aa0cd63f538a5baf9e32c890f8c6f62dd85274670289bc5
+checksum=0e4c74ef5a381c20e6ed199038300671dea0d85ff4cf76ffc50810f6056ff000
post_install() {
# copying CSS example provided
From ab8e4d4e40d93f1350b1c6c4a792566bca799003 Mon Sep 17 00:00:00 2001
From: Simon Wells <simonrwells@gmail.com>
Date: Tue, 28 Jun 2022 07:14:40 +1200
Subject: [PATCH 201/609] solvespace: update to 3.1
update to 3.1, add system eigen, add changelog link(classyabbyamp)
---
srcpkgs/solvespace/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index fa97e2ead290..376b78cd20be 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,20 +1,21 @@
# Template file for 'solvespace'
pkgname=solvespace
-version=3.0
+version=3.1
revision=1
_libdxfrw_hash=0b7b7b709d9299565db603f878214656ef5e9ddf
_mimalloc_hash=4e643b6d3178e0ea2a093b7e14fe621631a91e4b
build_style=cmake
hostmakedepends="pkg-config git"
-makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel"
+makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel eigen"
short_desc="Parametric 2d/3d CAD"
maintainer="Robert Lowry <bobertlo@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://solvespace.com/index.pl"
+changelog="https://github.com/solvespace/solvespace/raw/master/CHANGELOG.md"
distfiles="https://github.com/solvespace/solvespace/archive/refs/tags/v${version}.tar.gz
https://github.com/solvespace/libdxfrw/archive/${_libdxfrw_hash}.tar.gz
https://github.com/microsoft/mimalloc/archive/${_mimalloc_hash}.tar.gz"
-checksum="04cda618fbbbe2db92713adf2fff4264017f858bac6f737c9da11efab693be4f
+checksum="ab4b3a5fecb1800f8eab82a92138a70227e869d2066ee881441b1e13035786dc
3f7d37ee63f85219da3c63a266023008b8df993965a355739a3fdff3bfb2f932
448ac898c72468c4f632a0818cc4b8ec83a4669402ee059d74df35f94f3e2f34"
nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265"
From 620dff4dc0d42aefaa7b5ecf21826b1d38213c9d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 24 May 2022 22:12:47 +0300
Subject: [PATCH 202/609] mkfontscale: update to 1.2.2.
---
srcpkgs/mkfontscale/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mkfontscale/template b/srcpkgs/mkfontscale/template
index da4760b8d254..4dfb97bd6ae9 100644
--- a/srcpkgs/mkfontscale/template
+++ b/srcpkgs/mkfontscale/template
@@ -1,7 +1,7 @@
# Template file for 'mkfontscale'
pkgname=mkfontscale
-version=1.2.1
-revision=2
+version=1.2.2
+revision=1
build_style=gnu-configure
configure_args="--with-bzip2"
hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="X11 Scalable Font Index Generator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.x.org/wiki"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8ae3fb5b1fe7436e1f565060acaa3e2918fe745b0e4979b5593968914fe2d5c4
post_install() {
vlicense COPYING
From 9efa33af57a3b28b114fa944a304ca2851681a84 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 May 2022 09:08:30 +0300
Subject: [PATCH 203/609] flare-engine: update to 1.13.04.
---
srcpkgs/flare-engine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/flare-engine/template b/srcpkgs/flare-engine/template
index 469506f640ae..8d300f61d227 100644
--- a/srcpkgs/flare-engine/template
+++ b/srcpkgs/flare-engine/template
@@ -1,6 +1,6 @@
# Template file for 'flare-engine'
pkgname=flare-engine
-version=1.12
+version=1.13.04
revision=1
build_style=cmake
configure_args="-DBINDIR=/usr/bin -DDATADIR=share/flare"
@@ -11,6 +11,6 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
homepage="http://flarerpg.org/"
changelog="https://raw.githubusercontent.com/flareteam/flare-engine/master/RELEASE_NOTES.txt"
-distfiles="https://github.com/flareteam/flare-engine/archive/v${version}.tar.gz"
-checksum=287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e
+distfiles="https://github.com/flareteam/flare-engine/archive/refs/tags/v${version}.tar.gz"
+checksum=13dcfe562b98a5456ba5ba3fdffb457b8d92bfe8e332edfbe025353dbd0eb043
replaces="flare-engine-data>=0"
From 46a87cdfd3d749ef7a2ee4edc5feed643bd0fb9f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 May 2022 09:08:35 +0300
Subject: [PATCH 204/609] flare-game: update to 1.13.04.
---
srcpkgs/flare-game/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/flare-game/template b/srcpkgs/flare-game/template
index 3b1c1a25ca07..a23eb186f226 100644
--- a/srcpkgs/flare-game/template
+++ b/srcpkgs/flare-game/template
@@ -1,6 +1,6 @@
# Template file for 'flare-game'
pkgname=flare-game
-version=1.12
+version=1.13.04
revision=1
build_style=cmake
configure_args="-DDATADIR=share/flare"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later, CC-BY-SA-3.0"
homepage="http://flarerpg.org/"
distfiles="https://github.com/flareteam/flare-game/archive/v${version}.tar.gz"
-checksum=19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160
+checksum=bbb278516c46e96ecc9b9470af3c37348ccb5dc61d33bd91c4823c090ccf2c78
post_install() {
vlicense LICENSE.txt
From baa4198fe437f465066e6d8c84aec95b08c02d9f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 May 2022 16:20:25 +0300
Subject: [PATCH 205/609] sinit: update to 1.1.
---
srcpkgs/sinit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/sinit/template b/srcpkgs/sinit/template
index bf2e23a5bc85..14f2f838a96b 100644
--- a/srcpkgs/sinit/template
+++ b/srcpkgs/sinit/template
@@ -1,14 +1,14 @@
# Template file for 'sinit'
pkgname=sinit
-version=1.0
-revision=2
+version=1.1
+revision=1
build_style=gnu-makefile
-short_desc="A simple init, initially based on Rich Felker’s minimal init"
+short_desc="Simple init, initially based on Rich Felker’s minimal init"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://tools.suckless.org/sinit/"
distfiles="http://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=78c2120a97a5e93b80606c5403bd731152f8a344e47aa4ab74970c1c11dc6fc0
+checksum=545a6dd100e17a089b009562a946d76ff0578d060c237d94d39fadc555f7b549
pre_build() {
LD=$CC
From 9963e9f947c4761c89a57cdec2343ba7184bb5a6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 20 May 2022 10:22:11 +0200
Subject: [PATCH 206/609] radicale: update to 3.1.7.
---
srcpkgs/radicale/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 65eb085022c0..74b950908a53 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,6 +1,6 @@
# Template file for 'radicale'
pkgname=radicale
-version=3.1.5
+version=3.1.7
revision=1
wrksrc="Radicale-${version}"
build_style=python3-module
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://radicale.org"
changelog="https://github.com/Kozea/Radicale/blob/master/CHANGELOG.md"
distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
-checksum=1d631d0c0efd049c05fb32876d8e4f5662df4fa91f8aa6f52a994608d9a3e12d
+checksum=17d65e1a25925e4531dec3a3c7b49447b8f92d2d825489249bf99fde224151ca
conf_files="
/etc/radicale/config
/etc/radicale/rights
From c97b4e1fc7456a182b2036ea12ac2deb28498391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Fri, 20 May 2022 09:26:11 +0200
Subject: [PATCH 207/609] ausweisapp2: update to 1.22.6
Use official tarball to better check hashsums and maybe the signature
someday.
---
srcpkgs/AusweisApp2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 5ee22fec995c..c6753ed80682 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,6 +1,6 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
-version=1.22.2
+version=1.22.6
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -11,5 +11,5 @@ short_desc="Official authentication app for German ID cards and residence permit
maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="EUPL-1.2"
homepage="https://www.ausweisapp.bund.de/ausweisapp2/"
-distfiles="https://github.com/Governikus/AusweisApp2/archive/refs/tags/${version}.tar.gz"
-checksum=79d637a976dc1dc5445757a43324f4fe609d844bf90f11c0f62a46c39dc4fea6
+distfiles="https://github.com/Governikus/AusweisApp2/releases/download/${version}/AusweisApp2-${version}.tar.gz"
+checksum=3665502eb9fa5811c58ffd1952e15589216bcaaf88c63458ac5930c9ad588945
From 7b7cb252787a18dc1c342e73b16e3b3d8787a38c Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 14 May 2022 16:20:41 +0530
Subject: [PATCH 208/609] New package: wmenu-0.1.0
---
srcpkgs/wmenu/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/wmenu/template
diff --git a/srcpkgs/wmenu/template b/srcpkgs/wmenu/template
new file mode 100644
index 000000000000..40a5c7219cd3
--- /dev/null
+++ b/srcpkgs/wmenu/template
@@ -0,0 +1,17 @@
+# Template file for 'wmenu'
+pkgname=wmenu
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config scdoc wayland-devel"
+makedepends="pango-devel wayland-devel libxkbcommon-devel wayland-protocols"
+short_desc="Dmenu for wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://sr.ht/~adnano/wmenu/"
+distfiles="https://git.sr.ht/~adnano/wmenu/archive/${version}.tar.gz"
+checksum=d102703f038712d602530cc80ab58841f86834d4a377cb9e533c5ccc399a822c
+
+post_install() {
+ vlicense LICENSE
+}
From e6934de765af4dca0f97a1761e532757f46f07fb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 14 May 2022 17:40:39 +0300
Subject: [PATCH 209/609] cbatticon-gtk3: update to 1.6.13.
---
srcpkgs/cbatticon-gtk3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cbatticon-gtk3/template b/srcpkgs/cbatticon-gtk3/template
index 4e67df7be0d0..09b3255f8c58 100644
--- a/srcpkgs/cbatticon-gtk3/template
+++ b/srcpkgs/cbatticon-gtk3/template
@@ -1,6 +1,6 @@
# Template file for 'cbatticon-gtk3'
pkgname=cbatticon-gtk3
-version=1.6.10
+version=1.6.13
revision=1
wrksrc="cbatticon-${version}"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
homepage="https://github.com/valr/cbatticon"
changelog="https://raw.githubusercontent.com/valr/cbatticon/master/Changelog"
distfiles="https://github.com/valr/cbatticon/archive/${version}.tar.gz"
-checksum=c9782e86dab64bea17583640f23e9fda34682967984f2105aa21e0d1c355cd57
+checksum=87c6dae4a20dcfbf4897b110a7c5105fa8cf10de74b19e128b0cfd6212c55098
provides="cbatticon-${version}_${revision}"
replaces="cbatticon-gtk2>=0"
From 8f7baa33d761bf5ade3db82fd2b0672d4b84a5a2 Mon Sep 17 00:00:00 2001
From: beltofdespair <mogwinglodot@protonmail.com>
Date: Sat, 14 May 2022 17:48:32 -0500
Subject: [PATCH 210/609] mednafen: update to 1.29.0.
---
.../patches/ppc64-snes-libco-elfv2.patch | 325 ------------------
srcpkgs/mednafen/template | 4 +-
2 files changed, 2 insertions(+), 327 deletions(-)
delete mode 100644 srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch
diff --git a/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch b/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch
deleted file mode 100644
index 3f78b4f94e75..000000000000
--- a/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-Note: this is adapted from an equivalent change in higan/bsnes.
-Slightly modified for mednafen (no settings.h, different paths)
-
-From ddf550c1438d60b893a4fc1da333e021ac0e3658 Mon Sep 17 00:00:00 2001
-From: Shawn Anastasio <shawn@anastas.io>
-Date: Tue, 23 Jul 2019 15:59:03 -0500
-Subject: [PATCH] Implement ppc64 ELFv2 support in libco
-
-The existing ppc implementation in libco only supports
-the ELFv1 ABI on PowerPC 64 and therefore can't be used on
-Little Endian systems and Big Endian systems running ELFv2
-distros.
-
-This commit introduces a new implementation of the libco
-API for ppc64 elfv2. It has been tested with bsnes and higan.
-The original ppc implementation is maintained for non-ELFv2
-targets.
----
- libco/libco.c | 4 +-
- libco/ppc64v2.c | 284 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 287 insertions(+), 1 deletion(-)
- create mode 100644 libco/ppc64v2.c
-
-diff --git a/libco/libco.c b/libco/libco.c
-index de11fbe9..f5ee5d0a 100755
---- a/src/snes/src/lib/libco/libco.c
-+++ b/src/snes/src/lib/libco/libco.c
-@@ -9,6 +9,8 @@
- #include "amd64.c"
- #elif defined(__arm__)
- #include "arm.c"
-+ #elif defined(__powerpc64__) && defined(_CALL_ELF) && (_CALL_ELF == 2)
-+ #include "ppc64v2.c"
- #elif defined(_ARCH_PPC)
- #include "ppc.c"
- #elif defined(_WIN32)
-diff --git a/libco/ppc64v2.c b/libco/ppc64v2.c
-new file mode 100644
-index 00000000..8f733de2
---- /dev/null
-+++ b/src/snes/src/lib/libco/ppc64v2.c
-@@ -0,0 +1,283 @@
-+/**
-+ * libco implementation for ppc64 elfv2.
-+ *
-+ * Written by Shawn Anastasio.
-+ * Licensed under the ISC license.
-+ */
-+
-+#define LIBCO_C
-+#include "libco.h"
-+
-+#include <stdint.h>
-+#include <stdlib.h>
-+#include <assert.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct ppc64_context {
-+ // GPRs
-+ uint64_t gprs[32];
-+ uint64_t lr;
-+ uint64_t ccr;
-+
-+ // FPRs
-+ uint64_t fprs[32];
-+
-+#ifdef __ALTIVEC__
-+ // Altivec (VMX)
-+ uint64_t vmx[24 /* 12 non-volatile * 2 */];
-+ uint32_t vrsave;
-+#endif
-+};
-+
-+static thread_local struct ppc64_context *context_running = 0;
-+
-+#define MAX(x, y) ((x) > (y) ? (x) : (y))
-+#define ALIGN(ptr, x) ( (void *)( (uintptr_t)(ptr) & ~((x)-1) ) )
-+
-+#define MIN_STACK 0x10000lu
-+#define MIN_STACK_FRAME 0x20lu
-+#define STACK_ALIGN 0x10lu
-+
-+void swap_context(struct ppc64_context *read, struct ppc64_context *write);
-+__asm__(
-+ ".text\n"
-+ ".align 4\n"
-+ ".type swap_context @function\n"
-+ "swap_context:\n"
-+ ".cfi_startproc\n"
-+
-+ // Dump non-volatile and special GPRs
-+ "std 1, 8(4)\n"
-+ "std 2, 16(4)\n"
-+ "std 12, 96(4)\n"
-+ "std 13, 104(4)\n"
-+ "std 14, 112(4)\n"
-+ "std 15, 120(4)\n"
-+ "std 16, 128(4)\n"
-+ "std 17, 136(4)\n"
-+ "std 18, 144(4)\n"
-+ "std 19, 152(4)\n"
-+ "std 20, 160(4)\n"
-+ "std 21, 168(4)\n"
-+ "std 22, 176(4)\n"
-+ "std 23, 184(4)\n"
-+ "std 24, 192(4)\n"
-+ "std 25, 200(4)\n"
-+ "std 26, 208(4)\n"
-+ "std 27, 216(4)\n"
-+ "std 28, 224(4)\n"
-+ "std 29, 232(4)\n"
-+ "std 30, 240(4)\n"
-+ "std 31, 248(4)\n"
-+
-+ // LR
-+ "mflr 5\n"
-+ "std 5, 256(4)\n"
-+
-+ // CCR
-+ "mfcr 5\n"
-+ "std 5, 264(4)\n"
-+
-+ // Dump non-volatile FPRs
-+ "stfd 14, 384(4)\n"
-+ "stfd 15, 392(4)\n"
-+ "stfd 16, 400(4)\n"
-+ "stfd 17, 408(4)\n"
-+ "stfd 18, 416(4)\n"
-+ "stfd 19, 424(4)\n"
-+ "stfd 20, 432(4)\n"
-+ "stfd 21, 440(4)\n"
-+ "stfd 22, 448(4)\n"
-+ "stfd 23, 456(4)\n"
-+ "stfd 24, 464(4)\n"
-+ "stfd 25, 472(4)\n"
-+ "stfd 26, 480(4)\n"
-+ "stfd 27, 488(4)\n"
-+ "stfd 28, 496(4)\n"
-+ "stfd 29, 504(4)\n"
-+ "stfd 30, 512(4)\n"
-+ "stfd 31, 520(4)\n"
-+
-+#ifdef __ALTIVEC__
-+ // Dump non-volatile VMX registers
-+ "li 5, 528\n"
-+ "stvxl 20, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 21, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 22, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 23, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 24, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 25, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 26, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 27, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 28, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 29, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 30, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 31, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+
-+ // VRSAVE
-+ "mfvrsave 5\n"
-+ "stw 5, 736(4)\n"
-+#endif
-+
-+ // Restore GPRs
-+ "ld 1, 8(3)\n"
-+ "ld 2, 16(3)\n"
-+ "ld 12, 96(3)\n"
-+ "ld 13, 104(3)\n"
-+ "ld 14, 112(3)\n"
-+ "ld 15, 120(3)\n"
-+ "ld 16, 128(3)\n"
-+ "ld 17, 136(3)\n"
-+ "ld 18, 144(3)\n"
-+ "ld 19, 152(3)\n"
-+ "ld 20, 160(3)\n"
-+ "ld 21, 168(3)\n"
-+ "ld 22, 176(3)\n"
-+ "ld 23, 184(3)\n"
-+ "ld 24, 192(3)\n"
-+ "ld 25, 200(3)\n"
-+ "ld 26, 208(3)\n"
-+ "ld 27, 216(3)\n"
-+ "ld 28, 224(3)\n"
-+ "ld 29, 232(3)\n"
-+ "ld 30, 240(3)\n"
-+ "ld 31, 248(3)\n"
-+
-+ // Restore LR
-+ "ld 5, 256(3)\n"
-+ "mtlr 5\n"
-+
-+ // Restore CCR
-+ "ld 5, 264(3)\n"
-+ "mtcr 5\n"
-+
-+ // Restore FPRs
-+ "lfd 14, 384(3)\n"
-+ "lfd 15, 392(3)\n"
-+ "lfd 16, 400(3)\n"
-+ "lfd 17, 408(3)\n"
-+ "lfd 18, 416(3)\n"
-+ "lfd 19, 424(3)\n"
-+ "lfd 20, 432(3)\n"
-+ "lfd 21, 440(3)\n"
-+ "lfd 22, 448(3)\n"
-+ "lfd 23, 456(3)\n"
-+ "lfd 24, 464(3)\n"
-+ "lfd 25, 472(3)\n"
-+ "lfd 26, 480(3)\n"
-+ "lfd 27, 488(3)\n"
-+ "lfd 28, 496(3)\n"
-+ "lfd 29, 504(3)\n"
-+ "lfd 30, 512(3)\n"
-+ "lfd 31, 520(3)\n"
-+
-+#ifdef __ALTIVEC__
-+ // Restore VMX
-+ "li 5, 528\n"
-+ "lvxl 20, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 21, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 22, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 23, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 24, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 25, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 26, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 27, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 28, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 29, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 30, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 31, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+
-+ // VRSAVE
-+ "lwz 5, 720(3)\n"
-+ "mtvrsave 5\n"
-+#endif
-+
-+ // Context restored, branch to LR
-+ "blr\n"
-+
-+ ".cfi_endproc\n"
-+ ".size swap_context, .-swap_context\n"
-+);
-+
-+cothread_t co_active() {
-+ if (!context_running)
-+ context_running = (struct ppc64_context *)
-+ malloc(MIN_STACK + sizeof(struct ppc64_context));
-+ return (cothread_t)context_running;
-+}
-+
-+cothread_t co_derive(void *memory, unsigned int size, void (*coentry)(void)) {
-+ uint8_t *sp;
-+ struct ppc64_context *context = (struct ppc64_context *)memory;
-+
-+ // Save current context into new context to initialize it
-+ swap_context(context, context);
-+
-+ // Align stack
-+ sp = (uint8_t *)memory + size - STACK_ALIGN;
-+ sp = (uint8_t *)ALIGN(sp, STACK_ALIGN);
-+
-+ // Write 0 for initial backchain
-+ *(uint64_t *)sp = 0;
-+
-+ // Create new frame with backchain
-+ sp -= MIN_STACK_FRAME;
-+ *(uint64_t *)sp = (uint64_t)(sp + MIN_STACK_FRAME);
-+
-+ // Update context with new stack (r1) and entrypoint (LR, r12)
-+ context->lr = (uint64_t)coentry;
-+ context->gprs[12] = (uint64_t)coentry;
-+ context->gprs[1] = (uint64_t)sp;
-+
-+ return (cothread_t)memory;
-+}
-+
-+cothread_t co_create(unsigned int size, void (*coentry)(void)) {
-+ size_t total = MAX(size, MIN_STACK) + sizeof(struct ppc64_context);
-+ void *memory = malloc(total);
-+ if (!memory)
-+ return (cothread_t)0;
-+
-+ return co_derive(memory, total, coentry);
-+}
-+
-+void co_delete(cothread_t t) {
-+ free(t);
-+}
-+
-+void co_switch(cothread_t t) {
-+ struct ppc64_context *old = context_running;
-+ context_running = (struct ppc64_context *)t;
-+ swap_context((struct ppc64_context *)t, old);
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
diff --git a/srcpkgs/mednafen/template b/srcpkgs/mednafen/template
index e56addb35013..4d0cdc5883a6 100644
--- a/srcpkgs/mednafen/template
+++ b/srcpkgs/mednafen/template
@@ -1,6 +1,6 @@
# Template file for 'mednafen'
pkgname=mednafen
-version=1.26.1
+version=1.29.0
revision=1
wrksrc="$pkgname"
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://mednafen.github.io/"
distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz"
-checksum=842907c25c4292c9ba497c9cb9229c7d10e04e22cb4740d154ab690e6587fdf4
+checksum=da3fbcf02877f9be0f028bfa5d1cb59e953a4049b90fe7e39388a3386d9f362e
nopie=yes
build_options="altivec"
From 9316907a9e95a3ffee38a9e6a0e588a7ce6bf631 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 16 May 2022 09:47:05 +0700
Subject: [PATCH 211/609] opentoonz: update to 1.6.0
---
srcpkgs/opentoonz/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 540a66afc6bc..23bba3407e89 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
make_cmd=make
@@ -15,7 +15,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=fba0f381fb71ffda89e6423b4d461450d4851f93830342e69e36313070af5990
+checksum=9a6c28cb3933756dbebb45e849bdafc9e6d93d0328c4fd4d7bc8ec3ae481f684
export CMAKE_GENERATOR="Unix Makefiles"
From d6ee9c092b87dd8882042690ee62f45c6ec5f861 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 May 2022 09:37:12 +0300
Subject: [PATCH 212/609] flacon: update to 9.0.0.
Also:
- add taglib-devel to makedepends (new upstream default dep).
---
srcpkgs/flacon/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index 3a9b96ec14c0..0e0365f4c2a8 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,10 +1,10 @@
# Template file for 'flacon'
pkgname=flacon
-version=7.0.1
+version=9.0.0
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel uchardet-devel"
+makedepends="qt5-tools-devel uchardet-devel taglib-devel"
depends="ffmpeg hicolor-icon-theme"
short_desc="Audio File Encoder. Splits audio tracks into separate tracks"
maintainer="travankor <travankor@tuta.io>"
@@ -12,15 +12,7 @@ license="LGPL-2.1-or-later"
homepage="https://flacon.github.io/"
changelog="https://flacon.github.io/changelog/"
distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=f63b959099e7b97b02a7f9ccf2c922a99de6c0d1ec83e74c436fd10e41630b6e
-
-post_extract() {
- # no support for 64-bit atomics on these platforms in qt
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -i 's/QAtomicInteger<quint64>/QAtomicInteger<quint32>/' \
- converter/splitter.cpp
- fi
-}
+checksum=a83d5fe297ceb6408b7f63c56a6be336fe1c6d06ebedcc0c84a3f7dd234140e4
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
From 225b170b699b4fbee0e2549a9c8352339d650530 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 May 2022 23:31:36 +0300
Subject: [PATCH 213/609] fontconfig: update to 2.14.0.
---
srcpkgs/fontconfig/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 89c0cf5ea240..75597231084c 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,23 +1,19 @@
# Template file for 'fontconfig'
pkgname=fontconfig
-version=2.13.1
-revision=3
+version=2.14.0
+revision=1
build_style=gnu-configure
configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
-hostmakedepends="gperf pkg-config"
-makedepends="expat-devel freetype-devel libuuid-devel"
+hostmakedepends="gperf pkg-config python3"
+makedepends="expat-devel freetype-devel"
+checkdepends="curl unzip"
conf_files="/etc/fonts/fonts.conf"
short_desc="Library for configuring and customizing font access"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.fontconfig.org"
-distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.bz2"
-checksum=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
-
-pre_build() {
- # trick to regenerate hash functions :-)
- rm -f src/fcobjshash.h
-}
+distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.xz"
+checksum=dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac
post_install() {
if [ "$CROSS_BUILD" ]; then
From e5711c38da7e6265a2732b64a115156716cb9612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 1 May 2022 18:47:42 +0200
Subject: [PATCH 214/609] jack: update to 1.9.21, orphan.
---
srcpkgs/jack/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 9ec2bc358370..c018a5bacc64 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,21 +1,22 @@
# Template file for 'jack'
pkgname=jack
-version=1.9.20
+version=1.9.21
revision=1
wrksrc="jack2-${version}"
build_style=waf3
-configure_args="--alsa --classic --dbus"
+configure_args="--alsa --classic --dbus --example-tools"
hostmakedepends="pkg-config"
makedepends="eigen opus-devel libsamplerate-devel readline-devel
dbus-devel db-devel celt-devel $(vopt_if ffado libffado-devel)
$(vopt_if zalsa 'zita-alsa-pcmi-devel zita-resampler-devel')"
depends="python3-dbus"
short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
-maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://jackaudio.org/"
+changelog="https://raw.githubusercontent.com/jackaudio/jack2/master/ChangeLog.rst"
distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz"
-checksum=915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d
+checksum=8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d
python_version=3
# Package build options
From 62a0e8932bd1ac6843e5792568920165c0957b80 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Fri, 29 Apr 2022 14:14:15 -0500
Subject: [PATCH 215/609] libarchive: update to 3.6.1
---
srcpkgs/libarchive/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index a5ee27d350d4..6b46500183bf 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,6 +1,6 @@
# Template file for 'libarchive'
pkgname=libarchive
-version=3.6.0
+version=3.6.1
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -18,7 +18,7 @@ license="BSD-2-Clause"
homepage="http://www.libarchive.org/"
changelog="https://raw.githubusercontent.com/wiki/libarchive/libarchive/ReleaseNotes.md"
distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz"
-checksum=a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852
+checksum=c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2
build_options="acl expat lzo lz4 ssl zstd"
build_options_default="acl ssl lz4 zstd"
From 530fee7648e1bac1a730e0e18f2b0dce35680baa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 21:57:24 +0200
Subject: [PATCH 216/609] gnutls: update to 3.7.6.
Closes: https://github.com/void-linux/void-packages/pull/37122
---
srcpkgs/gnutls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 9f2d7f905b7b..228bd0334166 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
# Template file for 'gnutls'
pkgname=gnutls
-version=3.7.4
+version=3.7.6
revision=1
build_style=gnu-configure
configure_args="--disable-guile --disable-static
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only, LGPL-2.1-or-later"
homepage="https://gnutls.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f
+checksum=77065719a345bfb18faa250134be4c53bef70c1bd61f6c0c23ceb8b44f0262ff
pre_check() {
# same as $PASS in tests/cert-tests/certtool.sh
From 0658688e09333c3c7c1df8ed6333ef9ea56d696b Mon Sep 17 00:00:00 2001
From: JailBird <jailbird@fdf.net>
Date: Tue, 26 Apr 2022 00:40:27 -0500
Subject: [PATCH 217/609] dnsdist: update to 1.7.1
---
srcpkgs/dnsdist/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index 35d8e23b0c9f..d08573223251 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,6 +1,6 @@
# Template file for 'dnsdist'
pkgname=dnsdist
-version=1.7.0
+version=1.7.1
revision=1
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
@@ -19,7 +19,7 @@ license="GPL-2.0-only"
homepage="https://dnsdist.org/"
changelog="https://dnsdist.org/changelog.html"
distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=78cc72cb0ccf7fb5f3f2fae09c79eda65a5256374da09bb541b735ea6868fc64
+checksum=273a8212be2ddfaf754f752bcda4c2abc671ca5d42f776263312eb4661ea2d66
system_accounts="_dnsdist"
From 4f4a75391c2301d1b733ac41d315affbad20ddf9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 25 Apr 2022 21:50:17 +0200
Subject: [PATCH 218/609] restic: update to 0.13.1.
---
srcpkgs/restic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 18e2a8b1f406..bfa028308146 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
# Template file for 'restic'
pkgname=restic
-version=0.13.0
+version=0.13.1
revision=1
build_style=go
go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
homepage="https://restic.net/"
changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=b3c09137b462548f44d764f98909534bef6e85fe029d4daf60545642cdefd3dd
+checksum=8430f80dc17b98fd78aca6f7d635bf12a486687677e15989a891ff4f6d8490a9
post_install() {
vlicense LICENSE
From 1afbd3afc47fcf7aad5387a7c81e4b61dad225fe Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Wed, 23 Mar 2022 00:37:59 +0200
Subject: [PATCH 219/609] paper-icon-theme: update to 1.5.0.20200312.
---
srcpkgs/paper-icon-theme/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/paper-icon-theme/template b/srcpkgs/paper-icon-theme/template
index 03cc7d412f61..b2b390bbf818 100644
--- a/srcpkgs/paper-icon-theme/template
+++ b/srcpkgs/paper-icon-theme/template
@@ -1,12 +1,13 @@
# Template file for 'paper-icon-theme'
pkgname=paper-icon-theme
-version=1.5.0
-revision=2
-wrksrc="${pkgname}-v.${version}"
+version=1.5.0.20200312
+revision=1
+_commit=aa3e8af7a1f0831a51fd7e638a4acb077a1e5188
+wrksrc="${pkgname}-${_commit}"
build_style=meson
short_desc="Modern freedesktop icon theme"
maintainer="travankor <travankor@tuta.io>"
license="CC-BY-SA-4.0"
homepage="https://github.com/snwh/paper-icon-theme"
-distfiles="${homepage}/archive/v.${version}.tar.gz"
-checksum=62f21dfe95ece481e5c635480f32347f1ad27ea66b2ef0526fe799090b298ece
+distfiles="https://github.com/snwh/paper-icon-theme/archive/${_commit}.tar.gz"
+checksum=ad76f45266693666df43fab5a381a60899de99e21a85961fa24d60f4cb639b27
From a04c1f6a1d253a8d1ec4c15e5e3ea865c7dfe2d4 Mon Sep 17 00:00:00 2001
From: ghost <gh0st@vivaldi.net>
Date: Tue, 26 Apr 2022 03:37:41 +0200
Subject: [PATCH 220/609] pencil2d: update to 0.6.6.
---
srcpkgs/pencil2d/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pencil2d/template b/srcpkgs/pencil2d/template
index 048dad18db97..65943965a30c 100644
--- a/srcpkgs/pencil2d/template
+++ b/srcpkgs/pencil2d/template
@@ -1,6 +1,6 @@
# Template file for 'pencil2d'
pkgname=pencil2d
-version=0.6.5
+version=0.6.6
revision=1
wrksrc=pencil-${version}
build_style=qmake
@@ -13,4 +13,4 @@ license="GPL-2.0-only"
homepage="https://pencil2d.org/"
changelog="https://raw.githubusercontent.com/pencil2d/pencil/master/ChangeLog.md"
distfiles="https://github.com/${pkgname}/pencil/archive/v${version}.tar.gz"
-checksum=31903c54c8f0a79385cc5f519b380d26524219984e619204820b946c96fc2482
+checksum=9dd1f7dd35a86dea33ec4415ac92e7df146309a1f52139c908cbd8b4767e53ff
From a6ca6638c6188444b56a1a850bd15d52714fe692 Mon Sep 17 00:00:00 2001
From: Tony Zorman <soliditsallgood@mailbox.org>
Date: Sat, 30 Apr 2022 20:25:09 +0200
Subject: [PATCH 221/609] haskell-language-server: update to 1.7.0.0
The -dynamic flag is needed, as with this release[1] we dynamically
compile against GHC and the relevant system libraries by default.
[1]: https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0
---
srcpkgs/haskell-language-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 0c7b2187c5ca..7860f754298f 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
# Template file for 'haskell-language-server'
pkgname=haskell-language-server
-version=1.6.1.0
+version=1.7.0.0
revision=1
build_style="haskell-stack"
-make_build_args="--stack-yaml stack-9.0.2.yaml"
+make_build_args="--stack-yaml stack-9.0.2.yaml --flag=haskell-language-server:-dynamic"
makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
short_desc="Integration of ghcide and haskell-ide-engine"
maintainer="Wayne Van Son <waynevanson@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/haskell/haskell-language-server"
distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=e5c336ad2de8d021c882cdac5bbc26bf6427df8d2a5bd244c05cf18296a9bfdc
+checksum=252fc5ae41ef77bbfa36f42eb38f69c953d5aa8757b510c5c45a03655da95513
nopie_files="
/usr/bin/haskell-language-server
/usr/bin/haskell-language-server-wrapper
From 171c580c02f3ed5e0395c0b2089714cbad38cc3d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 02:36:38 +0200
Subject: [PATCH 222/609] help2man: update to 1.49.2.
---
srcpkgs/help2man/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index ce9a6600538f..04762df68a96 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,14 +1,14 @@
# Template file for 'help2man'
pkgname=help2man
-version=1.49.1
+version=1.49.2
revision=1
build_style=gnu-configure
-hostmakedepends="perl-Locale-gettext"
-depends="$hostmakedepends"
+hostmakedepends="perl-Locale-gettext gettext"
+depends="perl-Locale-gettext"
short_desc="GNU conversion tool to create man files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/help2man"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fd99a664ec4be9a86a0dd89719989f14f367a9c079d75d0e1d71e18a7bb51b03
+checksum=9e2e0e213a7e0a36244eed6204d902b6504602a578b6ecd15268b1454deadd36
lib32disabled=yes
From a53bccd37ae6b3ca810e47c55650a288486c89e7 Mon Sep 17 00:00:00 2001
From: Quad <contact@quad.moe>
Date: Wed, 13 Apr 2022 19:20:41 +0200
Subject: [PATCH 223/609] mednaffe: update to 0.9.2
---
srcpkgs/mednaffe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mednaffe/template b/srcpkgs/mednaffe/template
index 7e5a7462c6b8..774e39eb77e9 100644
--- a/srcpkgs/mednaffe/template
+++ b/srcpkgs/mednaffe/template
@@ -1,6 +1,6 @@
# Template file for 'mednaffe'
pkgname=mednaffe
-version=0.9.1
+version=0.9.2
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="VladTheImpaler <vladimir-romanov-ii@yandex.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/AmatCoder/mednaffe"
distfiles="https://github.com/AmatCoder/mednaffe/releases/download/${version}/mednaffe-${version}.tar.gz"
-checksum=426cd53342db9f6d619f5b7fafda3a262e5b4789aa87790265bb09ce674b454f
+checksum=fd9d7ccf6d30cd1123492518bef9df44d67c73fc2817a8575191b24764ce4436
From ed016e43fbb465b50f8a8eadf1250db9b9e74152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?=
=?UTF-8?q?=EF=BD=94=EF=BD=89?= <hiljusti@so.dang.cool>
Date: Sun, 10 Apr 2022 22:53:13 -0700
Subject: [PATCH 224/609] sigi: update to 3.4.1
Closes: #36632 [via git-merge-pr]
---
srcpkgs/sigi/template | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
index d9fc482b8207..e7651b6d4dec 100644
--- a/srcpkgs/sigi/template
+++ b/srcpkgs/sigi/template
@@ -1,6 +1,6 @@
# Template file for 'sigi'
pkgname=sigi
-version=3.1.0
+version=3.4.1
revision=1
build_style=cargo
short_desc="Organization tool for people who hate organization"
@@ -8,14 +8,7 @@ maintainer="J.R. Hill <hiljusti@so.dang.cool>"
license="GPL-2.0-only"
homepage="https://github.com/hiljusti/sigi"
distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
-checksum=967e492a89f05c3a373929a48e0a1a7712d4742b150216228feff4a7869297e3
-
-pre_check() {
- # CLI tests in the project rely on BATS (more than just bats-core) through
- # git submodules. We skip those tests here until the other bats components
- # are imported in Void or https://github.com/hiljusti/sigi/issues/19
- export SKIP_BATS_TESTS=1
-}
+checksum=81f1171495ca53246df1f271e7bc631454e94c8294b95e277f29136572bef6ad
post_install() {
vman sigi.1
From 06cccfbf783a45452b2764ababd4ca6bf1db396d Mon Sep 17 00:00:00 2001
From: blackbeard420 <blackbeard@blackbeard420.me>
Date: Wed, 13 Apr 2022 21:32:11 -0400
Subject: [PATCH 225/609] squirrel: update to 3.2
Closes: #36686 [via git-merge-pr]
---
srcpkgs/squirrel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/squirrel/template b/srcpkgs/squirrel/template
index f8254ef94403..abd2c7a0d607 100644
--- a/srcpkgs/squirrel/template
+++ b/srcpkgs/squirrel/template
@@ -1,15 +1,14 @@
# Template file for 'squirrel'
pkgname=squirrel
-version=3.1
+version=3.2
revision=1
build_style=cmake
-short_desc="The Squirrel Programming Language"
+short_desc="Squirrel Programming Language"
maintainer="Wilson Birney <wpb@360scada.com>"
license="MIT"
homepage="http://www.squirrel-lang.org/"
distfiles="https://github.com/albertodemichelis/squirrel/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=51942b8638a97b673e34ecf3ca50304996fa99bbdbfa7fe93d9744e6769b2f95
-depends="${pkgname}-libs>=${version}_${revision}"
+checksum=02805414cfadd5bbb921891d3599b83375a40650abd6404a8ab407dc5e86a996
post_install() {
vlicense COPYRIGHT
From f3c6e8fe14d6d231c833c7da308472f8ca33a4e8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 12:32:55 +0200
Subject: [PATCH 226/609] libXcursor: update to 1.2.1.
---
srcpkgs/libXcursor/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template
index 9d785a99bd06..118d8853ee17 100644
--- a/srcpkgs/libXcursor/template
+++ b/srcpkgs/libXcursor/template
@@ -1,6 +1,6 @@
# Template file for 'libXcursor'
pkgname=libXcursor
-version=1.2.0
+version=1.2.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXfixes-devel libXrender-devel"
short_desc="Client-side cursor loading library for X"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://wiki.freedesktop.org/xorg/"
-distfiles="${XORG_SITE}/lib/libXcursor-${version}.tar.bz2"
-checksum=3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782
+homepage="https://gitlab.freedesktop.org/xorg/lib/libxcursor"
+distfiles="${XORG_SITE}/lib/libXcursor-${version}.tar.xz"
+checksum=46c143731610bafd2070159a844571b287ac26192537d047a39df06155492104
post_install() {
vlicense COPYING
From 0add57f9be149d3d6123a6a198cb61a3fdf9933c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 12:44:53 +0200
Subject: [PATCH 227/609] libXres: update to 1.2.1.
---
srcpkgs/libXres/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libXres/template b/srcpkgs/libXres/template
index ac9c01c8778e..af75d0ad21d5 100644
--- a/srcpkgs/libXres/template
+++ b/srcpkgs/libXres/template
@@ -1,7 +1,7 @@
-# Template build file for 'libXres'.
+# Template file for 'libXres'
pkgname=libXres
-version=1.2.0
-revision=2
+version=1.2.1
+revision=1
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="xorgproto libXext-devel"
short_desc="X Resource Information Extension Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="${XORG_SITE}"
+homepage="https://gitlab.freedesktop.org/xorg/lib/libxres"
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4
+checksum=b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11
post_install() {
vlicense COPYING
From 2da9c20a74044254c8b01349717170bb278a5b7a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 13:03:00 +0200
Subject: [PATCH 228/609] libXvMC: update to 1.0.13.
---
srcpkgs/libXvMC/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template
index 3f6d9f9a7d9e..498896abca57 100644
--- a/srcpkgs/libXvMC/template
+++ b/srcpkgs/libXvMC/template
@@ -1,7 +1,7 @@
# Template file for 'libXvMC'
pkgname=libXvMC
-version=1.0.12
-revision=2
+version=1.0.13
+revision=1
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="xorgproto libX11-devel libXext-devel libXv-devel"
short_desc="XVideo Motion Compensation Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://wiki.freedesktop.org/xorg/"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd
+homepage="https://gitlab.freedesktop.org/xorg/lib/libxvmc"
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=0a9ebe6dea7888a747e5aca1b891d53cd7d3a5f141a9645f77d9b6a12cee657c
post_install() {
# this file is now part of xorgproto.
From 1ecc767d2c3a240afa8c7f57675829f17be89d3c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 16:10:08 +0200
Subject: [PATCH 229/609] iceauth: update to 1.0.9.
---
srcpkgs/iceauth/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/iceauth/template b/srcpkgs/iceauth/template
index db359e80d62c..00f9e322a3c0 100644
--- a/srcpkgs/iceauth/template
+++ b/srcpkgs/iceauth/template
@@ -1,16 +1,16 @@
-# Template build file for 'iceauth'.
+# Template file for 'iceauth'
pkgname=iceauth
-version=1.0.8
+version=1.0.9
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorgproto libICE-devel"
short_desc="ICE protocol utility"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=e6ee213a217265cc76050e4293ea70b98c32dce6505c6421227efbda62ab60c6
+license="MIT"
+homepage="https://gitlab.freedesktop.org/xorg/app/iceauth"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=2cb9dfcb545683af77fb1029bea3fc52dcc8a0666f7b8b2d7373b6ed4c408c05
post_install() {
vlicense COPYING
From 38fdb52038982a15609a2a7415e94c5713d0df55 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 16:44:49 +0200
Subject: [PATCH 230/609] xdpyinfo: update to 1.3.3.
---
srcpkgs/xdpyinfo/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index 3955252678be..2b51598a40f9 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -1,18 +1,17 @@
# Template file for 'xdpyinfo'
pkgname=xdpyinfo
-version=1.3.2
-revision=2
+version=1.3.3
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel libXtst-devel libXxf86vm-devel
- libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel
- libdmx-devel"
+ libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel"
short_desc="Display information utility for X"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51
+homepage="https://gitlab.freedesktop.org/xorg/app/xdpyinfo"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206
post_install() {
vlicense COPYING
From 2cbbf2b1a3c5b3dd7601d2b62a378096d269cd27 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 25 Apr 2022 00:37:12 +0200
Subject: [PATCH 231/609] imlib2: update to 1.9.0.
---
srcpkgs/imlib2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index b560ef27489c..3cbef2e102c4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,19 +1,19 @@
# Template file for 'imlib2'
pkgname=imlib2
-version=1.8.1
+version=1.9.0
revision=1
build_style=gnu-configure
configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
hostmakedepends="pkg-config"
makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel
tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel
- libheif-devel librsvg-devel"
+ libheif-devel librsvg-devel libopenjpeg2-devel libspectre-devel"
short_desc="Image manipulation library"
maintainer="tibequadorian <tibequadorian@posteo.de>"
license="Imlib2"
homepage="https://sourceforge.net/projects/enlightenment/"
distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.xz"
-checksum=522e1e70e65bc0eddfe207617d15c9a395662a7c090661daaa2c294fb7d9fdaa
+checksum=5ac9e8ca7c6700919fe72749ad7243c42de4b22823c81769a1bf8e480e14c650
post_install() {
vlicense COPYING
From 8fbc07c0f91678657e9f95450d58a1fcd6532718 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 19 Apr 2022 13:54:06 +0200
Subject: [PATCH 232/609] rocksndiamonds: update to 4.3.2.1
---
srcpkgs/rocksndiamonds/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 6c686c7c785b..5d67f3ca67c5 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
# Template file for 'rocksndiamonds'
pkgname=rocksndiamonds
-version=4.3.1.1
+version=4.3.2.1
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Clyhtsuriva <void-packages@adjutor.xyz>"
license="GPL-2.0-only"
homepage="http://www.artsoft.org/rocksndiamonds"
distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=05fcf2c2ac4cca5f94acc8a9c6d2d648d6d5acd901467030cd712fc4f499b564
+checksum=dba4b5ff63561a258348cd3b330d2084ab7ba647d26b6c21f996d93d76ea8439
replaces="rocksndiamonds-data>=0"
do_build() {
From cdc536439a1d6383454bb27c66c8c5a591791b0f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 21 Apr 2022 23:15:24 +1100
Subject: [PATCH 233/609] qemu: update to 7.0.0.
---
...l.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 37 -------
srcpkgs/qemu/patches/cve-2022-0358.patch | 101 ------------------
.../qemu/patches/fix-acpi-slic-table.patch | 90 ----------------
srcpkgs/qemu/patches/musl-rlimit-rttime.patch | 13 +++
srcpkgs/qemu/patches/xxx-ppcle.patch | 35 ++----
srcpkgs/qemu/template | 6 +-
6 files changed, 24 insertions(+), 258 deletions(-)
delete mode 100644 srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
delete mode 100644 srcpkgs/qemu/patches/cve-2022-0358.patch
delete mode 100644 srcpkgs/qemu/patches/fix-acpi-slic-table.patch
create mode 100644 srcpkgs/qemu/patches/musl-rlimit-rttime.patch
diff --git a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
deleted file mode 100644
index 528b5d5d8bf6..000000000000
--- a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8fbb4e6797ed67310b74cbaaa061269db45a5b71 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 29 Apr 2014 15:51:31 +0200
-Subject: [PATCH] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU
- platforms
-
-The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available
-on all platforms, so we define those if they are missing.
-
-This is needed for musl libc.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- linux-user/signal.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 5ca6d62b15..e917c16d91 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -25,6 +25,13 @@
- #include "trace.h"
- #include "signal-common.h"
-
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN 32
-+#endif
-+#ifndef __SIGRTMAX
-+#define __SIGRTMAX (NSIG-1)
-+#endif
-+
- static struct target_sigaction sigact_table[TARGET_NSIG];
-
- static void host_signal_handler(int host_signum, siginfo_t *info,
---
-2.23.0
-
diff --git a/srcpkgs/qemu/patches/cve-2022-0358.patch b/srcpkgs/qemu/patches/cve-2022-0358.patch
deleted file mode 100644
index 1b573d567b52..000000000000
--- a/srcpkgs/qemu/patches/cve-2022-0358.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 449e8171f96a6a944d1f3b7d3627ae059eae21ca Mon Sep 17 00:00:00 2001
-From: Vivek Goyal <vgoyal@redhat.com>
-Date: Tue, 25 Jan 2022 13:51:14 -0500
-Subject: [PATCH] virtiofsd: Drop membership of all supplementary groups
- (CVE-2022-0358)
-
-At the start, drop membership of all supplementary groups. This is
-not required.
-
-If we have membership of "root" supplementary group and when we switch
-uid/gid using setresuid/setsgid, we still retain membership of existing
-supplemntary groups. And that can allow some operations which are not
-normally allowed.
-
-For example, if root in guest creates a dir as follows.
-
-$ mkdir -m 03777 test_dir
-
-This sets SGID on dir as well as allows unprivileged users to write into
-this dir.
-
-And now as unprivileged user open file as follows.
-
-$ su test
-$ fd = open("test_dir/priviledge_id", O_RDWR|O_CREAT|O_EXCL, 02755);
-
-This will create SGID set executable in test_dir/.
-
-And that's a problem because now an unpriviliged user can execute it,
-get egid=0 and get access to resources owned by "root" group. This is
-privilege escalation.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2044863
-Fixes: CVE-2022-0358
-Reported-by: JIETAO XIAO <shawtao1125@gmail.com>
-Suggested-by: Miklos Szeredi <mszeredi@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
-Message-Id: <YfBGoriS38eBQrAb@redhat.com>
-Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
- dgilbert: Fixed missing {}'s style nit
----
- tools/virtiofsd/passthrough_ll.c | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
-index 64b5b4fbb1..b3d0674f6d 100644
---- a/tools/virtiofsd/passthrough_ll.c
-+++ b/tools/virtiofsd/passthrough_ll.c
-@@ -54,6 +54,7 @@
- #include <sys/wait.h>
- #include <sys/xattr.h>
- #include <syslog.h>
-+#include <grp.h>
-
- #include "qemu/cutils.h"
- #include "passthrough_helpers.h"
-@@ -1161,6 +1162,30 @@ static void lo_lookup(fuse_req_t req, fuse_ino_t parent, const char *name)
- #define OURSYS_setresuid SYS_setresuid
- #endif
-
-+static void drop_supplementary_groups(void)
-+{
-+ int ret;
-+
-+ ret = getgroups(0, NULL);
-+ if (ret == -1) {
-+ fuse_log(FUSE_LOG_ERR, "getgroups() failed with error=%d:%s\n",
-+ errno, strerror(errno));
-+ exit(1);
-+ }
-+
-+ if (!ret) {
-+ return;
-+ }
-+
-+ /* Drop all supplementary groups. We should not need it */
-+ ret = setgroups(0, NULL);
-+ if (ret == -1) {
-+ fuse_log(FUSE_LOG_ERR, "setgroups() failed with error=%d:%s\n",
-+ errno, strerror(errno));
-+ exit(1);
-+ }
-+}
-+
- /*
- * Change to uid/gid of caller so that file is created with
- * ownership of caller.
-@@ -3926,6 +3951,8 @@ int main(int argc, char *argv[])
-
- qemu_init_exec_dir(argv[0]);
-
-+ drop_supplementary_groups();
-+
- pthread_mutex_init(&lo.mutex, NULL);
- lo.inodes = g_hash_table_new(lo_key_hash, lo_key_equal);
- lo.root.fd = -1;
---
-2.35.0
-
diff --git a/srcpkgs/qemu/patches/fix-acpi-slic-table.patch b/srcpkgs/qemu/patches/fix-acpi-slic-table.patch
deleted file mode 100644
index 1a55ec5aa88c..000000000000
--- a/srcpkgs/qemu/patches/fix-acpi-slic-table.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 8cdb99af45365727ac17f45239a9b8c1d5155c6d Mon Sep 17 00:00:00 2001
-From: Igor Mammedov <imammedo@redhat.com>
-Date: Mon, 27 Dec 2021 14:31:17 -0500
-Subject: [PATCH] acpi: fix QEMU crash when started with SLIC table
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-if QEMU is started with used provided SLIC table blob,
-
- -acpitable sig=SLIC,oem_id='CRASH ',oem_table_id="ME",oem_rev=00002210,asl_compiler_id="",asl_compiler_rev=00000000,data=/dev/null
-it will assert with:
-
- hw/acpi/aml-build.c:61:build_append_padded_str: assertion failed: (len <= maxlen)
-
-and following backtrace:
-
- ...
- build_append_padded_str (array=0x555556afe320, str=0x555556afdb2e "CRASH ME", maxlen=0x6, pad=0x20) at hw/acpi/aml-build.c:61
- acpi_table_begin (desc=0x7fffffffd1b0, array=0x555556afe320) at hw/acpi/aml-build.c:1727
- build_fadt (tbl=0x555556afe320, linker=0x555557ca3830, f=0x7fffffffd318, oem_id=0x555556afdb2e "CRASH ME", oem_table_id=0x555556afdb34 "ME") at hw/acpi/aml-build.c:2064
- ...
-
-which happens due to acpi_table_begin() expecting NULL terminated
-oem_id and oem_table_id strings, which is normally the case, but
-in case of user provided SLIC table, oem_id points to table's blob
-directly and as result oem_id became longer than expected.
-
-Fix issue by handling oem_id consistently and make acpi_get_slic_oem()
-return NULL terminated strings.
-
-PS:
-After [1] refactoring, oem_id semantics became inconsistent, where
-NULL terminated string was coming from machine and old way pointer
-into byte array coming from -acpitable option. That used to work
-since build_header() wasn't expecting NULL terminated string and
-blindly copied the 1st 6 bytes only.
-
-However commit [2] broke that by replacing build_header() with
-acpi_table_begin(), which was expecting NULL terminated string
-and was checking oem_id size.
-
-1) 602b45820 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
-2)
-Fixes: 4b56e1e4eb08 ("acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header()")
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/786
-Signed-off-by: Igor Mammedov <imammedo@redhat.com>
-Message-Id: <20211227193120.1084176-2-imammedo@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Tested-by: Denis Lisov <dennis.lissov@gmail.com>
-Tested-by: Alexander Tsoy <alexander@tsoy.me>
-Cc: qemu-stable@nongnu.org
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
----
- hw/acpi/core.c | 4 ++--
- hw/i386/acpi-build.c | 2 ++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/hw/acpi/core.c b/hw/acpi/core.c
-index 1e004d0078..3e811bf03c 100644
---- a/hw/acpi/core.c
-+++ b/hw/acpi/core.c
-@@ -345,8 +345,8 @@ int acpi_get_slic_oem(AcpiSlicOem *oem)
- struct acpi_table_header *hdr = (void *)(u - sizeof(hdr->_length));
-
- if (memcmp(hdr->sig, "SLIC", 4) == 0) {
-- oem->id = hdr->oem_id;
-- oem->table_id = hdr->oem_table_id;
-+ oem->id = g_strndup(hdr->oem_id, 6);
-+ oem->table_id = g_strndup(hdr->oem_table_id, 8);
- return 0;
- }
- }
-diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
-index 8383b83ee3..0234fe7588 100644
---- a/hw/i386/acpi-build.c
-+++ b/hw/i386/acpi-build.c
-@@ -2723,6 +2723,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
-
- /* Cleanup memory that's no longer used. */
- g_array_free(table_offsets, true);
-+ g_free(slic_oem.id);
-+ g_free(slic_oem.table_id);
- }
-
- static void acpi_ram_update(MemoryRegion *mr, GArray *data)
---
-GitLab
-
diff --git a/srcpkgs/qemu/patches/musl-rlimit-rttime.patch b/srcpkgs/qemu/patches/musl-rlimit-rttime.patch
new file mode 100644
index 000000000000..0cbf9be36a8f
--- /dev/null
+++ b/srcpkgs/qemu/patches/musl-rlimit-rttime.patch
@@ -0,0 +1,13 @@
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -141,6 +141,10 @@
+ #include "fd-trans.h"
+ #include "tcg/tcg.h"
+
++#ifndef RLIMIT_RTTIME
++#define RLIMIT_RTTIME 15
++#endif
++
+ #ifndef CLONE_IO
+ #define CLONE_IO 0x80000000 /* Clone io context */
+ #endif
diff --git a/srcpkgs/qemu/patches/xxx-ppcle.patch b/srcpkgs/qemu/patches/xxx-ppcle.patch
index 3e1159c74ed9..7418ca8d2c63 100644
--- a/srcpkgs/qemu/patches/xxx-ppcle.patch
+++ b/srcpkgs/qemu/patches/xxx-ppcle.patch
@@ -29,35 +29,16 @@ index 18c26e0..03d3e18 100755
fi
elif check_define __mips__ ; then
cpu="mips"
-@@ -683,6 +687,9 @@ ARCH=
- case "$cpu" in
- ppc|ppc64|s390x|sparc64|x32|riscv32|riscv64)
- ;;
+@@ -638,6 +642,9 @@
+
+ ppc)
+ CPU_CFLAGS="-m32" ;;
+ ppcle)
-+ ARCH="ppc"
-+ ;;
++ cpu="ppc"
++ CPU_CFLAGS="-m32 -mlittle-endian" ;;
+ ppc64)
+ CPU_CFLAGS="-m64 -mbig-endian" ;;
ppc64le)
- ARCH="ppc64"
- ;;
-@@ -6783,7 +6790,7 @@ if test "$linux" = "yes" ; then
- i386|x86_64|x32)
- linux_arch=x86
- ;;
-- ppc|ppc64|ppc64le)
-+ ppc|ppcle|ppc64|ppc64le)
- linux_arch=powerpc
- ;;
- s390x)
-@@ -6960,6 +6967,9 @@ if test -n "$cross_prefix"; then
- x86_64|x32)
- echo "cpu_family = 'x86_64'" >> $cross
- ;;
-+ ppcle)
-+ echo "cpu_family = 'ppc'" >> $cross
-+ ;;
- ppc64le)
- echo "cpu_family = 'ppc64'" >> $cross
- ;;
diff --git a/configs/targets/ppcle-linux-user.mak b/configs/targets/ppcle-linux-user.mak
new file mode 100644
index 0000000..2259243
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 823caa111ba9..b851a51b064d 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,8 +1,8 @@
# Template file for 'qemu'
# This package should be updated together with qemu-user-static
pkgname=qemu
-version=6.2.0
-revision=3
+version=7.0.0
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
@@ -28,7 +28,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=2fde1a30a7dcc15dde0875319ecaf3dc249072dee46ba7ad1f7c8df1faece93f
+checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
ignore_elf_dirs="/usr/share/qemu"
nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf
From 13f92f74057e516349ac24e95906a2d9a5e762d3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 21 Apr 2022 23:15:32 +1100
Subject: [PATCH 234/609] qemu-user-static: update to 7.0.0.
---
srcpkgs/qemu-user-static/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index cca001f8835b..34de456db4a9 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,8 +1,8 @@
# Template file for 'qemu-user-static'
# This package should be updated together with qemu
pkgname=qemu-user-static
-version=6.2.0
-revision=2
+version=7.0.0
+revision=1
wrksrc="qemu-${version}"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=2fde1a30a7dcc15dde0875319ecaf3dc249072dee46ba7ad1f7c8df1faece93f
+checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
_fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k
From acdeeee9ac63464d6e54a149be3282e32e3050e4 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Sat, 16 Apr 2022 12:59:31 +0200
Subject: [PATCH 235/609] hitori: update to 3.38.4
---
srcpkgs/hitori/patches/meson-0.61.patch | 41 -------------------------
srcpkgs/hitori/template | 4 +--
2 files changed, 2 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/hitori/patches/meson-0.61.patch
diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
deleted file mode 100644
index 37adaa0116e6..000000000000
--- a/srcpkgs/hitori/patches/meson-0.61.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <pwithnall@endlessos.org>
-Date: Tue, 2 Nov 2021 12:04:29 +0000
-Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Meson never took positional arguments in this function, but didn’t warn
-about it until Meson 0.60. Drop the unnecessary arguments to fix the
-warning.
-
-Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
----
- data/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 97b8e68..c66a233 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,6 +1,6 @@
- subdir('icons')
-
--desktop_file = i18n.merge_file('desktop-file',
-+desktop_file = i18n.merge_file(
- type: 'desktop',
- input: '@0@.desktop.in'.format(application_id),
- output: '@0@.desktop'.format(application_id),
-@@ -20,7 +20,7 @@ if desktop_file_validate.found()
- )
- endif
-
--appdata_file = i18n.merge_file('appdata-file',
-+appdata_file = i18n.merge_file(
- input: '@0@.appdata.xml.in'.format(application_id),
- output: '@0@.appdata.xml'.format(application_id),
- po_dir: join_paths(meson.source_root(), 'po'),
---
-GitLab
-
diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index b5fc5662126e..6e22c5d9a92f 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -1,6 +1,6 @@
# Template file for 'hitori'
pkgname=hitori
-version=3.38.3
+version=3.38.4
revision=1
build_style=meson
hostmakedepends="gettext glib-devel intltool itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Hitori"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f7d7103cb0633fb013730131a98c3ae3a2162b9fb9499fc7f19512d581bf6569
+checksum=8993cc91fb923788e389e03ec2aa7876d15c12bad9204cf65b2ffa0ed3922f7d
From 077e360dd7a37b7e484b441b10fe1b4ebb447ea3 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 11 Apr 2022 03:15:20 +0300
Subject: [PATCH 236/609] openrazer-meta: update to 3.3.0.
---
srcpkgs/openrazer-meta/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index 3cd401cb9878..81c08b768467 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,7 +1,7 @@
# Template file for 'openrazer-meta'
pkgname=openrazer-meta
-version=3.0.1
-revision=3
+version=3.3.0
+revision=1
wrksrc="openrazer-${version}"
build_style=gnu-makefile
make_install_target="setup_dkms udev_install daemon_install xdg_install
@@ -13,7 +13,7 @@ maintainer="Luca Weiss <luca@z3ntu.xyz>"
license="GPL-2.0-or-later"
homepage="https://openrazer.github.io"
distfiles="https://github.com/openrazer/openrazer/releases/download/v${version}/openrazer-${version}.tar.xz"
-checksum=b27a7ab459e5290f9fe4d56f49922f97ed83fc92ba2bc0154aff8c4cdd1de73f
+checksum=cb7bc5c4761f601c1f0da36022153382384058f61fb72b23ee02c575ec41546a
do_build() {
:
From 2cae548b3f9de468d3e80a84bea58861fc0e05be Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Mon, 18 Apr 2022 14:29:25 +0200
Subject: [PATCH 237/609] ART: update to 1.13.
---
srcpkgs/ART/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
index 920204efb1e5..2ec4041b3907 100644
--- a/srcpkgs/ART/template
+++ b/srcpkgs/ART/template
@@ -1,6 +1,6 @@
# Template file for 'ART'
pkgname=ART
-version=1.12.1
+version=1.13
revision=1
build_style=cmake
hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
license="GPL-3.0-or-later"
homepage="https://bitbucket.org/agriggio/art/wiki/Home"
distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=1f9e175d6f414ed52e9a89650331f8c82da4b8bba3da54ca8df8127a919675e0
+checksum=7a6ade552c42d45970fe6618be61e61621e0867a7a2baef2d3d7092badba36e5
From abdfef23812d644a15da3fb56139599bc19c0c7e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 22:44:51 +0200
Subject: [PATCH 238/609] openconnect: update to 9.01.
Closes: https://github.com/void-linux/void-packages/pull/36631
---
srcpkgs/openconnect/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 70ba6962cd01..91283b8397dc 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -1,7 +1,7 @@
# Template file for 'openconnect'
pkgname=openconnect
-version=8.10
-revision=2
+version=9.01
+revision=1
build_style=gnu-configure
configure_args="--with-vpnc-script=/usr/libexec/vpnc-scripts/vpnc-script"
hostmakedepends="gettext pkg-config"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=30e64c6eca4be47bbf1d61f53dc003c6621213738d4ea7a35e5cf1ac2de9bab1
+checksum=b3d7faf830e9793299d6a41e81d84cd4a3e2789c148c9e598e4585010090e4c7
openconnect-devel_package() {
short_desc+=" - development files"
From 889f75d2e84f7d0946288985d0fe840a3086b450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 9 Apr 2022 16:05:27 +0200
Subject: [PATCH 239/609] cargo-edit: update to 0.9.1.
---
srcpkgs/cargo-edit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index f8221ebccdc6..35191055d322 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,6 +1,6 @@
# Template file for 'cargo-edit'
pkgname=cargo-edit
-version=0.8.0
+version=0.9.1
revision=1
archs="x86_64* i686* aarch64* arm*" # uses ring
build_style=cargo
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/killercup/cargo-edit"
distfiles="https://github.com/killercup/cargo-edit/archive/v${version}.tar.gz"
-checksum=4a08e914c17204cb3ab303b62362ca30d44cf457b3b1d7bde117b8ab4cb2fa64
+checksum=bae2a59dcf6110fe0c8bf8562e58d550b2b3b3a02e89b233af5a3be12d41cdf0
post_install() {
vlicense LICENSE
From 09e175d5514e3eb60baae8b85be85454b1a6e456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 7 Apr 2022 21:21:21 +0200
Subject: [PATCH 240/609] kopia: update to 0.10.7.
---
srcpkgs/kopia/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 056235ef545f..8bd4f08fc359 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,6 +1,6 @@
# Template file for 'kopia'
pkgname=kopia
-version=0.10.6
+version=0.10.7
revision=1
build_style=go
build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="Apache-2.0"
homepage="https://kopia.io/"
distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
-checksum=07df866ff4a2662f503a1348fe02bb62e6cf195260217d7e1234b03ff7b27797
+checksum=d797330d39c099c10e8d7bdb4654b254790ea180543971214e8aeec31ad66da4
post_install() {
for shell in bash zsh; do
From 6ec302cb53011c3589070ad83c47c7e5feae8fcc Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Tue, 5 Apr 2022 10:45:59 +0100
Subject: [PATCH 241/609] lfe: update to 2.0.1.
---
srcpkgs/lfe/patches/no-install-on-build.patch | 11 -----------
srcpkgs/lfe/template | 13 +++++--------
2 files changed, 5 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/lfe/patches/no-install-on-build.patch
diff --git a/srcpkgs/lfe/patches/no-install-on-build.patch b/srcpkgs/lfe/patches/no-install-on-build.patch
deleted file mode 100644
index 863aa45ba113..000000000000
--- a/srcpkgs/lfe/patches/no-install-on-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile 2018-01-15 14:49:00.426539554 +0100
-+++ b/Makefile 2018-01-15 14:49:04.968584026 +0100
-@@ -118,7 +118,7 @@ comp_opts.mk:
- -include comp_opts.mk
-
- $(BINDIR)/lfe%:
-- $(INSTALL_BIN) $@ $(DESTBINDIR)
-+ : $(INSTALL_BIN) $@ $(DESTBINDIR)
-
- install: compile install-man
- rm -Rf $(DESTEBINDIR)
diff --git a/srcpkgs/lfe/template b/srcpkgs/lfe/template
index 31f33e64eeaf..528ef58467da 100644
--- a/srcpkgs/lfe/template
+++ b/srcpkgs/lfe/template
@@ -1,19 +1,16 @@
# Template file for 'lfe'
pkgname=lfe
-version=1.3
-revision=3
+version=2.0.1
+revision=1
+build_style=gnu-makefile
hostmakedepends="erlang"
depends="erlang"
short_desc="Lisp flavoured erlang"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="http://lfe.io/"
-distfiles="https://github.com/rvirding/lfe/archive/v${version}.tar.gz"
-checksum=04634f2c700ecedb55f4369962837792669e6be809dba90d81974198fc2b7b72
-
-do_build() {
- make
-}
+distfiles="https://github.com/lfe/lfe/archive/v${version}.tar.gz"
+checksum=d64a5c0b626411afe67f146b56094337801c596d9b0cdfeabaf61223c479985f
do_install() {
for b in lfe lfec lfescript; do
From 0697dccf69f9578ec499d094a87f8ae7a33deb3f Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 29 Mar 2022 14:24:46 +1100
Subject: [PATCH 242/609] jitterentropy: update to 3.4.0, fix license, -O0.
explicitly disable building with optimizations
jitterentropy-rngd-1.2.7 raises error during build without `CFLAGS=-O0`
---
srcpkgs/jitterentropy/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index e90089d9a99d..a4b19b5be597 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,16 +1,18 @@
# Template file for 'jitterentropy'
pkgname=jitterentropy
-version=3.3.1
+version=3.4.0
revision=1
wrksrc="${pkgname}-library-${version}"
build_style=gnu-makefile
make_use_env=yes
short_desc="Hardware RNG based on CPU timing jitter"
maintainer="Piraty <piraty1@inbox.ru>"
-license="BSD-3-Clause"
+license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.chronox.de/jent.html"
-distfiles="https://github.com/smuellerDD/jitterentropy-library/archive/v${version}.tar.gz"
-checksum=4a50cb02b4836cd5550016e2fc2263e6982abaa11467a9e1cea260c1c2f7d487
+distfiles="https://www.chronox.de/jent/${pkgname}-library-${version}.tar.xz"
+checksum=979fa4277decf9792f3422b142237e77d8b6ca41e50474083eb2f0976f2479b3
+
+CFLAGS="-O0"
post_install() {
vlicense LICENSE
From f4f3ac105ee1aae6dd284c3411de3a4523082bd7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 29 Jun 2022 13:25:04 -0700
Subject: [PATCH 243/609] ibus: fix memory leaks and double unref
---
.../patches/src-Fix-refcounting-issues.patch | 267 ++++++++++++++++++
srcpkgs/ibus/template | 2 +-
2 files changed, 268 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
diff --git a/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch b/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
new file mode 100644
index 000000000000..d1923f71a18e
--- /dev/null
+++ b/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
@@ -0,0 +1,267 @@
+From 17648f0522910480b6c5dd4f5356ca1f6c160bf5 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 29 Mar 2022 22:48:19 +0200
+Subject: [PATCH] src: Fix refcounting issues
+
+Commit 5a455b1ead attempted to fix both GLib warnings around
+floating references and other presumed refcounting issues. However
+it missed 2 kinds of bugs:
+
+- The places that take an IBusText created from a static string
+ were made to avoid freeing it afterwards, but the staticness refers
+ to the string content, not the object itself.
+- The places that are documented to emit signals on floating object
+ references used to do the following after signal emission:
+
+ if (g_object_is_floating (object))
+ g_object_unref (object)
+
+ And did possibly trigger GLib warnings were changed to:
+
+ if (g_object_is_floating (object))
+ g_object_sink_ref (object);
+ g_object_unref (object);
+
+ Which fixes the GLib warning for floating references, but do
+ unintendedly steal one reference away for non floating references.
+
+This commit is essentially a revert of commit 5a455b1ead, but
+addressing both things differently:
+
+- All label/tooltip/symbol IBusText properties in IBusProperty do
+ now always sink the reference of the stored object.
+
+- All places documented as maybe using objects with a floating reference
+ on signals changed to doing:
+
+ if (g_object_is_floating (object)) {
+ g_object_ref_sink (object);
+ g_object_unref (object);
+ }
+
+ So the floating reference is owned and unreferenced without warnings,
+ but already owned references are left unchanged.
+
+This addresses the possible GLib warnings, fixes the possible double
+unrefs happening on IBusText used in signals, and fixes the missing
+unrefs on IBusText objects created from static strings.
+
+BUG=https://github.com/ibus/ibus/issues/2393
+BUG=https://github.com/ibus/ibus/issues/2387
+---
+ src/ibusinputcontext.c | 35 +++++++++++++++++++++--------------
+ src/ibusproperty.c | 32 +++++++++++++++++---------------
+ 2 files changed, 38 insertions(+), 29 deletions(-)
+
+diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
+index 4b27551bd..7981de381 100644
+--- a/src/ibusinputcontext.c
++++ b/src/ibusinputcontext.c
+@@ -549,9 +549,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ g_variant_unref (variant);
+ g_signal_emit (context, context_signals[COMMIT_TEXT], 0, text);
+
+- if (g_object_is_floating (text))
++ if (g_object_is_floating (text)) {
+ g_object_ref_sink (text);
+- g_object_unref (text);
++ g_object_unref (text);
++ }
+ return;
+ }
+ if (g_strcmp0 (signal_name, "UpdatePreeditText") == 0) {
+@@ -569,9 +570,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ cursor_pos,
+ visible);
+
+- if (g_object_is_floating (text))
++ if (g_object_is_floating (text)) {
+ g_object_ref_sink (text);
+- g_object_unref (text);
++ g_object_unref (text);
++ }
+ return;
+ }
+ if (g_strcmp0 (signal_name, "UpdatePreeditTextWithMode") == 0) {
+@@ -592,9 +594,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ visible,
+ mode);
+
+- if (g_object_is_floating (text))
++ if (g_object_is_floating (text)) {
+ g_object_ref_sink (text);
+- g_object_unref (text);
++ g_object_unref (text);
++ }
+ return;
+ }
+
+@@ -621,9 +624,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ 0,
+ text,
+ visible);
+- if (g_object_is_floating (text))
++ if (g_object_is_floating (text)) {
+ g_object_ref_sink (text);
+- g_object_unref (text);
++ g_object_unref (text);
++ }
+ return;
+ }
+
+@@ -640,9 +644,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ 0,
+ table,
+ visible);
+- if (g_object_is_floating (table))
++ if (g_object_is_floating (table)) {
+ g_object_ref_sink (table);
+- g_object_unref (table);
++ g_object_unref (table);
++ }
+ return;
+
+ }
+@@ -659,9 +664,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ 0,
+ prop_list);
+
+- if (g_object_is_floating (prop_list))
++ if (g_object_is_floating (prop_list)) {
+ g_object_ref_sink (prop_list);
+- g_object_unref (prop_list);
++ g_object_unref (prop_list);
++ }
+ return;
+ }
+
+@@ -673,9 +679,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+
+ g_signal_emit (context, context_signals[UPDATE_PROPERTY], 0, prop);
+
+- if (g_object_is_floating (prop))
++ if (g_object_is_floating (prop)) {
+ g_object_ref_sink (prop);
+- g_object_unref (prop);
++ g_object_unref (prop);
++ }
+ return;
+ }
+
+diff --git a/src/ibusproperty.c b/src/ibusproperty.c
+index 6d4ed088e..cd8a0e2a6 100644
+--- a/src/ibusproperty.c
++++ b/src/ibusproperty.c
+@@ -336,20 +336,17 @@ ibus_property_destroy (IBusProperty *prop)
+ prop->priv->icon = NULL;
+
+ if (prop->priv->label) {
+- if (!ibus_text_get_is_static (prop->priv->label))
+- g_object_unref (prop->priv->label);
++ g_object_unref (prop->priv->label);
+ prop->priv->label = NULL;
+ }
+
+ if (prop->priv->symbol) {
+- if (!ibus_text_get_is_static (prop->priv->symbol))
+- g_object_unref (prop->priv->symbol);
++ g_object_unref (prop->priv->symbol);
+ prop->priv->symbol = NULL;
+ }
+
+ if (prop->priv->tooltip) {
+- if (!ibus_text_get_is_static (prop->priv->tooltip))
+- g_object_unref (prop->priv->tooltip);
++ g_object_unref (prop->priv->tooltip);
+ prop->priv->tooltip = NULL;
+ }
+
+@@ -404,7 +401,7 @@ ibus_property_deserialize (IBusProperty *prop,
+ g_variant_get_child (variant, retval++, "u", &prop->priv->type);
+
+ GVariant *subvar = g_variant_get_child_value (variant, retval++);
+- if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
++ if (prop->priv->label) {
+ g_object_unref (prop->priv->label);
+ }
+ prop->priv->label = IBUS_TEXT (ibus_serializable_deserialize (subvar));
+@@ -414,7 +411,7 @@ ibus_property_deserialize (IBusProperty *prop,
+ ibus_g_variant_get_child_string (variant, retval++, &prop->priv->icon);
+
+ subvar = g_variant_get_child_value (variant, retval++);
+- if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
++ if (prop->priv->tooltip) {
+ g_object_unref (prop->priv->tooltip);
+ }
+ prop->priv->tooltip = IBUS_TEXT (ibus_serializable_deserialize (subvar));
+@@ -435,7 +432,7 @@ ibus_property_deserialize (IBusProperty *prop,
+
+ /* Keep the serialized order for the compatibility when add new members. */
+ subvar = g_variant_get_child_value (variant, retval++);
+- if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
++ if (prop->priv->symbol) {
+ g_object_unref (prop->priv->symbol);
+ }
+ prop->priv->symbol = IBUS_TEXT (ibus_serializable_deserialize (subvar));
+@@ -567,7 +564,7 @@ ibus_property_set_label (IBusProperty *prop,
+ g_assert (IBUS_IS_PROPERTY (prop));
+ g_return_if_fail (label == NULL || IBUS_IS_TEXT (label));
+
+- if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
++ if (prop->priv->label) {
+ g_object_unref (prop->priv->label);
+ }
+
+@@ -575,8 +572,10 @@ ibus_property_set_label (IBusProperty *prop,
+ prop->priv->label = ibus_text_new_from_static_string ("");
+ }
+ else {
+- prop->priv->label = g_object_ref_sink (label);
++ prop->priv->label = label;
+ }
++
++ g_object_ref_sink (prop->priv->label);
+ }
+
+ void
+@@ -586,7 +585,7 @@ ibus_property_set_symbol (IBusProperty *prop,
+ g_assert (IBUS_IS_PROPERTY (prop));
+ g_return_if_fail (symbol == NULL || IBUS_IS_TEXT (symbol));
+
+- if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
++ if (prop->priv->symbol) {
+ g_object_unref (prop->priv->symbol);
+ }
+
+@@ -594,8 +593,10 @@ ibus_property_set_symbol (IBusProperty *prop,
+ prop->priv->symbol = ibus_text_new_from_static_string ("");
+ }
+ else {
+- prop->priv->symbol = g_object_ref_sink (symbol);
++ prop->priv->symbol = symbol;
+ }
++
++ g_object_ref_sink (prop->priv->symbol);
+ }
+
+ void
+@@ -615,7 +616,7 @@ ibus_property_set_tooltip (IBusProperty *prop,
+ g_assert (IBUS_IS_PROPERTY (prop));
+ g_assert (tooltip == NULL || IBUS_IS_TEXT (tooltip));
+
+- if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
++ if (prop->priv->tooltip) {
+ g_object_unref (prop->priv->tooltip);
+ }
+
+@@ -624,8 +625,9 @@ ibus_property_set_tooltip (IBusProperty *prop,
+ }
+ else {
+ prop->priv->tooltip = tooltip;
+- g_object_ref_sink (prop->priv->tooltip);
+ }
++
++ g_object_ref_sink (prop->priv->tooltip);
+ }
+
+ void
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 750470cea083..f43a62b6bf1a 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,7 +1,7 @@
# Template file for 'ibus'
pkgname=ibus
version=1.5.26
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--enable-ui --enable-gtk3 --enable-gtk4
From bc3f354675f6fe1c5075c53df0d01e1f43f550b1 Mon Sep 17 00:00:00 2001
From: Barbaross <cullen.ross@proton.me>
Date: Wed, 29 Jun 2022 21:00:54 -0400
Subject: [PATCH 244/609] bemenu: update to 0.6.8.
---
srcpkgs/bemenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 2937a4482968..976318e83361 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,6 +1,6 @@
# Template file for 'bemenu'
pkgname=bemenu
-version=0.6.7
+version=0.6.8
revision=1
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -13,7 +13,7 @@ maintainer="Issam Maghni <me@concati.me>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/Cloudef/bemenu"
distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
-checksum=8982ffbeebb0f642e0a68d3ab5a16078b2f43548ddca70a5ad30a597529ff142
+checksum=d68c0c35c63c1dc26e3f2e67be1008f1f66a1ecdf7d3c9ccb261523175f22156
bemenu-devel_package() {
depends="bemenu-${version}_${revision}"
From 801fd734934b1c3477fed3115c42ea2c3bbf48bb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 01:12:08 +0200
Subject: [PATCH 245/609] openjpeg2: update to 2.5.0.
---
...c27e7c91f745a1dda9991b5deea3cbef2072.patch | 31 -------------------
...49edad7fb31ebbf03c60a45b72aaa7b7412b.patch | 26 ----------------
srcpkgs/openjpeg2/template | 13 +++-----
3 files changed, 5 insertions(+), 65 deletions(-)
delete mode 100644 srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
delete mode 100644 srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
diff --git a/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch b/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
deleted file mode 100644
index 28d654fa8885..000000000000
--- a/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 7 Jan 2021 14:09:50 +0100
-Subject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes
- uclouvain#1174)"
-
-This reverts commit 65586374d639cfc0104419992f9022174b412594 which
-breaks cross-compilation of poppler under buildroot (because of
-DESTDIR usage).
----
- cmake/OpenJPEGConfig.cmake.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
-index 8a726697a..2925108ad 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
- # This is an install tree
- include(${SELF_DIR}/OpenJPEGTargets.cmake)
-
-+ # We find a relative path from the PKG directory to header files.
-+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
-+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-+
-+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
-
- else()
- if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
diff --git a/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch b/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
deleted file mode 100644
index 18907a5d74d2..000000000000
--- a/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 7 Jan 2021 14:11:26 +0100
-Subject: [PATCH] cmake/OpenJPEGConfig.cmake: replace ABSOLUTE by REALPATH
-
-Fix #1174 by replacing ABSOLUTE by REALPATH which will resolve symlinks:
-https://cmake.org/cmake/help/latest/command/get_filename_component.html
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- cmake/OpenJPEGConfig.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
-index 2925108ad..6e88036c6 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
- file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-
-- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
-+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" REALPATH)
-
- else()
- if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template
index 4e6f16ac7ced..b1b293ae474c 100644
--- a/srcpkgs/openjpeg2/template
+++ b/srcpkgs/openjpeg2/template
@@ -1,21 +1,16 @@
# Template file for 'openjpeg2'
pkgname=openjpeg2
-version=2.4.0
-revision=2
+version=2.5.0
+revision=1
wrksrc="openjpeg-${version}"
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=None"
makedepends="libpng-devel lcms2-devel tiff-devel"
short_desc="Open-source JPEG 2000 codec written in C language (Version 2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://www.openjpeg.org/"
distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
-checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
-
-post_install() {
- vlicense LICENSE
-}
+checksum=0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a
libopenjpeg2-devel_package() {
short_desc+=" - development files"
@@ -28,9 +23,11 @@ libopenjpeg2-devel_package() {
vmove usr/lib/pkgconfig
}
}
+
libopenjpeg2_package() {
short_desc+=" - library files"
pkg_install() {
vmove "usr/lib/*.so.*"
+ vlicense LICENSE
}
}
From 3715ae1bf291a583f64ab3f127a36b1377e479a5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 11:52:50 +0200
Subject: [PATCH 246/609] privoxy: update to 3.0.33.
---
srcpkgs/privoxy/files/privoxy/log/run | 2 +-
srcpkgs/privoxy/template | 26 +++++++++++++++-----------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/privoxy/files/privoxy/log/run b/srcpkgs/privoxy/files/privoxy/log/run
index 4923ee6f11cf..fa590adf4e6a 100755
--- a/srcpkgs/privoxy/files/privoxy/log/run
+++ b/srcpkgs/privoxy/files/privoxy/log/run
@@ -1,2 +1,2 @@
#!/bin/sh
-exec logger -t privoxy
+exec vlogger -t privoxy
diff --git a/srcpkgs/privoxy/template b/srcpkgs/privoxy/template
index ddaefd75abea..c35c4ad23ac1 100644
--- a/srcpkgs/privoxy/template
+++ b/srcpkgs/privoxy/template
@@ -1,19 +1,23 @@
# Template file for 'privoxy'
pkgname=privoxy
-version=3.0.32
+version=3.0.33
revision=1
wrksrc="${pkgname}-${version}-stable"
build_style=gnu-configure
-configure_args="--sysconfdir=/etc/privoxy --enable-compression --enable-dynamic-pcre --sbindir=/usr/bin"
+configure_args="
+ --sysconfdir=/etc/privoxy
+ --enable-compression
+ --enable-dynamic-pcre
+ --sbindir=/usr/bin"
make_install_args="STRIP="
conf_files="
- /etc/privoxy/config
- /etc/privoxy/default.action
- /etc/privoxy/match-all.action
- /etc/privoxy/user.filter
- /etc/privoxy/trust
- /etc/privoxy/default.filter
- /etc/privoxy/user.action"
+ /etc/privoxy/config
+ /etc/privoxy/default.action
+ /etc/privoxy/match-all.action
+ /etc/privoxy/user.filter
+ /etc/privoxy/trust
+ /etc/privoxy/default.filter
+ /etc/privoxy/user.action"
hostmakedepends="autoconf"
makedepends="pcre-devel zlib-devel"
short_desc="Non-caching web proxy with advanced filtering capabilities"
@@ -21,14 +25,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.privoxy.org/"
distfiles="${SOURCEFORGE_SITE}/ijbswa/${pkgname}-${version}-stable-src.tar.gz"
-checksum=c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7
+checksum=04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae
system_accounts="privoxy"
privoxy_homedir="/etc/privoxy"
pre_configure() {
autoheader && autoconf
- sed -e 's|^confdir .*|confdir /etc/privoxy|' \
+ vsed -e 's|^confdir .*|confdir /etc/privoxy|' \
-e 's|^logdir .*|logdir /var/log/privoxy|' \
-e 's|^\(logfile .*\)|# \1|' \
-i config
From 732faa62e5b3252fb8aebdc81499722a22aacc67 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 11:55:20 +0200
Subject: [PATCH 247/609] speex: update to 1.2.1.
---
srcpkgs/speex/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/speex/template b/srcpkgs/speex/template
index a380f999427f..7509f7385c7f 100644
--- a/srcpkgs/speex/template
+++ b/srcpkgs/speex/template
@@ -1,7 +1,7 @@
# Template file for 'speex'
pkgname=speex
-version=1.2.0
-revision=2
+version=1.2.1
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="fftw-devel libogg-devel speexdsp-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.speex.org"
distfiles="http://downloads.xiph.org/releases/speex/speex-$version.tar.gz"
-checksum=eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094
+checksum=4b44d4f2b38a370a2d98a78329fefc56a0cf93d1c1be70029217baae6628feea
post_install() {
vlicense COPYING
@@ -23,6 +23,7 @@ libspeex_package() {
vlicense COPYING
}
}
+
speex-devel_package() {
depends="speexdsp-devel libspeex-${version}_${revision}"
short_desc+=" - development files"
From 9211981b7a3bde90d03acfb020fcda8e15d6a610 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Wed, 29 Jun 2022 22:34:24 +0200
Subject: [PATCH 248/609] vale: update to 2.19.0
---
srcpkgs/vale/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index d08391061a35..eab475e687b6 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
# Template file for 'vale'
pkgname=vale
-version=2.15.2
+version=2.19.0
revision=1
build_style=go
go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://docs.errata.ai/vale/about/"
distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15c79d613c181edc99a0a35bde1658b33fbd5aa49f1ac7f1029eba779bf8d4bc
+checksum=bb2e3ffa0901ebc46686ee99ef52ec4c2634dd0c226d591fde4a7d585a44e2c6
post_install() {
vlicense LICENSE
From 7d3bf287426224707b91b0b2c764d452ca1ba7f9 Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Thu, 30 Jun 2022 06:52:20 +0200
Subject: [PATCH 249/609] emptty: update to 0.8.1.
---
srcpkgs/emptty/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 9ba3fd93c742..d2a813b83105 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
# Template file for 'emptty'
pkgname=emptty
-version=0.8.0
+version=0.8.1
revision=1
build_style=go
go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
license="MIT"
homepage="https://github.com/tvrzna/emptty"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b1c67e1661f6cde6c3d9723f6602d2ec9e7dbe8f11caf72f06102750ebd2c636
+checksum=3344c3f3a372f713a4384d37dce01fcce25bb0874c08ded3338ed34ab16839ad
conf_files="/etc/emptty/conf /etc/pam.d/emptty"
post_install() {
From 96b79ee9073224aa81cd8b82d7e010a3372654d9 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 30 Jun 2022 12:11:13 +0200
Subject: [PATCH 250/609] qdirstat: update to 1.8.1.
---
srcpkgs/qdirstat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index d297cd50e41a..fc9e04202627 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -1,7 +1,7 @@
# Template file for 'qdirstat'
pkgname=qdirstat
-version=1.8
-revision=4
+version=1.8.1
+revision=1
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="zlib-devel qt5-devel"
@@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-only"
homepage="https://github.com/shundhammer/qdirstat"
distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz"
-checksum=5dc6f6229657d101abd5448f7c4d754ff823aa5e2816e3835574e7f808cea4f8
+checksum=f41212ddeb7fab86bad43cf65cb7fbd044f4c08fc0b167f8e9eaa384e0c1561b
post_install() {
vman man/qdirstat.1
From 735e4edddf2d7f0411cdc281e87457e9e1b3030a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 12:16:37 +0200
Subject: [PATCH 251/609] cifs-utils: update to 6.15.
---
srcpkgs/cifs-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index 796b2ae69f80..85785998b102 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -1,6 +1,6 @@
# Template file for 'cifs-utils'
pkgname=cifs-utils
-version=6.13
+version=6.15
revision=1
build_style=gnu-configure
configure_args="--disable-systemd"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=43d8786c8613caccfa84913081c1d62bc2409575854cf895b05b48af0863d056
+checksum=a7b6940e93250c1676a6fa66b6ead91b78cd43a5fee99cc462459c8b9cf1e6f4
python_version=3
pre_configure() {
From d3e347581d2498e6cfd151fbabfd5c60d6a17490 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:14:54 +0200
Subject: [PATCH 252/609] freerdp: update to 2.7.0.
---
srcpkgs/freerdp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index da6703547a83..5d9932f83028 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.6.1
+version=2.7.0
revision=1
wrksrc="FreeRDP-${version}"
build_style=cmake
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2ff86a839c1cf678a24d9bf435c83745aafbd5f0d19b637b733e306acede96e3
+checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 0ca666d38f788a6bb47698b05d9ed5bd1cc3f8ac Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Tue, 17 May 2022 14:12:01 +0000
Subject: [PATCH 253/609] epub2txt: update to 2.06.
---
srcpkgs/epub2txt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/epub2txt/template b/srcpkgs/epub2txt/template
index 5f37e28ade6e..961fa0157525 100644
--- a/srcpkgs/epub2txt/template
+++ b/srcpkgs/epub2txt/template
@@ -1,6 +1,6 @@
# Template file for 'epub2txt'
pkgname=epub2txt
-version=2.01
+version=2.06
revision=1
wrksrc=epub2txt2-$version
build_style=gnu-makefile
@@ -9,4 +9,4 @@ maintainer="Paper <paper@tilde.institute>"
license="GPL-3.0-only"
homepage="https://github.com/kevinboone/epub2txt2"
distfiles="https://github.com/kevinboone/epub2txt2/archive/v$version.tar.gz"
-checksum=82c96c713c8a6e10d7b37e96db83a9d5f50fcb4b65034b4a1df1024776b6591f
+checksum=d45ad76a1adca6b62bf0ccbc1aed3a527c3bc2a790516e8de82cc1e6545548b6
From 36bf47577446931bbf6ebf051e07a6a1cc17d027 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 01:57:02 +0100
Subject: [PATCH 254/609] libepoxy: update to 1.5.10.
---
srcpkgs/libepoxy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libepoxy/template b/srcpkgs/libepoxy/template
index 7b8e393fb6cc..a8d7c939a83c 100644
--- a/srcpkgs/libepoxy/template
+++ b/srcpkgs/libepoxy/template
@@ -1,6 +1,6 @@
# Template file for 'libepoxy'
pkgname=libepoxy
-version=1.5.9
+version=1.5.10
revision=1
build_style=meson
hostmakedepends="pkg-config xorg-util-macros"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/anholt/libepoxy"
changelog="https://github.com/anholt/libepoxy/releases"
distfiles="https://github.com/anholt/libepoxy/archive/${version}.tar.gz"
-checksum=ee8048d20179a2e86156ac842ddb6428732d9cd7a2cfc2eca905165bf24887a2
+checksum=a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
post_install() {
vlicense COPYING
From d87978453e86998b4d9cce08d75cc323f28c0f12 Mon Sep 17 00:00:00 2001
From: Tomasz Kramkowski <tomasz@kramkow.ski>
Date: Wed, 15 Jun 2022 01:58:49 +0100
Subject: [PATCH 255/609] nim: update to 1.6.6.
Closes: #37567 [via git-merge-pr]
Co-Authored-By: Duncaen <duncaen@voidlinux.org>
---
srcpkgs/nim/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index d7534c97c223..4e69e1fab2b7 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,6 +1,6 @@
# Template file for 'nim'
pkgname=nim
-version=1.6.0
+version=1.6.6
revision=1
_c1version=561b417c65791cd8356b5f73620914ceff845d10
_nimbleversion=0.13.1
@@ -11,11 +11,10 @@ short_desc="Nim programming language"
maintainer="allan <mail@may.mooo.com>"
license="MIT"
homepage="https://nim-lang.org/"
-_ghsite="https://github.com/nim-lang"
-distfiles="${_ghsite}/Nim/archive/v${version}.tar.gz
- ${_ghsite}/csources_v1/archive/${_c1version}.tar.gz>csources_v1-${_c1version}.tar.gz
- ${_ghsite}/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="c202cfd24a24480da1cf851e1265b87edb22710bb42286a57b1a99c83b6a8315
+distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz
+ https://github.com/nim-lang/csources_v1/archive/${_c1version}.tar.gz>csources_v1-${_c1version}.tar.gz
+ https://github.com/nim-lang/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
+checksum="59836a85c1291b59af699a121b0b765703d6a0e44ed9f3ede363ff2b3e09d527
71c823444c794a12da9027d19d6a717dd7759521ecbbe28190b08372142607ec
e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d"
From 5e8ae9da817a425e24d91e7dcba71993eefcda46 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:34:48 +0200
Subject: [PATCH 256/609] gst-libav: update to 1.20.3.
---
srcpkgs/gst-libav/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 333636d0657a..e9a79dc650a5 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,8 +1,7 @@
# Template file for 'gst-libav'
pkgname=gst-libav
-version=1.20.1
+version=1.20.3
revision=1
-wrksrc="${pkgname}-${version}"
build_style=meson
hostmakedepends="pkg-config yasm"
makedepends="orc-devel gst-plugins-base1-devel ffmpeg-devel"
@@ -12,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7
+checksum=3fedd10560fcdfaa1b6462cbf79a38c4e7b57d7f390359393fc0cef6dbf27dfe
case "$XBPS_TARGET_MACHINE" in
*-musl) # Required by musl for M_SQRT1_2
From 093bfd6cfc5c205be399b63cbd096e1f539bbd16 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:34:52 +0200
Subject: [PATCH 257/609] gst-omx: update to 1.20.3.
---
srcpkgs/gst-omx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index d657aff289a7..893535c463da 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,6 +1,6 @@
# Template file for 'gst-omx'
pkgname=gst-omx
-version=1.20.1
+version=1.20.3
revision=1
build_style=meson
configure_args="-Dexamples=disabled -Dtarget=generic"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c
+checksum=8db48040bb41f09edf8d17ff6d16c54888d7777ba4501c2c69f0083350ea9a15
From ecc7f181c6115cfbb164dfaab1a2d57708b36382 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:34:56 +0200
Subject: [PATCH 258/609] gst-plugins-bad1: update to 1.20.3.
---
srcpkgs/gst-plugins-bad1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index da678bce821f..35bd90f32021 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
-version=1.20.1
-revision=2
+version=1.20.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
@@ -37,7 +37,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848
+checksum=7a11c13b55dd1d2386dd902219e41cbfcdda8e1e0aa3e738186c95074b35da4f
build_options="gir gme"
build_options_default="gir"
From d7b7d84f63a36681362095b9edf6ce50f7f47c6a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:00 +0200
Subject: [PATCH 259/609] gst-plugins-base1: update to 1.20.3.
---
srcpkgs/gst-plugins-base1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 538f4111a74e..43629c9f27c9 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-base1'
pkgname=gst-plugins-base1
-version=1.20.1
-revision=3
+version=1.20.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
build_helper="gir"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204
+checksum=7e30b3dd81a70380ff7554f998471d6996ff76bbe6fc5447096f851e24473c9f
build_options="cdparanoia gir sndio"
build_options_default="cdparanoia gir"
From aab4c19c26adfdb1eaadcabbcd4e414f18d0624b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:04 +0200
Subject: [PATCH 260/609] gst-plugins-good1: update to 1.20.3.
---
srcpkgs/gst-plugins-good1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index aba03519e450..8d0d6c828672 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
-version=1.20.1
-revision=2
+version=1.20.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa
+checksum=f8f3c206bf5cdabc00953920b47b3575af0ef15e9f871c0b6966f6d0aa5868b7
build_options="gtk3"
build_options_default="gtk3"
From 8d65f74726e365dd89f3b7552c9cde861d9ebdfc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:08 +0200
Subject: [PATCH 261/609] gst-plugins-ugly1: update to 1.20.3.
---
srcpkgs/gst-plugins-ugly1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index ad8c128ef726..434beb7e2756 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,6 +1,6 @@
# Template file for 'gst-plugins-ugly1'
pkgname=gst-plugins-ugly1
-version=1.20.1
+version=1.20.3
revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19
+checksum=8caa20789a09c304b49cf563d33cca9421b1875b84fcc187e4a385fa01d6aefd
From d1d8040099bd8e6f6662104057551c5d69076f3f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:12 +0200
Subject: [PATCH 262/609] gst-rtsp-server: update to 1.20.3.
---
srcpkgs/gst-rtsp-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-rtsp-server/template b/srcpkgs/gst-rtsp-server/template
index 7fc2d57201f5..32659000e723 100644
--- a/srcpkgs/gst-rtsp-server/template
+++ b/srcpkgs/gst-rtsp-server/template
@@ -1,6 +1,6 @@
# Template file for 'gst-rtsp-server'
pkgname=gst-rtsp-server
-version=1.20.1
+version=1.20.3
revision=1
build_style=meson
hostmakedepends="pkg-config python3"
@@ -11,4 +11,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${version}.tar.xz"
-checksum=4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509
+checksum=ee402718be9b127f0e5e66ca4c1b4f42e4926ec93ba307b7ccca5dc6cc9794ca
From 46bb9ef712ddd2f955ac1238feea145580d31e6f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:17 +0200
Subject: [PATCH 263/609] gst1-editing-services: update to 1.20.3.
---
srcpkgs/gst1-editing-services/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index ad2318c059ae..1740db07e976 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,6 +1,6 @@
# Template file for 'gst1-editing-services'
pkgname=gst1-editing-services
-version=1.20.1
+version=1.20.3
revision=1
wrksrc="${pkgname/gst1/gst}-${version}"
build_style=meson
@@ -13,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
-checksum=6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df
+checksum=5fd896de69fbe24421eb6b0ff8d2f8b4c3cba3f3025ceacd302172f39a8abaa2
do_check() {
: # Tests fail in older versions as well
From 52ada5dc8dda79496dcac7becb5b11908acb4fbd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:22 +0200
Subject: [PATCH 264/609] gst1-python3: update to 1.20.3.
---
srcpkgs/gst1-python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 4f6ead444091..3936929447a7 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,6 +1,6 @@
# Template file for 'gst1-python3'
pkgname=gst1-python3
-version=1.20.1
+version=1.20.3
revision=1
wrksrc="gst-python-${version}"
build_style=meson
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422
+checksum=db348120eae955b8cc4de3560a7ea06e36d6e1ddbaa99a7ad96b59846601cfdc
From 4022813a87674401c3e97bfeb8a86233c4a4fd93 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:26 +0200
Subject: [PATCH 265/609] gstreamer-vaapi: update to 1.20.3.
---
srcpkgs/gstreamer-vaapi/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 1a934c852d1b..3cc4e057559a 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,18 +1,17 @@
# Template file for 'gstreamer-vaapi'
pkgname=gstreamer-vaapi
-version=1.20.1
+version=1.20.3
revision=1
build_style=meson
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libva-devel MesaLib-devel gst-plugins-bad1-devel"
-checkdepends="$makedepends"
short_desc="VA-API plugins for GStreamer 1.x"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137
+checksum=6ee99eb316abdde9ad37002915bd8c3867918f6fdc74b7cf2ac4c1ae0d690b45
pre_check() {
# Seems to need certain hardware to pass
From 6b3dcd051dda8f368a1be828b1a667513639990d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:30 +0200
Subject: [PATCH 266/609] gstreamer1: update to 1.20.3.
---
srcpkgs/gstreamer1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index ababbeeb987d..e3bf384483ba 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,6 +1,6 @@
# Template file for 'gstreamer1'
pkgname=gstreamer1
-version=1.20.1
+version=1.20.3
revision=1
wrksrc="gstreamer-${version}"
build_style=meson
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031
+checksum=607daf64bbbd5fb18af9d17e21c0d22c4d702fffe83b23cb22d1b1af2ca23a2a
pre_check() {
# gst_gstdatetime is known to fail according to LFS
From d1c510a5a00871a18f71fc765506dab6c8d03934 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 16:08:46 +0200
Subject: [PATCH 267/609] varnish: unbreak i686
---
srcpkgs/varnish/template | 4 ----
1 file changed, 4 deletions(-)
diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index fff05f21f786..cc04089231f7 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -24,10 +24,6 @@ system_accounts="_varnish _vcache"
_varnish_homedir="/var/lib/varnish"
_vcache_pgroup="_varnish"
-if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
- broken="vcltest failure on i686 in c00059.vtc"
-fi
-
if [ yes = "$(vopt_if pcrejit yes)" ]; then
# Don't permit cross builds if pcrejit is set.
nocross="Cannot run test program when cross compiling (PCRE_JIT)"
From ee35f70b1e9c1032fd70e58a0ef2be428db640a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 16:43:55 +0200
Subject: [PATCH 268/609] varnish: update to 7.1.0.
---
common/shlibs | 2 +-
srcpkgs/varnish/template | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a7540ef7b2db..728f5083018c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3714,7 +3714,7 @@ libnozzle.so.1 libnozzle1-1.11_4
libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
libluv.so.1 libluv-1.30.1.0_1
libarmadillo.so.11 armadillo-11.0.1_1
-libvarnishapi.so.2 libvarnishapi-6.3.0_1
+libvarnishapi.so.3 libvarnishapi-7.1.0_1
libicns.so.1 libicns-0.8.1_1
librabbitmq.so.4 rabbitmq-c-0.10.0_2
libuInputPlus.so.0 libuInputPlus-0.1.3_1
diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index cc04089231f7..db6bc9c73ccb 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -1,17 +1,17 @@
# Template file for 'varnish'
pkgname=varnish
-version=6.6.0
+version=7.1.0
revision=1
build_style=gnu-configure
configure_args="--cache-file=config.void --disable-static $(vopt_enable pcrejit pcre-jit)"
hostmakedepends="pkg-config python3 python3-docutils python3-Sphinx"
-makedepends="pcre-devel readline-devel"
+makedepends="pcre2-devel readline-devel"
short_desc="Fast caching HTTP reverse proxy"
maintainer="Noel Cower <ncower@nil.dev>"
license="BSD-2-Clause"
homepage="https://varnish-cache.org/"
distfiles="https://varnish-cache.org/_downloads/${pkgname}-${version}.tgz"
-checksum=d5ff82f2041276dfaeb9a652a88b6d7287cfcf7ca345bb02c438fb65d2bca2e5
+checksum=f54ab88685667664e5b3c39eb56ac8c624b6c1093436a7f8c555491144c69eba
lib32disabled=yes
build_options="pcrejit"
@@ -24,6 +24,10 @@ system_accounts="_varnish _vcache"
_varnish_homedir="/var/lib/varnish"
_vcache_pgroup="_varnish"
+if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+ broken="vcltest failure on i686 in c00059.vtc and more"
+fi
+
if [ yes = "$(vopt_if pcrejit yes)" ]; then
# Don't permit cross builds if pcrejit is set.
nocross="Cannot run test program when cross compiling (PCRE_JIT)"
From f1c99d797b68f80595ef489de6d14098a48d7a24 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 26 Mar 2022 04:14:10 +0100
Subject: [PATCH 269/609] nheko: update to 0.9.3
---
srcpkgs/nheko/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index ed2f7f05dc75..47efea844493 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
-version=0.9.2
-revision=2
+version=0.9.3
+revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
homepage="https://nheko-reborn.github.io"
changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=207243e1c0d0e879066233488b766e30d1902a24fd8f848850567d88408ce8ce
+checksum=9dc7e009366f96da9d9f1632cad96393a370073949e67bc811622f3567274ffb
case "$XBPS_TARGET_MACHINE" in
armv*-musl)
From 011d4797f46c97fbe21e23b8068a847b5bed18e5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:09:22 +1100
Subject: [PATCH 270/609] fasm: update to 1.73.30.
---
srcpkgs/fasm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fasm/template b/srcpkgs/fasm/template
index 00a6b954c30b..a0a125c04531 100644
--- a/srcpkgs/fasm/template
+++ b/srcpkgs/fasm/template
@@ -1,6 +1,6 @@
# Template file for 'fasm'
pkgname=fasm
-version=1.73.29
+version=1.73.30
revision=1
archs="i686* x86_64*"
wrksrc=fasm
@@ -9,7 +9,7 @@ maintainer="Dmitry Bogatov <KAction@disroot.org>"
license="BSD-2-Clause"
homepage="https://flatassembler.net"
distfiles="https://flatassembler.net/fasm-${version}.tgz"
-checksum=6328f4d83468f704e4274d6e90ec04947af56726453ce31389bc32024a98212b
+checksum=75195051a5881dbbbe0f0401161e937f8a36bb42d3470fc4869da14fd2c2f101
nostrip=yes
case ${XBPS_TARGET_MACHINE} in
From ede0d92efa99f4bfdf86838e47ac35fcaa027ce2 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 22 Mar 2022 07:39:30 +0100
Subject: [PATCH 271/609] ipp-usb: update to 0.9.22.
---
srcpkgs/ipp-usb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 98b472d15998..b32f515c8a27 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,6 +1,6 @@
# Template file for 'ipp-usb'
pkgname=ipp-usb
-version=0.9.19
+version=0.9.22
revision=1
build_style=go
go_import_path="github.com/OpenPrinting/ipp-usb"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="BSD-2-Clause"
homepage="https://github.com/OpenPrinting/ipp-usb"
distfiles="https://github.com/OpenPrinting/ipp-usb/archive/$version.tar.gz"
-checksum=06855b4da0bcaad430a42534c117a3f3224c4f6b0f6321da898e3422ae97ae15
+checksum=57f9bea4b41deb0f43957e24b3cf3a3a71050238abaea64d916b2e9a294d7aaf
post_install() {
vsv ipp-usb
From 4bbfdab6f835e21bb56994e6524458380cb136a0 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 19 Mar 2022 15:55:23 +0100
Subject: [PATCH 272/609] python3-aiorpcx: update to 0.22.1.
---
srcpkgs/python3-aiorpcx/template | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-aiorpcx/template b/srcpkgs/python3-aiorpcx/template
index 25a707330172..2f540305ec02 100644
--- a/srcpkgs/python3-aiorpcx/template
+++ b/srcpkgs/python3-aiorpcx/template
@@ -1,7 +1,7 @@
# Template file for 'python3-aiorpcx'
pkgname=python3-aiorpcx
-version=0.18.7
-revision=2
+version=0.22.1
+revision=1
wrksrc="aiorpcX-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,11 +14,8 @@ license="MIT"
homepage="https://github.com/kyuupichan/aiorpcX"
# missing license in PyPI tarball
distfiles="https://github.com/kyuupichan/aiorpcX/archive/${version}.tar.gz"
-checksum=ce98d20a22535651c1479dd66a0e68674e1677632cb43e9706908a4c1e04deb9
-
-do_check() {
- python3 -m pytest
-}
+checksum=f72034c4854daf32d83c06ca940d39336908d55ad6a2fe17c039124d51b89430
+make_check=ci-skip # Tests using IPv6 fail on Github Actions, pass locally
post_install() {
vlicense LICENCE
From f5aa01b9d748d24ab3af24d38cc9eb0170075741 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 19 Mar 2022 15:55:28 +0100
Subject: [PATCH 273/609] electrum: update to 4.2.0.
---
srcpkgs/electrum/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 59575350f955..4060f69a3075 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,7 +1,7 @@
# Template file for 'electrum'
pkgname=electrum
-version=4.1.5
-revision=2
+version=4.2.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
@@ -20,10 +20,10 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
license="MIT"
homepage="https://electrum.org/"
distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=3a24c7ed7a2bb47888f308380b8624a3fff3cf3882fd63d904cd9c3ec543fb3b
post_install() {
- sed -i -e 's|electrum %u|electrum|' \
+ vsed -i -e 's|electrum %u|electrum|' \
-e 's|testnet %u|testnet|' \
${DESTDIR}/usr/share/applications/electrum.desktop
vlicense LICENCE
From d25b9533b839f91a403953b5916b4f973ac908bf Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Fri, 8 Apr 2022 08:31:50 +0000
Subject: [PATCH 274/609] python3-audioread: update to 2.1.9
---
srcpkgs/python3-audioread/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-audioread/template b/srcpkgs/python3-audioread/template
index ba9a6fca85c2..58ab0f1f3a6e 100644
--- a/srcpkgs/python3-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,7 +1,7 @@
# Template file for 'python3-audioread'
pkgname=python3-audioread
-version=2.1.8
-revision=6
+version=2.1.9
+revision=1
wrksrc="audioread-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/sampsyo/audioread/"
distfiles="${PYPI_SITE}/a/audioread/audioread-${version}.tar.gz"
-checksum=073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168
+checksum=a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089
post_patch() {
# Build doesn't actually require pytest-runner and Void doesn't offer it
From e4434a6365fff34a5def90f7ac53a783f0121dca Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Wed, 25 May 2022 03:37:50 +0300
Subject: [PATCH 275/609] mobile-broadband-provider-info: update to 20220511.
---
srcpkgs/mobile-broadband-provider-info/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template
index 45cf541e58bd..68c0a965ec48 100644
--- a/srcpkgs/mobile-broadband-provider-info/template
+++ b/srcpkgs/mobile-broadband-provider-info/template
@@ -1,6 +1,6 @@
# Template file for 'mobile-broadband-provider-info'
pkgname=mobile-broadband-provider-info
-version=20201225
+version=20220511
revision=1
build_style=gnu-configure
hostmakedepends="automake libxslt"
@@ -10,7 +10,7 @@ maintainer="Ulf <void@uw.anonaddy.com>"
license="custom:Creative Commons Public Domain"
homepage="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/"
distfiles="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/${version}/mobile-broadband-provider-info-${version}.tar.bz2"
-checksum=0616b3d0580575741d4319ac71ca67c9a378879943d32a67ac0460615767bcdf
+checksum=1ccbf314cac06048fd8c57ffad28c4e4273cc096e4eb8fca9beb38280428450f
pre_configure() {
autoreconf -fi
From 61f3a5d0e7af5927fd3b77d482d8a5a57b9c3b0f Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 27 Mar 2022 16:59:44 -0400
Subject: [PATCH 276/609] unibilium: update to 2.1.1
* change upstream to https://github.com/neovim/unibilium
---
srcpkgs/unibilium/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/unibilium/template b/srcpkgs/unibilium/template
index b744e1ae6dc2..e35ec896a90a 100644
--- a/srcpkgs/unibilium/template
+++ b/srcpkgs/unibilium/template
@@ -1,15 +1,17 @@
# Template file for 'unibilium'
pkgname=unibilium
-version=2.0.0
-revision=2
+version=2.1.1
+revision=1
build_style=gnu-makefile
+make_check_target="test"
hostmakedepends="libtool perl"
short_desc="Simple, self-contained terminfo library"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="LGPL-3.0-or-later"
-homepage="https://github.com/mauke/unibilium"
-distfiles="https://github.com/mauke/${pkgname}/archive/v${version}.tar.gz"
-checksum=78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1c1
+homepage="https://github.com/neovim/unibilium"
+changelog="https://github.com/neovim/unibilium/raw/master/Changes"
+distfiles="https://github.com/neovim/${pkgname}/archive/v${version}.tar.gz"
+checksum=6f0ee21c8605340cfbb458cbd195b4d074e6d16dd0c0e12f2627ca773f3cabf1
do_build() {
if [ "$CROSS_BUILD" ]; then
From e7fbb6104209b915e39e77e054ddbcb669ffbe2c Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Thu, 30 Jun 2022 12:37:51 +0100
Subject: [PATCH 277/609] rebar3: update to 3.19.0.
---
srcpkgs/rebar3/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template
index 99839b0b7951..da3f82deade3 100644
--- a/srcpkgs/rebar3/template
+++ b/srcpkgs/rebar3/template
@@ -1,7 +1,7 @@
# Template file for 'rebar3'
pkgname=rebar3
-version=3.14.4
-revision=2
+version=3.19.0
+revision=1
hostmakedepends=erlang
depends="erlang>=22"
short_desc="Erlang build tool to compile, test, and release applications"
@@ -9,7 +9,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
license="Apache-2.0"
homepage="https://www.rebar3.org/"
distfiles="https://github.com/erlang/rebar3/archive/${version}.tar.gz"
-checksum=8d78ed53209682899d777ee9443b26b39c9bf96c8b081fe94b3dd6693077cb9a
+checksum=ff9ef42c737480477ebdf0dd9d95ece534a14c96f05edafbf32e9af973280bc3
do_build() {
./bootstrap
From 7814eee1dafc490803af0601d7213344e85deb01 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 18:04:35 +0300
Subject: [PATCH 278/609] profanity: update to 0.12.1.
---
srcpkgs/profanity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index d5004820bcce..3aec13a9115e 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -7,10 +7,10 @@ configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
$(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins)
$(vopt_with xscreensaver) $(vopt_enable omemo) $(vopt_enable cplugins c-plugins)
ac_cv_prog_PYTHON_CONFIG_EXISTS=yes PYTHON_VERSION=3"
-hostmakedepends="pkg-config $(vopt_if python python3-devel) $(vopt_if gtk gtk+-devel)"
+hostmakedepends="pkg-config $(vopt_if python python3-devel) $(vopt_if gtk gtk+3-devel)"
makedepends="libcurl-devel libglib-devel libstrophe-devel readline-devel sqlite-devel
$(vopt_if notify libnotify-devel) $(vopt_if otr 'libotr-devel libgcrypt-devel')
- $(vopt_if pgp gpgme-devel) $(vopt_if python python3-devel) $(vopt_if gtk gtk+-devel)
+ $(vopt_if pgp gpgme-devel) $(vopt_if python python3-devel) $(vopt_if gtk gtk+3-devel)
$(vopt_if xscreensaver libXScrnSaver-devel)
$(vopt_if omemo 'libsignal-protocol-c-devel libgcrypt-devel')"
checkdepends="cmocka-devel"
From fc6271a90d8b96e12db61e9235da62693fef3f71 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 23 Apr 2022 22:41:58 +0200
Subject: [PATCH 279/609] python3-pikepdf: update to 5.1.3.
---
srcpkgs/python3-pikepdf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index ae0b2ee09ba5..b742def96c97 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pikepdf'
pkgname=python3-pikepdf
-version=5.0.1
+version=5.1.3
revision=1
wrksrc="pikepdf-${version}"
build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="MPL-2.0"
homepage="https://github.com/pikepdf/pikepdf"
distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=5fae9eeb7a0120d466fb219aea643a94a1423d68ee9171639a44cf0329ebe7aa
+checksum=c34e4239661d2ddf23caa1c4256f636c866ce8069a5052a2bf8ee06e3cae22f3
pre_build() {
vsed -e '/setuptools_scm_git_archive/d' -i setup.py
From 7530f7d50ac747b088cd734030843efdd809e412 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 22 Apr 2022 19:04:19 +0200
Subject: [PATCH 280/609] libenet: update to 1.3.17.
---
srcpkgs/libenet/template | 5 +++--
srcpkgs/libenet/update | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libenet/template b/srcpkgs/libenet/template
index 1c11d5883d41..fdaad8b9f11c 100644
--- a/srcpkgs/libenet/template
+++ b/srcpkgs/libenet/template
@@ -1,6 +1,6 @@
# Template file for 'libenet'
pkgname=libenet
-version=1.3.14
+version=1.3.17
revision=1
wrksrc="enet-${version}"
build_style=gnu-configure
@@ -8,8 +8,9 @@ short_desc="Reliable UDP networking library"
maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
license="MIT"
homepage="http://enet.bespin.org"
+changelog="https://raw.githubusercontent.com/lsalzman/enet/master/ChangeLog"
distfiles="http://enet.bespin.org/download/enet-${version}.tar.gz"
-checksum=98f6f57aab0a424469619ed3047728f0d3901ce8f0dea919c11e7966d807e870
+checksum=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/libenet/update b/srcpkgs/libenet/update
index 23ceae259b59..b04507812857 100644
--- a/srcpkgs/libenet/update
+++ b/srcpkgs/libenet/update
@@ -1 +1,2 @@
-pkgname=enet
+site="https://github.com/lsalzman/enet/tags"
+pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'
From 818636761d1294f08382fd5053e01e7c86748f7d Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Sat, 30 Apr 2022 18:11:52 +0100
Subject: [PATCH 281/609] fs-uae: update to 3.1.66.
---
srcpkgs/fs-uae/files/fs-uae.desktop | 11 -------
srcpkgs/fs-uae/template | 46 ++++++++++++++++-------------
2 files changed, 26 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/fs-uae/files/fs-uae.desktop
diff --git a/srcpkgs/fs-uae/files/fs-uae.desktop b/srcpkgs/fs-uae/files/fs-uae.desktop
deleted file mode 100644
index 388c561065dc..000000000000
--- a/srcpkgs/fs-uae/files/fs-uae.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=FS-UAE
-Comment=FS-UAE Amiga Emulator
-TryExec=fs-uae
-Exec=fs-uae %f
-StartupNotify=true
-Terminal=false
-Type=Application
-Icon=fs-uae
-Categories=Applications;Emulators;Game
-
diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template
index b4387082e153..c631a1b36270 100644
--- a/srcpkgs/fs-uae/template
+++ b/srcpkgs/fs-uae/template
@@ -1,36 +1,42 @@
# Template file for 'fs-uae'
pkgname=fs-uae
-version=3.0.5
+version=3.1.66
revision=1
build_style=gnu-configure
-hostmakedepends="automake gettext libtool pkg-config zip"
-makedepends="glew-devel libmpeg2-devel SDL2-devel MesaLib-devel
- freetype-devel libglib-devel libpng-devel libopenal-devel"
-depends="desktop-file-utils hicolor-icon-theme"
+hostmakedepends="pkg-config gettext zip"
+makedepends="libmpeg2-devel SDL2-devel libglib-devel libpng-devel libopenal-devel"
short_desc="FS-UAE Amiga Emulator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://fs-uae.net"
-distfiles="https://fs-uae.net/stable/${version}/${pkgname}-${version}.tar.gz"
-checksum=f26ec42e03cf1a7b53b6ce0d9845aa45bbf472089b5ec046b3eb784ec6859fe3
-nocross="./gen/genlinetoscr: cannot execute binary file: Exec format error"
-nopie=yes
+distfiles="https://fs-uae.net/files/FS-UAE/Stable/${version}/${pkgname}-${version}.tar.xz"
+checksum=606e1868b500413d69bd33bb469f8fd08d6c08988801f17b7dd022f3fbe23832
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) ;;
+ x86_64*|i686*) nopie=yes ;;
*) configure_args+=" --disable-jit" ;;
esac
-CFLAGS="-Wno-error -Wno-narrowing -Wno-alloc-size-larget-than"
-CXXFLAGS="${CFLAGS}"
+if [ "$CROSS_BUILD" ]; then
+ post_configure() {
+ make $makejobs \
+ CC=$CC_FOR_BUILD CFLAGS=$CFLAGS_FOR_BUILD \
+ CXX=$CXX_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD \
+ LIBS= GLIB_LIBS= LIBMPEG2_LIBS= OPENAL_LIBS= \
+ OPENGL_LIBS= PNG_LIBS= SDL2_LIBS= X11_LIBS= ZLIB_LIBS= \
+ gen/blit.h gen/blitfunc.cpp gen/blitfunc.h gen/blittable.cpp \
+ gen/compemu.cpp gen/cpudefs.cpp gen/cpuemu_0.cpp \
+ gen/linetoscr.cpp
-pre_configure() {
- grep -rlw -- -Werror | xargs -n1 -t -I% sed -i % -e "s;-Werror;-Wno-error;"
- autoreconf -fi
- cd libmpeg2
- autoreconf -fi
-}
+ rm src/readcpu.o gen/cpudefs.o
+ make $makejobs src/readcpu.o gen/cpudefs.o
+ touch gen/*
+ }
+fi
-post_install() {
- vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) sed -i -e 's/| RTLD_DEEPBIND//' src/dlopen.cpp ;;
+ esac
+ sed -i -e '/^NoDisplay/d' share/applications/fs-uae.desktop
}
From 1f4faffc7163060cb752b16b512b59d694dcdec9 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Thu, 9 Jun 2022 14:06:20 +0200
Subject: [PATCH 282/609] root: update to 6.26.04
---
srcpkgs/root/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index bfc8cb6d8a3b..8f67b5af5d70 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,6 +1,6 @@
# Template file for 'root'
pkgname=root
-version=6.26.02
+version=6.26.04
revision=1
# Only i686 and x86_64 seem to be officially supported
archs="i686* x86_64*"
@@ -29,7 +29,7 @@ maintainer="Ben Jargowsky <benjar63@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://root.cern"
distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
-checksum=7ba96772271a726079506c5bf629c3ceb21bf0682567ed6145be30606d7cd9bb
+checksum=a271cf82782d6ed2c87ea5eef6681803f2e69e17b3036df9d863636e9358421e
build_options="fortran root7"
build_options_default="fortran"
python_version=3
From ff08051dece8680ed975f7946b724e014ef5b3e6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 17 Jun 2022 22:04:39 +0400
Subject: [PATCH 283/609] json-c: update to 0.16, adopt
---
...1-4e9e44-Fix-read-past-end-of-buffer.patch | 24 -------------------
srcpkgs/json-c/template | 7 +++---
2 files changed, 4 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch
diff --git a/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch b/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch
deleted file mode 100644
index bfbdce690950..000000000000
--- a/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4e9e44e5258dee7654f74948b0dd5da39c28beec Mon Sep 17 00:00:00 2001
-From: Marc <34656315+MarcT512@users.noreply.github.com>
-Date: Fri, 7 Aug 2020 10:49:45 +0100
-Subject: [PATCH] Fix read past end of buffer
-
-Resolves https://github.com/json-c/json-c/issues/654
----
- apps/json_parse.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/apps/json_parse.c b/apps/json_parse.c
-index bba4622183..72b31a860a 100644
---- a/apps/json_parse.c
-+++ b/apps/json_parse.c
-@@ -82,7 +82,8 @@ static int parseit(int fd, int (*callback)(struct json_object *))
- int parse_end = json_tokener_get_parse_end(tok);
- if (obj == NULL && jerr != json_tokener_continue)
- {
-- char *aterr = &buf[start_pos + parse_end];
-+ char *aterr = (start_pos + parse_end < sizeof(buf)) ?
-+ &buf[start_pos + parse_end] : "";
- fflush(stdout);
- int fail_offset = total_read - ret + start_pos + parse_end;
- fprintf(stderr, "Failed at offset %d: %s %c\n", fail_offset,
diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template
index daafc44f97ac..dbbd2565a2a9 100644
--- a/srcpkgs/json-c/template
+++ b/srcpkgs/json-c/template
@@ -1,17 +1,18 @@
# Template file for 'json-c'
pkgname=json-c
-version=0.15
+version=0.16
revision=1
build_style=cmake
configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON
-DENABLE_RDRAND=$(vopt_if rdrand ON OFF)"
hostmakedepends="doxygen"
short_desc="JSON implementation in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://json-c.github.io/json-c"
+changelog="https://raw.githubusercontent.com/json-c/json-c/master/ChangeLog"
distfiles="https://s3.amazonaws.com/json-c_releases/releases/${pkgname}-${version}.tar.gz"
-checksum=b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6
+checksum=8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b
CFLAGS="-Wno-error"
From 8833dcf33bb575e2c4e4c5da6fc28a268bb938f1 Mon Sep 17 00:00:00 2001
From: Nikolay Belikov <nb@nbelikov.com>
Date: Mon, 13 Jun 2022 20:26:06 +0300
Subject: [PATCH 284/609] New package: python3-pathvalidate-2.5.0
---
srcpkgs/python3-pathvalidate/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-pathvalidate/template
diff --git a/srcpkgs/python3-pathvalidate/template b/srcpkgs/python3-pathvalidate/template
new file mode 100644
index 000000000000..49cd093824d9
--- /dev/null
+++ b/srcpkgs/python3-pathvalidate/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pathvalidate'
+pkgname=python3-pathvalidate
+version=2.5.0
+revision=1
+wrksrc="pathvalidate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python library to sanitize/validate strings such as filenames/paths"
+maintainer="Nikolay Belikov <nb@nbelikov.com>"
+license="MIT"
+homepage="https://github.com/thombashi/pathvalidate"
+changelog="https://github.com/thombashi/pathvalidate/releases"
+distfiles="${PYPI_SITE}/p/pathvalidate/pathvalidate-${version}.tar.gz"
+checksum="119ba36be7e9a405d704c7b7aea4b871c757c53c9adc0ed64f40be1ed8da2781"
+# Tests depend on unpackaged allpairspy, faker, pytest-discord, pytest-md-report.
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From 862a7468de2b4aad75244a84feb182f3904b2614 Mon Sep 17 00:00:00 2001
From: Nikolay Belikov <nb@nbelikov.com>
Date: Mon, 13 Jun 2022 20:35:41 +0300
Subject: [PATCH 285/609] Electron-Cash: update to 4.2.10.
---
srcpkgs/Electron-Cash/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index 0e5265f3a92d..fb0cba1e6c55 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -1,19 +1,21 @@
# Template file for 'Electron-Cash'
pkgname=Electron-Cash
-version=4.2.3
-revision=2
+version=4.2.10
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil
python3-jsonrpclib python3-protobuf
python3-dnspython python3-requests python3-pysocks python3-stem
- python3-ecdsa python3-pyaes python3-pycryptodome libbitcoin-secp256k1 libzbar"
+ python3-ecdsa python3-pyaes python3-pycryptodomex libbitcoin-secp256k1 libzbar
+ python3-cryptography>=2.6 python3-pathvalidate python3-psutil"
short_desc="Lightweight Bitcoin Cash client"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://electroncash.org"
distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${version}/Electron-Cash-${version}.tar.gz"
-checksum=4c2ea0884ec19a73368eea2081bd763db25cd5760feb23039a4bb61512c4e802
+checksum=2c77258c0e8ccdc42d16cd9bdbc26b47f94b92d9ba8a86d63c25a17ec832b324
+make_check=no # Depends on unpackaged SimpleWebSocketServer
post_install() {
# TODO: build these binaries instead of having to remove pre-built ones
From 02c187d27f1fdf296ed8d6dc891dfb8174f83986 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:17 +0300
Subject: [PATCH 286/609] skalibs: update to 2.12.0.1.
---
common/shlibs | 2 +-
srcpkgs/skalibs/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 728f5083018c..9aeeb079cf0e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2363,7 +2363,7 @@ libgnunettransport.so.2 gnunet-0.12.2_1
libgnunettransportapplication.so.0 gnunet-0.12.2_1
libgnunettransportcore.so.0 gnunet-0.12.2_1
libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
-libskarnet.so.2.11 skalibs-2.11.0.0_1
+libskarnet.so.2.12 skalibs-2.12.0.0_1
libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
libtidy.so.58 libtidy5-5.8.0_1
libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index bac3772b161c..dccbcee327eb 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
# Template file for 'skalibs'
pkgname=skalibs
-version=2.11.2.0
+version=2.12.0.1
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/skalibs/"
changelog="https://skarnet.org/software/skalibs/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=649cf3236fe3103f45366b6196b1bcd0457c9c17ca86f2b80007696a2baa7b77
+checksum=3e228f72f18d88c17f6c4e0a66881d6d3779427b7e7e889f3142b6f26da30285
post_install() {
vlicense COPYING LICENSE
From 1c0861e67c09468cee1242298b7459e97de88afb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:23 +0300
Subject: [PATCH 287/609] execline: update to 2.9.0.0.
---
srcpkgs/execline/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index f27c5a33e5fb..5f98c27ecbe1 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
# Template file for 'execline'
pkgname=execline
-version=2.8.3.0
+version=2.9.0.0
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/execline/"
changelog="https://skarnet.org/software/execline/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=235dbecd594c82e0523c87c2eacf04c48781b39264158f57049f1a1ff8b4ad80
+checksum=d4906aad8c3671265cfdad1aef265228bda07e09abd7208b4f093ac76f615041
CFLAGS="-fPIC"
From 9bd6eccfc6d0ede8b97b39ff01b0b4b05f965a45 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:28 +0300
Subject: [PATCH 288/609] execline-man-pages: update to 2.9.0.0.1.
---
srcpkgs/execline-man-pages/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index 3bebd8f3ba1e..7369115caf4c 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,6 +1,6 @@
# Template file for 'execline-man-pages'
pkgname=execline-man-pages
-version=2.8.3.0.2
+version=2.9.0.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/execline-man-pages"
distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=7862c8918faa3e82ff0a65b5c108498a2b0b3b07b3ebfb8a7e6491890e0e84b4
+checksum=e8e7e3deacbfdbb7144574068fdb5621340522ec8c6fa7e4d32b6b44ee060b33
post_install() {
vlicense LICENSE
From cf35d3e70ec350fd510c7559942fe487b298eedf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:33 +0300
Subject: [PATCH 289/609] s6: update to 2.11.1.1.
---
srcpkgs/s6/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 5812c18784b0..d54785b251b2 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
# Template file for 's6'
pkgname=s6
-version=2.11.1.0
+version=2.11.1.1
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -15,7 +15,7 @@ license="ISC"
homepage="http://skarnet.org/software/s6/"
changelog="https://skarnet.org/software/s6/upgrade.html"
distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=ae64dc2ba208ff80e4ac4792ce90dd526b42bf19c966dc7d8eb9a6870e4bc23a
+checksum=1cef7f7b3a7e01181fbb6fe8300e6ba422d9689007221c78af1f99528acb6c38
build_options="static"
From 35e6d9e83ca169b53e8f59d6c452748a706d15d3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:47 +0300
Subject: [PATCH 290/609] s6-man-pages: update to 2.11.1.1.1.
---
srcpkgs/s6-man-pages/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
index 013c85787e96..308c8a8ebd2b 100644
--- a/srcpkgs/s6-man-pages/template
+++ b/srcpkgs/s6-man-pages/template
@@ -1,6 +1,6 @@
# Template file for 's6-man-pages'
pkgname=s6-man-pages
-version=2.11.1.0.1
+version=2.11.1.1.1
revision=1
build_style=gnu-makefile
short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)"
@@ -8,7 +8,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/s6-man-pages"
distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
-checksum=50ef3005c72fb790cf72b510b487fedc9f51c656e7f6f36a48762f9fc679344c
+checksum=794cd18cabee8c5afcb2cddfb35a5ae93240595aae5dc831acc8f4e258ca2199
post_install() {
vlicense LICENSE
From e09a7c715396c11f0435fc44aa732be331c9d249 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:04 +0300
Subject: [PATCH 291/609] s6-rc: update to 0.5.3.2.
---
srcpkgs/s6-rc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index e47ba8b92b1f..495907ef8a60 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,6 +1,6 @@
# Template file for 's6-rc'
pkgname=s6-rc
-version=0.5.3.0
+version=0.5.3.2
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-rc/"
changelog="https://skarnet.org/software/s6-rc/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=93a31d2bd39569f684792973b556ac02723bdb60bd1ae76e9a0ea1f4a9b43f27
+checksum=4f24a4966a4aa353d2bd1a8afca9b88c7b7bd29c46b3a1a7f5305686b9d6e038
build_options="static"
From d2452d50effbcc33132081236f8d588315399849 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:14 +0300
Subject: [PATCH 292/609] s6-linux-utils: update to 2.6.0.0.
---
srcpkgs/s6-linux-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 50bcca538641..212752cc26d0 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,6 +1,6 @@
# Template file for 's6-linux-utils'
pkgname=s6-linux-utils
-version=2.5.1.7
+version=2.6.0.0
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-linux-utils"
changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=86a8c2df4bf13e17fb04b86b60dd2ab355f47bc4bf3c3821637cf9f599addfd8
+checksum=6c7132734a0c8287002ee6910c469f175a97d766a8023c0c33af8ba92643ed59
build_options="static"
From 1eb98945580e68469e6919e3cf6fcce7560d4b0f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:23 +0300
Subject: [PATCH 293/609] s6-portable-utils: update to 2.2.5.0.
---
srcpkgs/s6-portable-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index e7de2cf69b93..ca0c308fb3b1 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,6 +1,6 @@
# Template file for 's6-portable-utils'
pkgname=s6-portable-utils
-version=2.2.4.0
+version=2.2.5.0
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-portable-utils/"
changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=cb1eea89f0311006f0132aa45324ff96fa7756d11a5f4366c68d084839e5a56f
+checksum=ebb39f8934fd36f25d31352e61bbd94dc02b1e9f04411850d2fd9658bd916e36
build_options="static"
From 37f13c320f8d1f064f4b60be1707ccbbba47a2b4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:27 +0300
Subject: [PATCH 294/609] s6-portable-utils-man-pages: update to 2.2.5.0.1.
---
srcpkgs/s6-portable-utils-man-pages/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-portable-utils-man-pages/template b/srcpkgs/s6-portable-utils-man-pages/template
index afce5d598f33..28c906c1a67a 100644
--- a/srcpkgs/s6-portable-utils-man-pages/template
+++ b/srcpkgs/s6-portable-utils-man-pages/template
@@ -1,6 +1,6 @@
# Template file for 's6-portable-utils-man-pages'
pkgname=s6-portable-utils-man-pages
-version=2.2.4.0.2
+version=2.2.5.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/s6-portable-utils-man-pages"
distfiles="https://github.com/flexibeast/s6-portable-utils-man-pages/archive/refs/tags/v${version}.tar.gz"
-checksum=af0f6b39d5b4184db08d413840b810a543ae7f9fbd19e48ea14022d5b6ac42c7
+checksum=e960dbd459285846f89900643742846848431c0d82d4645f3c4b697227abdfe4
post_install() {
vlicense LICENSE
From 6dada0f610163fd90d9440282e393cc1c635bbfa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:48 +0300
Subject: [PATCH 295/609] s6-dns: update to 2.3.5.4.
---
srcpkgs/s6-dns/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index 23f7f81ebec6..dae2279b0749 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,6 +1,6 @@
# Template file for 's6-dns'
pkgname=s6-dns
-version=2.3.5.3
+version=2.3.5.4
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib
@@ -13,7 +13,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="ISC"
homepage="https://skarnet.org/software/s6-dns"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=2ac42f6771cc95c5e9b4d50e4713c3be51733d0f615dcd6c71ef1d9e059c76da
+checksum=76af222472c4754f83cdc59ad354255ce1b1e6f6833a059328463f8e51f4db43
build_options="static"
From d63b9d9cd4b161887cc521ff33260266612e548b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:54 +0300
Subject: [PATCH 296/609] s6-networking: update to 2.5.1.1.
---
srcpkgs/s6-networking/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index d39c9cfda98e..d06d52acf170 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,6 +1,6 @@
# Template file for 's6-networking'
pkgname=s6-networking
-version=2.5.1.0
+version=2.5.1.1
revision=1
build_style=configure
configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
@@ -16,7 +16,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-networking"
changelog="https://skarnet.org/software/s6-networking/upgrade.html"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=2507c51fea5a2d07a7a77300a6502f2af4a04b6da15131f20bf984b99091ff41
+checksum=7ac79d4de3d9c13532e444ab7497c4e04ad0fa7229d502984d9dc7d48aa64418
build_options="bearssl libtls static"
build_options_default="bearssl"
From d1b95a2c9400afd702c9621b605a8b37521fcc05 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:46:03 +0300
Subject: [PATCH 297/609] oblibs: update to 0.1.4.0.
---
srcpkgs/oblibs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index c47caaf61f44..47495454055b 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,7 +1,7 @@
# Template file for 'oblibs'
pkgname=oblibs
version=0.1.4.0
-revision=1
+revision=2
wrksrc="oblibs-v${version}"
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps"
From cb3f03698261940e8354b1477183614c7967830b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:46:07 +0300
Subject: [PATCH 298/609] 66: update to 0.6.2.0.
---
srcpkgs/66/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 7ad72f7d6411..757c7e5dfd50 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
# Template file for '66'
pkgname=66
version=0.6.2.0
-revision=1
+revision=2
wrksrc="66-v${version}"
build_style=configure
configure_args="--prefix=/usr
From d8f0f5b0d231717f094ba2e919fbf3b61056f74d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:46:12 +0300
Subject: [PATCH 299/609] 66-tools: update to 0.0.8.0.
---
srcpkgs/66-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index 1b61ce1aa874..43a5c9cf6f0a 100644
--- a/srcpkgs/66-tools/template
+++ b/srcpkgs/66-tools/template
@@ -1,7 +1,7 @@
# Template file for '66-tools'
pkgname=66-tools
version=0.0.8.0
-revision=1
+revision=2
wrksrc="66-tools-v${version}"
build_style=configure
configure_args="--prefix=/usr
From 768d028d2b134d3cdeb7b0458b95bd0936256792 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:46:59 +0300
Subject: [PATCH 300/609] s6-networking-man-pages: update to 2.5.1.1.1.
---
srcpkgs/s6-networking-man-pages/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
index 2edb8b455dc2..2480ac1440f9 100644
--- a/srcpkgs/s6-networking-man-pages/template
+++ b/srcpkgs/s6-networking-man-pages/template
@@ -1,6 +1,6 @@
# Template file for 's6-networking-man-pages'
pkgname=s6-networking-man-pages
-version=2.5.1.0.1
+version=2.5.1.1.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
@@ -8,8 +8,8 @@ short_desc="Mdoc versions of the documentation for the s6-networking suite"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/s6-networking-man-pages"
-distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
-checksum=0def3cc5511f20efd47f967c498e5bd6635b1c9eded738e2fece2f956cb9bc5e
+distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/refs/tags/v${version}.tar.gz"
+checksum=8502edfc01f54c7eca8131a5cb3c9a46c698c9199f9654db9183f7e307ece258
post_install() {
vlicense LICENSE
From a259f3868caee98ed41245538338036ecf4b8802 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:47:18 +0300
Subject: [PATCH 301/609] nsss: update to 0.2.0.1.
---
srcpkgs/nsss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index 3512d09597ef..b4efae672355 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,7 +1,7 @@
# Template file for 'nsss'
pkgname=nsss
version=0.2.0.1
-revision=1
+revision=2
# Only available for musl
archs="*-musl"
build_style=configure
From e9f3912845f4c358ec1bb3abfdc093f2b13701c3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:47:22 +0300
Subject: [PATCH 302/609] mdevd: update to 0.1.5.2.
---
srcpkgs/mdevd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index 81d41322313f..9e66d2afc9b1 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,6 +1,6 @@
# Template file for 'mdevd'
pkgname=mdevd
-version=0.1.5.1
+version=0.1.5.2
revision=1
build_style=configure
configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/mdevd/"
changelog="https://skarnet.org/software/mdevd/upgrade.html"
distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=94ce95067809e8c53f3e32ce5fd0c53356085d069ce2f1d3168e4e38a64e90f5
+checksum=460372b3d3bac9f3574156ed7e48618f9f4a361cb52c4494ad9063248ab4a4ff
build_options="static"
From 107a122037515fda8677838cf5d4340b9fecb230 Mon Sep 17 00:00:00 2001
From: nyanpasu64 <nyanpasu64@tuta.io>
Date: Sun, 12 Jun 2022 17:26:17 -0700
Subject: [PATCH 303/609] kate5: update to 22.04.2.
---
srcpkgs/kate5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index dd4240f84fb4..84c794ca852e 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
# Template file for 'kate5'
pkgname=kate5
-version=22.04.1
+version=22.04.2
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://kde.org/applications/en/utilities/org.kde.kate"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=f46ec33d7edf8032efcd489cc431ebf3f93e703e0e7d88a51e93941fd8509849
+checksum=7cfec8b6391d89914aa73ead3902fdafab92f73368e0e26743cd4aab1ef117de
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
From 0d7f41f3030fe1f669f03c638576c704aeb76284 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 17:25:26 +0200
Subject: [PATCH 304/609] electrum: move INSTALL.msg to README.voidlinux
---
srcpkgs/electrum/{INSTALL.msg => files/README.voidlinux} | 0
srcpkgs/electrum/template | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
rename srcpkgs/electrum/{INSTALL.msg => files/README.voidlinux} (100%)
diff --git a/srcpkgs/electrum/INSTALL.msg b/srcpkgs/electrum/files/README.voidlinux
similarity index 100%
rename from srcpkgs/electrum/INSTALL.msg
rename to srcpkgs/electrum/files/README.voidlinux
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 4060f69a3075..8cc5b2d4bfc8 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,7 +1,7 @@
# Template file for 'electrum'
pkgname=electrum
version=4.2.0
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
@@ -27,4 +27,5 @@ post_install() {
-e 's|testnet %u|testnet|' \
${DESTDIR}/usr/share/applications/electrum.desktop
vlicense LICENCE
+ vdoc "${FILESDIR}/README.voidlinux"
}
From aca362b748d8ffbb382f030c02fc018a310b9336 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Thu, 30 Jun 2022 01:46:17 -0700
Subject: [PATCH 305/609] nss: package libnsssysinit.so.
I needed this to be able to force Firefox to use a system-wide
nss certificate store.
---
srcpkgs/nss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 0d9c200fe637..e60b37405edd 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -4,7 +4,7 @@ _nsprver=4.34
pkgname=nss
version=3.80
-revision=1
+revision=2
hostmakedepends="perl which"
makedepends="nspr-devel sqlite-devel zlib-devel"
depends="nspr>=${_nsprver}"
@@ -110,7 +110,7 @@ do_install() {
chmod 755 ${DESTDIR}/usr/bin/nss-config
for f in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
- libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so; do
+ libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so libnsssysinit.so; do
install -m755 dist/*.OBJ/lib/${f} ${DESTDIR}/usr/lib
done
From 69ea391c164787d332a9984d2353d4f861f3d7d7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 17 Jun 2022 14:45:39 -0500
Subject: [PATCH 306/609] QMPlay2: update to 22.06.16.
---
srcpkgs/QMPlay2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 1c8571de2591..f5bc74d898b4 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
-version=22.03.19
+version=22.06.16
revision=1
wrksrc="${pkgname}-src-${version}"
build_style=cmake
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=d6cde1cec25729d32a8cc1ba925b711b98d18961941f9764a7db8a75b255004e
+checksum=cc43321142bfef434181faa030815812de758a933fabdf03ddefb254cf5fcb00
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 4e3825be47b0f00392bf7a56bdf1b2c9cb21349d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 27 Jun 2022 16:49:35 -0500
Subject: [PATCH 307/609] Amass: update to 3.19.3.
---
srcpkgs/Amass/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 7106a5c312fd..d5c07bb7d33b 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
# Template file for 'Amass'
pkgname=Amass
-version=3.19.2
+version=3.19.3
revision=1
build_style=go
go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=ef2b5303b3e92debe68ea72c03c4f60320c34f0281f50b5f7108750c7e1a7491
+checksum=1b7f15c86a3de4854fccc56dabea921518606c6db0cc278d2eed1f54d334723d
From 78e02987c2fe4dd3d306ad3dedbdd7fb9d730134 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 28 Jun 2022 16:09:32 -0500
Subject: [PATCH 308/609] jadx: update to 1.4.2.
---
srcpkgs/jadx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index a03cee61cac6..41cf6bc7744b 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,6 +1,6 @@
# Template file for 'jadx'
pkgname=jadx
-version=1.4.1
+version=1.4.2
revision=1
hostmakedepends="openjdk8 gradle"
short_desc="Decompiler for Dalvik bytecode"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/skylot/jadx"
distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=a7323458143805bc10754abbc41094d866ba3c342cfa2201b77d8ee2cdadf467
+checksum=12ddc584d1b806475b8b09e2380a70dff3256cb1283f2eb3e1dec0cccf6f4176
do_build() {
gradle copyArtifacts
From a3b2f8c6ed121235d2974f6cbdf70fc3d25f1586 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 28 Jun 2022 16:09:34 -0500
Subject: [PATCH 309/609] jc: update to 1.20.1.
---
srcpkgs/jc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index d0a1c7d9fba6..f47b5a00f270 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
# Template file for 'jc'
pkgname=jc
-version=1.20.0
+version=1.20.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/kellyjonbrazil/jc"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=79a96fc7f4eaee1792954e86cbe9e9325348a0f78e73850303f00c5c8b46720b
+checksum=e0426fc0c9f687fdf1600f7503c14f0926234d6bdf316a84af204e3d2cb999ae
From 2943c2e597779c5764e81400b832cf996432663a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 30 Jun 2022 20:07:03 +0300
Subject: [PATCH 310/609] opera: update to 88.0.4412.53.
---
srcpkgs/opera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 35645b527cae..c01a1bc005a7 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
# Template file for 'opera'
pkgname=opera
-version=88.0.4412.40
+version=88.0.4412.53
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
homepage="https://www.opera.com/computer"
distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=9f825b3040bc2c3d8b10f5d45313b2006736562f0bf86fa86345c0cea9e6bacf
+checksum=de19fbbb16f00c53867e62058f0b34b046157f5277f687dc3345b20f160a9e43
repository="nonfree"
nostrip=yes
From a6b1e54c64ae0f248f232513b356f0a1d4a0ae52 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 19:29:01 +0200
Subject: [PATCH 311/609] help2man: remove gettext from hostmakdepends, it
cycles
---
srcpkgs/help2man/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index 04762df68a96..e15df17bc455 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -3,7 +3,9 @@ pkgname=help2man
version=1.49.2
revision=1
build_style=gnu-configure
-hostmakedepends="perl-Locale-gettext gettext"
+# no 'gettext' build dependency, it creates a cycle:
+# automake -> autoconf -> help2man -> !gettext! -> automake
+hostmakedepends="perl-Locale-gettext"
depends="perl-Locale-gettext"
short_desc="GNU conversion tool to create man files"
maintainer="Orphaned <orphan@voidlinux.org>"
From de4d7ef47b7aef3ba9b28192b8d1ff60b23683e6 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 30 Jun 2022 13:39:06 +0200
Subject: [PATCH 312/609] enigma: update to 1.30.
Also:
- take maintainership
- move to SDL2.0
- use system libenet instead of the bundled one
---
.../enigma/patches/fix-ifstream_test.patch | 11 --------
srcpkgs/enigma/patches/musl-redirect.patch | 22 +++++-----------
.../enigma/patches/remove-SDL_ttf-check.patch | 25 ------------------
srcpkgs/enigma/template | 26 ++++++++-----------
4 files changed, 17 insertions(+), 67 deletions(-)
delete mode 100644 srcpkgs/enigma/patches/fix-ifstream_test.patch
delete mode 100644 srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
diff --git a/srcpkgs/enigma/patches/fix-ifstream_test.patch b/srcpkgs/enigma/patches/fix-ifstream_test.patch
deleted file mode 100644
index 3a7723f990e3..000000000000
--- a/srcpkgs/enigma/patches/fix-ifstream_test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lev/Proxy.cc 2014-12-19 22:24:37.000000000 +0100
-+++ b/src/lev/Proxy.cc 2017-09-01 16:55:50.009413332 +0200
-@@ -933,7 +933,7 @@
- } else if (haveLocalCopy) {
- // plain file
- basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in);
-- if (ifs != NULL)
-+ if (ifs)
- Readfile(ifs, extCode);
- else
- haveLocalCopy = false;
diff --git a/srcpkgs/enigma/patches/musl-redirect.patch b/srcpkgs/enigma/patches/musl-redirect.patch
index ec145fcf99f3..9e288073f098 100644
--- a/srcpkgs/enigma/patches/musl-redirect.patch
+++ b/srcpkgs/enigma/patches/musl-redirect.patch
@@ -1,31 +1,21 @@
We can't assign to *stdout and *stderr with musl libc
because both file pointers are const.
---- a/src/main.cc 2014-12-19 22:24:38.000000000 +0100
-+++ b/src/main.cc 2015-11-19 13:53:23.419299858 +0100
-@@ -301,21 +301,25 @@
- if (ap.redirect) {
- FILE *newfp;
+--- a/src/main.cc 2022-06-30 12:30:19.904327808 +0200
++++ b/src/main.cc 2022-06-30 12:30:57.351968860 +0200
+@@ -315,2 +315,3 @@ void Application::init(int argc, char **
newfp = std::freopen((userStdPath + "/Output.log").c_str(), "w", stdout);
+#if defined(__GLIBC__)
if ( newfp == NULL ) { // This happens on NT
- newfp = fopen((userStdPath + "/Output.log").c_str(), "w");
- if (newfp) { // in case stdout is a macro
- *stdout = *newfp;
- }
+@@ -321,2 +322,3 @@ void Application::init(int argc, char **
}
+#endif
setvbuf(stdout, NULL, _IOLBF, BUFSIZ); // Line buffered
-
+@@ -324,2 +326,3 @@ void Application::init(int argc, char **
newfp = std::freopen((userStdPath + "/Error.log").c_str(), "w", stderr);
+#if defined(__GLIBC__)
if ( newfp == NULL ) { // This happens on NT
- newfp = fopen((userStdPath + "/Error.log").c_str(), "w");
- if (newfp) { // in case stderr is a macro
- *stderr = *newfp;
- }
+@@ -330,2 +333,3 @@ void Application::init(int argc, char **
}
+#endif
setbuf(stderr, NULL); // No buffering
- }
-
diff --git a/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch b/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
deleted file mode 100644
index 3d1454d61fe2..000000000000
--- a/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Do not check for SDL_ttf version because it fails when
-cross compiling.
-
---- a/configure.ac 2014-12-19 22:26:06.000000000 +0100
-+++ b/configure.ac 2015-11-19 12:08:46.996789539 +0100
-@@ -176,19 +176,6 @@
- dnl ----------------------------------------
- dnl Check for SDL_ttf library
- dnl ---------------------------------------
--if test "$MINGW32" = no; then
-- AC_MSG_CHECKING([for SDL_ttf >=2.0.6])
-- AC_RUN_IFELSE([AC_LANG_SOURCE(
-- [[#include <SDL_ttf.h>
-- int main(int argc, char *argv[]) {
-- if (TTF_MAJOR_VERSION < 2)
-- return 1;
-- else if (TTF_MAJOR_VERSION == 2 && TTF_MINOR_VERSION == 0 && TTF_PATCHLEVEL < 6)
-- return 1;
-- return 0;}]])],
-- [AC_MSG_RESULT([found])],
-- [AC_MSG_ERROR([SDL_ttf >= 2.0.6 not found.])])
--fi
- AC_CHECK_LIB(SDL_ttf, main,,[AC_MSG_ERROR([SDL_ttf is required to compile Enigma])])
-
- SDL_LIBS="$SDL_LIBS -lSDL_ttf"
diff --git a/srcpkgs/enigma/template b/srcpkgs/enigma/template
index d04fa5112492..7c173c56a363 100644
--- a/srcpkgs/enigma/template
+++ b/srcpkgs/enigma/template
@@ -1,20 +1,21 @@
# Template file for 'enigma'
pkgname=enigma
-version=1.21
-revision=4
+version=1.30
+revision=1
+wrksrc="Enigma-${version}"
build_style=gnu-configure
-hostmakedepends="ImageMagick automake libtool gettext-devel SDL-devel pkg-config"
-makedepends="libcurl-devel libxerces-c-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
+configure_args="--with-system-enet"
+hostmakedepends="ImageMagick automake pkg-config texi2html SDL2-devel"
+makedepends="libcurl-devel libxerces-c-devel SDL2_mixer-devel
+ SDL2_image-devel SDL2_ttf-devel libenet-devel"
short_desc="Puzzle game inspired by Oxyd on the Atari ST"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="ologantr <mrphyber@protonmail.com>"
license="GPL-2.0-or-later"
-homepage="http://www.nongnu.org/enigma/"
-distfiles="${SOURCEFORGE_SITE}/enigma-game/Release%20${version}/${pkgname}-${version}.tar.gz"
-checksum=d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01
+homepage="https://www.nongnu.org/enigma/"
+distfiles="https://github.com/Enigma-Game/Enigma/archive/refs/tags/${version}.tar.gz"
+checksum=99af962feec553dd7e794827494a6a23428a69f83d6915fcaa25f00531357cac
replaces="enigma-data>=0"
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL"
-
pre_configure() {
local dir
for dir in . lib-src/enet lib-src/zipios++; do
@@ -24,11 +25,6 @@ pre_configure() {
autoreconf -if
}
-post_install() {
- # remove the libenet headers and static library
- rm -r ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/libenet.a
-}
-
enigma-doc_package() {
short_desc+=" - documentation"
pkg_install() {
From 5923aa2c8167c8e9da259c0975587f6468601546 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 30 Jun 2022 13:43:16 -0400
Subject: [PATCH 313/609] root: touch to build on i686
---
srcpkgs/root/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 8f67b5af5d70..38f469033b5c 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,4 +1,4 @@
-# Template file for 'root'
+# Template file for 'root'
pkgname=root
version=6.26.04
revision=1
From 691bc8f93c6b09284564a98bb053f1391fa72a56 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 19:47:24 +0200
Subject: [PATCH 314/609] suil: update to 0.10.12.
---
srcpkgs/suil/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template
index 967a68b7779c..680e1972cd43 100644
--- a/srcpkgs/suil/template
+++ b/srcpkgs/suil/template
@@ -1,6 +1,6 @@
# Template file for 'suil'
pkgname=suil
-version=0.10.10
+version=0.10.12
revision=1
build_style=waf3
hostmakedepends="pkg-config lv2"
@@ -8,9 +8,10 @@ makedepends="gtk+-devel qt5-devel gtk+3-devel"
short_desc="Lightweight C library for loading and wrapping LV2 plugin UIs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://drobilla.net/software/suil/"
+homepage="https://drobilla.net/software/suil.html"
+changelog="https://gitlab.com/lv2/suil/-/raw/master/NEWS"
distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-checksum=750f08e6b7dc941a5e694c484aab02f69af5aa90edcc9fb2ffb4fb45f1574bfb
+checksum=daa763b231b22a1f532530d3e04c1fae48d1e1e03785e23c9ac138f207b87ecd
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"
From 8efb1813572444688b7bb0039412df56e19b218b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 20:04:29 +0200
Subject: [PATCH 315/609] gdb: update to 12.1.
---
srcpkgs/gdb/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 552faa668a2a..ff7c9d9a5911 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
# Template file for 'gdb'
pkgname=gdb
-version=11.1
-revision=2
+version=12.1
+revision=1
build_style=gnu-configure
pycompile_dirs="/usr/share/gdb/python"
configure_args="--disable-werror --disable-nls --with-system-readline
@@ -17,11 +17,11 @@ makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
depends="gdb-common>=${version}_${revision}"
checkdepends="dejagnu"
short_desc="GNU Debugger"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/gdb"
distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+checksum=0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed
make_check=extended # Tests take too long, not all of them pass.
python_version=3
patch_args="-Np1"
From ae98a2e3ac696854262f4849757662c82c4b1c95 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 30 Jun 2022 14:05:31 -0400
Subject: [PATCH 316/609] zfs: fix boot on non-zfs-root systems
---
.../zfs/patches/0002-fix-dracut-root.patch | 56 +++++++++++++++++++
srcpkgs/zfs/template | 2 +-
2 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/zfs/patches/0002-fix-dracut-root.patch
diff --git a/srcpkgs/zfs/patches/0002-fix-dracut-root.patch b/srcpkgs/zfs/patches/0002-fix-dracut-root.patch
new file mode 100644
index 000000000000..384f08355f73
--- /dev/null
+++ b/srcpkgs/zfs/patches/0002-fix-dracut-root.patch
@@ -0,0 +1,56 @@
+From eefe83eaa68f7cb4a49c580dd940d3688e42c849 Mon Sep 17 00:00:00 2001
+From: Toyam Cox <aviator45003@gmail.com>
+Date: Thu, 30 Jun 2022 13:47:58 -0400
+Subject: [PATCH] dracut: fix boot on non-zfs-root systems
+
+Simply prevent overwriting root until it needs to be overwritten.
+
+Dracut could change this value before this module is called, but won't
+change the kernel command line.
+
+Reviewed-by: Andrew J. Hesford <ajh@sideband.org>
+Signed-off-by: Toyam Cox <vaelatern@voidlinux.org>
+Closes #13592
+---
+ contrib/dracut/90zfs/zfs-lib.sh.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/contrib/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in
+index e44673c2d75..3a43e514d6f 100755
+--- a/contrib/dracut/90zfs/zfs-lib.sh.in
++++ b/contrib/dracut/90zfs/zfs-lib.sh.in
+@@ -88,11 +88,11 @@ decode_root_args() {
+ return
+ fi
+
+- root=$(getarg root=)
++ xroot=$(getarg root=)
+ rootfstype=$(getarg rootfstype=)
+
+ # shellcheck disable=SC2249
+- case "$root" in
++ case "$xroot" in
+ ""|zfs|zfs:|zfs:AUTO)
+ root=zfs:AUTO
+ rootfstype=zfs
+@@ -100,7 +100,7 @@ decode_root_args() {
+ ;;
+
+ ZFS=*|zfs:*)
+- root="${root#zfs:}"
++ root="${xroot#zfs:}"
+ root="${root#ZFS=}"
+ root=$(echo "$root" | tr '+' ' ')
+ rootfstype=zfs
+@@ -109,9 +109,9 @@ decode_root_args() {
+ esac
+
+ if [ "$rootfstype" = "zfs" ]; then
+- case "$root" in
++ case "$xroot" in
+ "") root=zfs:AUTO ;;
+- *) root=$(echo "$root" | tr '+' ' ') ;;
++ *) root=$(echo "$xroot" | tr '+' ' ') ;;
+ esac
+ return 0
+ fi
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index c1e89d1e5faa..27bd02a64be0 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
# Template file for 'zfs'
pkgname=zfs
version=2.1.5
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
--with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
From c621e3ace3233475c14c193087e779e679c75843 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 20:19:58 +0200
Subject: [PATCH 317/609] monocypher: update to 3.1.3.
---
srcpkgs/monocypher/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/monocypher/template b/srcpkgs/monocypher/template
index 532e4bbb68ac..f5f201c8022a 100644
--- a/srcpkgs/monocypher/template
+++ b/srcpkgs/monocypher/template
@@ -1,15 +1,15 @@
# Template file for 'monocypher'
pkgname=monocypher
-version=3.1.2
+version=3.1.3
revision=1
build_style=gnu-makefile
short_desc="Easy to use crypto library inspired by libsodium and TweetNaCl"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-2-Clause, CC0-1.0"
homepage="https://monocypher.org"
changelog="https://monocypher.org/changelog"
distfiles="https://monocypher.org/download/monocypher-${version}.tar.gz"
-checksum=f80a2e16d553e4b119634fd0e85ff86fc42afb4c9cc4569077854d1b6f5ef4f9
+checksum=b442b577df28f8c36caa01d9ae9011b5dd9c717d94be520168a04e36d7f5016e
post_install() {
vlicense LICENCE.md
From 91b1393a2b9d5af98e76876a761a48b38e8bdd74 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 30 Jun 2022 14:53:04 -0400
Subject: [PATCH 318/609] root: disable debug on i686
---
srcpkgs/root/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 38f469033b5c..e87769061a7a 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
-# Template file for 'root'
+# Template file for 'root'
pkgname=root
version=6.26.04
-revision=1
+revision=2
# Only i686 and x86_64 seem to be officially supported
archs="i686* x86_64*"
build_style=cmake
@@ -36,6 +36,10 @@ python_version=3
shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so
libTMVA.so libMathCore.so"
+case "$XBPS_TARGET_MACHINE" in
+ i686*) configure_args+=" -DCMAKE_C_FLAGS=-g0 -DCMAKE_CXX_FLAGS=-g0" ;;
+esac
+
post_install() {
rm -v ${DESTDIR}/usr/share/root/fonts/LICENSE
rm -v ${DESTDIR}/usr/share/root/fonts/[a-mt-z]*.ttf
From c99bad995e810bacd0e866bd8335af04090a8207 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 20:48:36 +0200
Subject: [PATCH 319/609] msgpack: update to 4.0.0.
---
srcpkgs/msgpack/template | 21 ++++++++++-----------
srcpkgs/msgpack/update | 2 +-
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/msgpack/template b/srcpkgs/msgpack/template
index 1ff9732ddada..1dc41a666684 100644
--- a/srcpkgs/msgpack/template
+++ b/srcpkgs/msgpack/template
@@ -1,18 +1,17 @@
# Template file for 'msgpack'
pkgname=msgpack
-version=3.3.0
+version=4.0.0
revision=1
-wrksrc="msgpack-c-cpp-${version}"
+wrksrc="msgpack-c-${version}"
build_style=cmake
-makedepends="zlib-devel"
-checkdepends="gtest-devel"
-short_desc="Binary-based efficient object serialization library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://msgpack.org/"
-changelog="https://raw.githubusercontent.com/msgpack/msgpack-c/master/CHANGELOG.md"
-distfiles="https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"
-checksum=754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b
+checkdepends="gtest-devel zlib-devel"
+short_desc="Binary-based efficient object serialization library for C"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="BSL-1.0"
+homepage="https://github.com/msgpack/msgpack-c/tree/c_master"
+changelog="https://github.com/msgpack/msgpack-c/raw/c_master/CHANGELOG.md"
+distfiles="https://github.com/msgpack/msgpack-c/releases/download/c-${version}/msgpack-c-${version}.tar.gz"
+checksum=420fe35e7572f2a168d17e660ef981a589c9cbe77faa25eb34a520e1fcc032c8
msgpack-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/msgpack/update b/srcpkgs/msgpack/update
index d72c80250ca4..fec02f66c18f 100644
--- a/srcpkgs/msgpack/update
+++ b/srcpkgs/msgpack/update
@@ -1 +1 @@
-pkgname=cpp
+pkgname=c
From eff9df868ecabfbf42bf88c582ee4e664c0abdca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 21:02:51 +0200
Subject: [PATCH 320/609] New package: msgpack-cxx-4.1.1
---
srcpkgs/msgpack-cxx/template | 19 +++++++++++++++++++
srcpkgs/msgpack-cxx/update | 1 +
2 files changed, 20 insertions(+)
create mode 100644 srcpkgs/msgpack-cxx/template
create mode 100644 srcpkgs/msgpack-cxx/update
diff --git a/srcpkgs/msgpack-cxx/template b/srcpkgs/msgpack-cxx/template
new file mode 100644
index 000000000000..f79d1fcec972
--- /dev/null
+++ b/srcpkgs/msgpack-cxx/template
@@ -0,0 +1,19 @@
+# Template file for 'msgpack-cxx'
+pkgname=msgpack-cxx
+version=4.1.1
+revision=1
+build_style=cmake
+makedepends="boost-devel"
+checkdepends="gtest-devel zlib-devel"
+depends="boost-devel"
+short_desc="Binary-based efficient object serialization library for C++"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="BSL-1.0"
+homepage="https://github.com/msgpack/msgpack-c/tree/cpp_master"
+changelog="https://github.com/msgpack/msgpack-c/raw/cpp_master/CHANGELOG.md"
+distfiles="https://github.com/msgpack/msgpack-c/releases/download/cpp-${version}/msgpack-cxx-${version}.tar.gz"
+checksum=8115c5edcf20bc1408c798a6bdaec16c1e52b1c34859d4982a0fb03300438f0b
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DMSGPACK_BUILD_TESTS=ON"
+fi
diff --git a/srcpkgs/msgpack-cxx/update b/srcpkgs/msgpack-cxx/update
new file mode 100644
index 000000000000..d72c80250ca4
--- /dev/null
+++ b/srcpkgs/msgpack-cxx/update
@@ -0,0 +1 @@
+pkgname=cpp
From e5d9cf012664c6de907d0ed3849fb990b3ca83e3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 21:03:35 +0200
Subject: [PATCH 321/609] pymol: rebuild with msgpack-cxx-4.1.1_1
---
srcpkgs/pymol/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pymol/template b/srcpkgs/pymol/template
index 659dea5d368c..03d1147542ee 100644
--- a/srcpkgs/pymol/template
+++ b/srcpkgs/pymol/template
@@ -1,12 +1,12 @@
# Template file for 'pymol'
pkgname=pymol
version=2.5.0
-revision=1
+revision=2
wrksrc=${pkgname}-open-source-${version}
build_style="python3-module"
build_helper="numpy"
makedepends="freetype-devel glew-devel glm libfreeglut-devel libgomp-devel
- libxml2-devel mmtf-cpp msgpack-devel netcdf-devel python3-PyQt5 python3-devel"
+ libxml2-devel mmtf-cpp msgpack-cxx netcdf-devel python3-PyQt5 python3-devel"
depends="python3-numpy tcsh python3-pmw python3-tkinter python3-PyQt5"
short_desc="PyMOL molecular visualization system"
maintainer="Brenton Horne <brentonhorne77@gmail.com>"
From 6430401261d5bc57efa318b5b08d645205e2b4fe Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 21:04:10 +0200
Subject: [PATCH 322/609] opendht: rebuild with msgpack-cxx-4.1.1_1
---
srcpkgs/opendht/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index ebdbdde002cf..6b9f70d6b281 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,12 +1,12 @@
# Template file for 'opendht'
pkgname=opendht
version=2.4.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
hostmakedepends="pkg-config"
-makedepends="gnutls-devel msgpack-devel readline-devel libargon2-devel asio"
+makedepends="gnutls-devel msgpack-cxx readline-devel libargon2-devel asio"
short_desc="Distributed Hash Table implementation"
maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-3.0-or-later"
From 9a7bc03387f179969facea73d57a352efc275981 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 21:04:30 +0200
Subject: [PATCH 323/609] mmtf-cpp: rebuild with msgpack-cxx-4.1.1_1
---
srcpkgs/mmtf-cpp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mmtf-cpp/template b/srcpkgs/mmtf-cpp/template
index 98e8a3a115b4..dba8f19236ba 100644
--- a/srcpkgs/mmtf-cpp/template
+++ b/srcpkgs/mmtf-cpp/template
@@ -1,10 +1,10 @@
# Template file for 'mmtf-cpp'
pkgname=mmtf-cpp
version=1.0.0
-revision=1
+revision=2
build_style=cmake
-makedepends="msgpack-devel"
-depends="msgpack-devel"
+makedepends="msgpack-cxx"
+depends="msgpack-cxx"
short_desc="C++ implementation of the MMTF API, decoder and encoder"
maintainer="John <me@johnnynator.dev>"
license="MIT"
From 108509dbe03bca6df5c81494ead5b9d139cc9b74 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 30 Jun 2022 16:41:53 -0500
Subject: [PATCH 324/609] mongo-c-driver: update to 1.22.0.
---
srcpkgs/mongo-c-driver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 39dc8a08ba71..71a11d533302 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
# Template file for 'mongo-c-driver'
pkgname=mongo-c-driver
-version=1.21.2
+version=1.22.0
revision=1
build_style=cmake
configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://mongoc.org"
distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=f9ba821fc646be893e9b9d4adfe7bded80f348b3c95b1361718caa7d965fe6f9
+checksum=272067f75e7e57c98f90a6f0c42500ef818b4b085539343676b6ce6831655eaf
mongo-c-driver-devel_package() {
short_desc+=" - development files"
From 988028ceca926b7ab34fa2de872fb4fa13043d5e Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 30 Jun 2022 16:53:09 +0200
Subject: [PATCH 325/609] tuxpaint: update to 0.9.28.
Also: move to SDL2.
---
srcpkgs/tuxpaint/template | 13 +++++++------
srcpkgs/tuxpaint/update | 1 +
2 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/tuxpaint/update
diff --git a/srcpkgs/tuxpaint/template b/srcpkgs/tuxpaint/template
index 05f3ebb77a66..b9d403940329 100644
--- a/srcpkgs/tuxpaint/template
+++ b/srcpkgs/tuxpaint/template
@@ -1,19 +1,20 @@
# Template file for 'tuxpaint'
pkgname=tuxpaint
-version=0.9.27
+version=0.9.28
revision=1
+wrksrc="${pkgname}-${version}-sdl2"
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
conf_files="/etc/tuxpaint/tuxpaint.conf"
hostmakedepends="gettext gperf pkg-config ImageMagick"
-makedepends="SDL-devel SDL_image-devel SDL_mixer-devel SDL_ttf-devel cairo-devel
- SDL_gfx-devel fribidi-devel libimagequant-devel libpaper-devel librsvg-devel"
+makedepends="SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel cairo-devel
+ SDL2_gfx-devel fribidi-devel libimagequant-devel libpaper-devel librsvg-devel"
short_desc="Free, award-winning drawing program for children ages 3 to 12"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
-homepage="http://www.tuxpaint.org/"
-distfiles="${SOURCEFORGE_SITE}/tuxpaint/${version}/tuxpaint-${version}.tar.gz"
-checksum=ab2b80e89df88228cd0ec0a6c90b49d543cb157aa38fb90cbd3a29f00140557a
+homepage="https://www.tuxpaint.org/"
+distfiles="${SOURCEFORGE_SITE}/tuxpaint/${version}/tuxpaint-${version}-sdl2.tar.gz"
+checksum=4f1ed9330feab324070b93630d79ced50ccc4816ab76750119f012b5d904709d
replaces="tuxpaint-data>=0"
python_version=2
diff --git a/srcpkgs/tuxpaint/update b/srcpkgs/tuxpaint/update
new file mode 100644
index 000000000000..ddfe99b7ae36
--- /dev/null
+++ b/srcpkgs/tuxpaint/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Qtuxpaint\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^-/_\s]*?)(?=(?:[-_.](?:src|source|orig|\w+))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
From 38d7931a66c0a5499391a3404b428430e362ab5f Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 30 Jun 2022 18:00:43 +0200
Subject: [PATCH 326/609] tuxpaint-stamps: update to 2022.06.04.
---
srcpkgs/tuxpaint-stamps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tuxpaint-stamps/template b/srcpkgs/tuxpaint-stamps/template
index 4eee816390de..9dd515f70972 100644
--- a/srcpkgs/tuxpaint-stamps/template
+++ b/srcpkgs/tuxpaint-stamps/template
@@ -1,15 +1,15 @@
# Template file for 'tuxpaint-stamps'
pkgname=tuxpaint-stamps
-version=2021.11.25
+version=2022.06.04
revision=1
build_style=gnu-makefile
make_install_target="install-all"
short_desc="Stamps set for tuxpaint"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
-homepage="http://www.tuxpaint.org/"
+homepage="https://www.tuxpaint.org/"
distfiles="${SOURCEFORGE_SITE}/tuxpaint/tuxpaint-stamps/${version//./-}/tuxpaint-stamps-${version}.tar.gz"
-checksum=cb55ee21b2d25b440ee216acfab0bb8d906af1c99adbc77e8db11eec30589d52
+checksum=842065576fae554358e00e51d71a492616a6490b12b592228067477c287a0bf8
pre_configure() {
vsed -i Makefile -e 's,DATA_PREFIX=,&$(DESTDIR),'
From 10b03ba6e42a44a8d66621a5e850c1f783311ad7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:04:42 +0200
Subject: [PATCH 327/609] libaom: update to 3.4.0.
---
common/shlibs | 2 +-
srcpkgs/libaom/template | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9aeeb079cf0e..439cf15127b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3458,7 +3458,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1
libhtmlcxx.so.3 htmlcxx-0.86_1
libcss_parser_pp.so.0 htmlcxx-0.86_1
libcss_parser.so.0 htmlcxx-0.86_1
-libaom.so.2 libaom-2.0.0_1
+libaom.so.3 libaom-3.4.0_1
libre.so.1 re-2.0.1_1
libtpms.so.0 libtpms-0.9.0_1
libswtpm_libtpms.so.0 libswtpm-0.6.1_1
diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template
index 657301c7309a..072a044043d3 100644
--- a/srcpkgs/libaom/template
+++ b/srcpkgs/libaom/template
@@ -1,6 +1,6 @@
# Template file for 'libaom'
pkgname=libaom
-version=2.0.1
+version=3.4.0
revision=1
create_wrksrc=yes
build_style=cmake
@@ -12,7 +12,10 @@ license="BSD-2-Clause"
homepage="https://aomedia.org/"
changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG"
distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"
-checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a
+# unstable checksum use content hash
+checksum=@12f82fb240e9fac8d66aa1f4850b07cb9ba025b7f899d2f94229e35122076e1d
+
+make_check=ci-skip # takes a lot of time
# aom segfaults with default musl stack size
LDFLAGS="-Wl,-z,stack-size=2097152"
@@ -35,11 +38,10 @@ pre_check() {
do_check() {
cd build
- make testdata ${makejobs}
- ../test/examples.sh --bin-path examples
-
+ ninja ${makejobs} testdata
+ ../test/examples.sh --bin-path "$PWD"
if [ "$XBPS_CHECK_PKGS" = full ]; then
- make runtests ${makejobs}
+ ninja ${makejobs} runtests
fi
}
From c0f1395d0e272c1bf16a86b548517564e33f50f1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:05:04 +0200
Subject: [PATCH 328/609] ffmpeg: rebuild for libaom-3.4.0_1
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index f42c6a1c0aa6..63d02eb3af18 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.4.2
-revision=1
+revision=2
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From c8a895cdee7f1ac55bd7105b79987f3b70b130e9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:05:04 +0200
Subject: [PATCH 329/609] gst-plugins-bad1: rebuild for libaom-3.4.0_1
---
srcpkgs/gst-plugins-bad1/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 35bd90f32021..4684ac8c4dc6 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.20.3
-revision=1
+revision=2
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
@@ -50,8 +50,12 @@ case "$XBPS_TARGET_MACHINE" in
*) build_options_default+=" gme" ;;
esac
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -Dtests=enabled"
+fi
+
do_check() {
- ninja check || msg_warn "Tests failed, but not unexpected"
+ ninja check || msg_warn "Tests failed, but not unexpected\n"
}
gst-plugins-bad1-devel_package() {
From 755112b6999e401cffdd33c61d203d95f13d3b45 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:05:05 +0200
Subject: [PATCH 330/609] libheif: rebuild for libaom-3.4.0_1
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..48b4279b9f3a 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From cd63b67571be344812760c46fe3faea78821b616 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:09:43 +0200
Subject: [PATCH 331/609] speexdsp: update to 1.2.1.
---
srcpkgs/speexdsp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/speexdsp/template b/srcpkgs/speexdsp/template
index 572957a7029f..5a410216f4e6 100644
--- a/srcpkgs/speexdsp/template
+++ b/srcpkgs/speexdsp/template
@@ -1,15 +1,15 @@
# Template file for 'speexdsp'
pkgname=speexdsp
-version=1.2.0
+version=1.2.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
-short_desc="A free codec for free speech - DSP"
+short_desc="Free codec for free speech - DSP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://www.speex.org"
distfiles="http://downloads.xiph.org/releases/speex/speexdsp-${version}.tar.gz"
-checksum=682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771
+checksum=8c777343e4a6399569c72abc38a95b24db56882c83dbdb6c6424a5f4aeb54d3d
case "$XBPS_TARGET_MACHINE" in
aarch64*) configure_args+=" --disable-neon";;
From 2d434f75dac6e0b202f0741001f26c38a7152597 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 03:00:25 +0200
Subject: [PATCH 332/609] diffutils: fix gnulib brokenness on 32-bit ppc musl
---
srcpkgs/diffutils/patches/ppc-musl.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/diffutils/patches/ppc-musl.patch
diff --git a/srcpkgs/diffutils/patches/ppc-musl.patch b/srcpkgs/diffutils/patches/ppc-musl.patch
new file mode 100644
index 000000000000..6ba37f233591
--- /dev/null
+++ b/srcpkgs/diffutils/patches/ppc-musl.patch
@@ -0,0 +1,14 @@
+--- a/lib/sigsegv.c
++++ b/lib/sigsegv.c
+@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+ /* both should be equivalent */
+ # if 0
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+-# else
++# elif defined(__GLIBC__)
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
++# else
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
+ # endif
+ # endif
+
From 9acdd00f1d3919a95e3912253eac501198df12f2 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 30 Jun 2022 21:34:44 -0700
Subject: [PATCH 333/609] conmon: update to 2.1.2
Fixes CVE-2022-1708
Include manpage
---
srcpkgs/conmon/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index 48c937d008c8..b0182acf49eb 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,19 +1,24 @@
# Template file for 'conmon'
pkgname=conmon
-version=2.1.1
+version=2.1.2
revision=1
build_style=gnu-makefile
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config go-md2man"
makedepends="libglib-devel libseccomp-devel"
short_desc="OCI container runtime monitor"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="Apache-2.0"
homepage="https://github.com/containers/conmon"
distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
-checksum=676bcd5eb7d51cd5510ac9b7513726d9d0e42698fb01e763c25aad8f0c7edde4
+checksum=8ba76eb54c319197235fd39c3a5b5a975b5a21e02cd4be985b8619220a497a0e
+
+post_build() {
+ make -C docs GOMD2MAN=go-md2man
+}
do_install() {
vbin bin/conmon
vmkdir usr/libexec/podman
ln -sf ../../bin/conmon "${DESTDIR}/usr/libexec/podman"
+ make -C docs install DESTDIR="$DESTDIR" PREFIX=/usr
}
From 13dfff320a5116f4a6ec25f8ac3bd544496ac593 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 30 Jun 2022 22:01:46 -0500
Subject: [PATCH 334/609] Signal-Desktop: update to 5.48.0.
---
srcpkgs/Signal-Desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index fd5f31224bee..6b2d16124f78 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=5.47.0
+version=5.48.0
revision=1
# Signal officially only supports x86_64 (also due to Electron)
# discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="akierig <anelki@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=d563b9be5ea5690ec2579c688db5bedbba3787b9b46428fa4164fc172e0c9322
+checksum=17c1221c3dbf56981d894446ac3f714b0ddfbee42e6fee2fe7787be78274900a
nostrip_files="signal-desktop"
post_extract() {
From 1b22ae27d9cf8fa5cf3f2898219f1a5c410d0386 Mon Sep 17 00:00:00 2001
From: JailBird <jailbird@fdf.net>
Date: Thu, 30 Jun 2022 19:12:42 -0500
Subject: [PATCH 335/609] dnsdist: update to 1.7.2
---
srcpkgs/dnsdist/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index d08573223251..ae8f79ceb2f9 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,6 +1,6 @@
# Template file for 'dnsdist'
pkgname=dnsdist
-version=1.7.1
+version=1.7.2
revision=1
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
@@ -19,7 +19,7 @@ license="GPL-2.0-only"
homepage="https://dnsdist.org/"
changelog="https://dnsdist.org/changelog.html"
distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=273a8212be2ddfaf754f752bcda4c2abc671ca5d42f776263312eb4661ea2d66
+checksum=524bd2bb05aa2e05982a971ae8510f2812303ab4486a3861b62212d06b1127cd
system_accounts="_dnsdist"
From 109a9c8f1fa48ba889e6e450398f81aec4beb7a1 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Fri, 1 Jul 2022 03:15:25 +0300
Subject: [PATCH 336/609] flameshot: update to 12.0.0.
---
srcpkgs/flameshot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index dc3f7a8a1edb..8584155fc49a 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
# Template file for 'flameshot'
pkgname=flameshot
-version=11.0.0
+version=12.0.0
revision=1
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
license="GPL-3.0-or-later"
homepage="https://github.com/lupoDharkael/flameshot"
distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=4cd158719031e97c97ecb6db1c14dd8ded44bf531c062bce496fc63be18bc2cf
+checksum=bb2a587ea47ee2eef7cd3f617a15a63d52e502b99a2a78f82e34a271a3027133
From 033ca1023ba9bebefe2114e611e2946c7f24f22a Mon Sep 17 00:00:00 2001
From: hechos <martin.damian.fernandez@gmail.com>
Date: Thu, 30 Jun 2022 22:09:10 -0300
Subject: [PATCH 337/609] pdf.js: update to 2.14.305
---
srcpkgs/pdf.js/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pdf.js/template b/srcpkgs/pdf.js/template
index 4c1614f9a7be..b12826051555 100644
--- a/srcpkgs/pdf.js/template
+++ b/srcpkgs/pdf.js/template
@@ -1,6 +1,6 @@
# Template file for 'pdf.js'
pkgname=pdf.js
-version=2.12.313
+version=2.14.305
revision=1
create_wrksrc=yes
short_desc="Portable Document Format (PDF) viewer built with HTML5"
@@ -8,7 +8,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
license="Apache-2.0"
homepage="https://mozilla.github.io/pdf.js/"
distfiles="https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"
-checksum=f9be28b8c0bcda9d344e17f2922d02d7137488cdfce37e7639ccc582305b4822
+checksum=1929a00d26d7cd631033ab5a06dcd7d6c283b7d3b06c76083fb840bd1e014896
do_install() {
vmkdir usr/share/$pkgname/
From 17058055739589a0e79ab603b5dd9c3120ea9888 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Fri, 1 Jul 2022 04:54:07 +0700
Subject: [PATCH 338/609] upterm: update to 0.9.0
---
srcpkgs/upterm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index fd99190dedb9..9990011d08c8 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,6 +1,6 @@
# Template file for 'upterm'
pkgname=upterm
-version=0.8.2
+version=0.9.0
revision=1
build_style=go
go_import_path="github.com/owenthereal/upterm"
@@ -10,7 +10,7 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
license="Apache-2.0"
homepage="https://github.com/owenthereal/upterm/"
distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz"
-checksum=4b85cf8207ffce051f2c391905fd58514c98c3fd5ff890d7340fcfd3a0ea7b8e
+checksum=1da4adcf80efff58ee8caadf402f86b4eead4bcc2783a76eb58a6b7b8b685f45
post_install() {
vcompletion etc/completion/upterm.zsh_completion zsh
From 1eff1bc478d72b50eb8cc0246ab45525a9d0c745 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 30 Jun 2022 11:44:01 +0200
Subject: [PATCH 339/609] mpg123: update to 1.30.0.
---
srcpkgs/mpg123/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 561ecb5d3a7d..6327b7ab9513 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,11 +1,10 @@
# Template file for 'mpg123'
pkgname=mpg123
-version=1.29.3
+version=1.30.0
revision=1
build_style=gnu-configure
# --with-cpu not necessary, upstream detects features correctly
-configure_args="--with-optimization=0 --with-default-audio=alsa
- --enable-ipv6=yes --enable-network=yes"
+configure_args="--with-optimization=0 --with-default-audio=alsa"
hostmakedepends="pkg-config"
makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel SDL2-devel"
short_desc="Fast console MPEG audio decoder/player"
@@ -13,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://www.mpg123.org/"
distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=963885d8cc77262f28b77187c7d189e32195e64244de2530b798ddf32183e847
+checksum=397ead52f0299475f2cefd38c3835977193fd9b1db6593680346c4e9109ed61c
case "$XBPS_TARGET_MACHINE" in
# No LFS required with musl
From 4f820c2e1629bdf620376515e3c43b087cf8c05d Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 29 Jun 2022 13:13:42 -0500
Subject: [PATCH 340/609] mesa: update to 22.1.3.
---
srcpkgs/mesa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 79d1c638443f..1a0de99bd990 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=22.1.2
+version=22.1.3
revision=1
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=0971226b4a6a3d10cfc255736b33e4017e18c14c9db1e53863ac1f8ae0deb9ea
+checksum=b98f32ba7aa2a1ff5725fb36eb999c693079f0ca16f70aa2f103e2b6c3f093e3
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false"
From 236b964526b6adf07cbb3881eb0f9d51562af20a Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <withercubes@protonmail.com>
Date: Wed, 15 Jun 2022 22:01:58 +0530
Subject: [PATCH 341/609] nsxiv: update to 30
---
srcpkgs/nsxiv/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index a52cc2bb03f2..86500ecb020b 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,7 +1,8 @@
# Template file for 'nsxiv'
pkgname=nsxiv
-version=29
+version=30
revision=1
+wrksrc=${pkgname}
build_style=gnu-makefile
make_install_target=install-all
makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
@@ -9,9 +10,10 @@ makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
maintainer="Sanjay Pavan <withercubes@protonmail.com>"
license="GPL-2.0-or-later"
-homepage="https://github.com/nsxiv/nsxiv"
-distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
-checksum="564a17d921172336f7cd463bf313e39f84e4bcf4fdc789326f4112f848aad039"
+homepage="https://codeberg.org/nsxiv/nsxiv"
+changelog="https://codeberg.org/nsxiv/nsxiv/raw/branch/master/CHANGELOG.md"
+distfiles="https://codeberg.org/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum="a916d1385872ccf0b55fbf6b8546d05fcbbbb8b0a92579494e64c6bd22fc7941"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
pre_build() {
From fe46f5f3789fa853b4ec9faf5d19e7ff287f05e6 Mon Sep 17 00:00:00 2001
From: Dakota Walsh <kota@nilsu.org>
Date: Sat, 16 Apr 2022 15:52:54 +1200
Subject: [PATCH 342/609] New package: hut-0.1.0
This is the official command line client for https://sourcehut.org/
It's basically the sourcehut equivalent to Github's hub or gh tools.
It's been in development for a while now, but they've put out their
first release earlier this month. I've been using it happily for a while
before this release.
---
srcpkgs/hut/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/hut/template
diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
new file mode 100644
index 000000000000..f1448fcf1f49
--- /dev/null
+++ b/srcpkgs/hut/template
@@ -0,0 +1,29 @@
+# Template file for 'hut'
+pkgname=hut
+version=0.1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=go
+build_helper=qemu
+go_import_path="git.sr.ht/~emersion/hut"
+hostmakedepends="scdoc"
+short_desc="CLI tool for sr.ht"
+maintainer="Dakota Walsh <kota@nilsu.org>"
+license="AGPL-3.0-only"
+homepage="https://git.sr.ht/~emersion/hut"
+changelog="https://git.sr.ht/~emersion/hut/log"
+distfiles="https://git.sr.ht/~emersion/hut/archive/v${version}.tar.gz"
+checksum=5af8f1111f9ec1da9a818978eb1f013dfd50ad4311c79d95b0e62ad428ac1c59
+
+post_install() {
+ hut=$(find $GOPATH/bin -name hut)
+ for sh in bash fish zsh; do
+ vtargetrun $hut completion $sh > hut.$sh
+ vcompletion hut.$sh $sh
+ done
+
+ vlicense LICENSE
+
+ scdoc < doc/hut.1.scd > doc/hut.1
+ vman doc/hut.1
+}
From 9d1a464040d040f7afb0bf6e54b78dedf7935dff Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 1 Jul 2022 02:31:12 -0400
Subject: [PATCH 343/609] hut: touch to rebuild on x86_64
---
srcpkgs/hut/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index f1448fcf1f49..545567773781 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,4 +1,4 @@
-# Template file for 'hut'
+# Template file for 'hut'
pkgname=hut
version=0.1.0
revision=1
From a2e75f7dc7a31b4dea879caccf6b09c371431894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 344/609] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From f7f03e6d2ce504ad729e832fce167f82ac1b34b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 345/609] ansible-core: update to 2.13.1.
---
...mmand-v-instead-of-which-in-Makefile.patch | 32 ++++++++++++++++
...or-missing-git-executable-more-gener.patch | 38 +++++++++++++++++++
srcpkgs/ansible-core/template | 38 ++++++++++++-------
3 files changed, 94 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
create mode 100644 srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
new file mode 100644
index 000000000000..a6ec631de778
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
@@ -0,0 +1,32 @@
+From 40acbda0805b0a43d723a1cc73fba8b40b624940 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:33:46 +0200
+Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile
+
+'which' is not standardized and can even be considered problematic [1]
+
+[1] https://lwn.net/Articles/874049/
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7641344968..45421e88e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
+ # This doesn't evaluate until it's called. The -D argument is the
+ # directory of the target file ($@), kinda like `dirname`.
+ MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
+-ifneq ($(shell which rst2man 2>/dev/null),)
++ifneq ($(shell command -v rst2man 2>/dev/null),)
+ ASCII2MAN = rst2man $< $@
+-else ifneq ($(shell which rst2man.py 2>/dev/null),)
++else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
+ ASCII2MAN = rst2man.py $< $@
+ else
+ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch b/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
new file mode 100644
index 000000000000..6fa9cfbaec5b
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
@@ -0,0 +1,38 @@
+From 9d0ab3aa9d0dd1a3d3885b44448acb262396a57d Mon Sep 17 00:00:00 2001
+From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com>
+Date: Thu, 30 Jun 2022 13:19:44 -0400
+Subject: [PATCH 2/2] Make unit test for missing git executable more generic
+ (#78173)
+
+* Make unit test for missing git executable more generic
+
+* use MagicMock side_effect to raise exception instead
+---
+ test/units/galaxy/test_collection_install.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py
+index 7525a194ca..d83fe42054 100644
+--- a/test/units/galaxy/test_collection_install.py
++++ b/test/units/galaxy/test_collection_install.py
+@@ -181,13 +181,14 @@ def test_concrete_artifact_manager_scm_no_executable(monkeypatch):
+ monkeypatch.setattr(collection.concrete_artifact_manager.subprocess, 'check_call', mock_subprocess_check_call)
+ mock_mkdtemp = MagicMock(return_value='')
+ monkeypatch.setattr(collection.concrete_artifact_manager, 'mkdtemp', mock_mkdtemp)
++ mock_get_bin_path = MagicMock(side_effect=[ValueError('Failed to find required executable')])
++ monkeypatch.setattr(collection.concrete_artifact_manager, 'get_bin_path', mock_get_bin_path)
+
+ error = re.escape(
+ "Could not find git executable to extract the collection from the Git repository `https://github.com/org/repo`"
+ )
+- with mock.patch.dict(os.environ, {"PATH": ""}):
+- with pytest.raises(AnsibleError, match=error):
+- collection.concrete_artifact_manager._extract_collection_from_git(url, version, b'path')
++ with pytest.raises(AnsibleError, match=error):
++ collection.concrete_artifact_manager._extract_collection_from_git(url, version, b'path')
+
+
+ @pytest.mark.parametrize(
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..23124e9fb613 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,30 +1,40 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging
+ python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
+depends="python3-cryptography python3-Jinja2 python3-paramiko python3-yaml
+ python3-packaging python3-resolvelib python3-pytz git"
+checkdepends="${depends} python3-pytest python3-pytest-xdist
+ python3-pytest-forked unzip openssh python3-pytest-mock libselinux"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
+
+ make docs
+ for page in docs/man/man1/*.1; do
+ vman ${page}
+ done
+
vsconf examples/ansible.cfg
vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
}
ansible-base_package() {
From 8a5d68c5833c83f8fd767262816702dd62d3960a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 346/609] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
From 618798f7969a49b20cc52c2d79e79321f74b0419 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 1 Jul 2022 03:25:05 -0400
Subject: [PATCH 347/609] act: update to 0.2.29.
---
srcpkgs/act/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index b2a7f5663ab0..939b9a8a0a10 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,6 +1,6 @@
# Template file for 'act'
pkgname=act
-version=0.2.28
+version=0.2.29
revision=1
build_style=go
go_import_path="github.com/nektos/act"
@@ -10,7 +10,7 @@ maintainer="0x5c <dev@0x5c.io>"
license="MIT"
homepage="https://github.com/nektos/act"
distfiles="https://github.com/nektos/act/archive/refs/tags/v${version}.tar.gz"
-checksum=010b9f02d2c431d9e09f5be1cf3099bd3fbab49043c53e34aa92b99bba8da3d1
+checksum=92c7f774395e98cff2e53c9739d8266027837cd27f437514ea342a59179c3115
post_install() {
vlicense LICENSE
From d2ff6d28c623e96c47d0d1fb0839eef0f9c55554 Mon Sep 17 00:00:00 2001
From: octeep <octeep@pm.me>
Date: Sat, 28 May 2022 02:10:16 +0100
Subject: [PATCH 348/609] libupnp: update to 1.14.12
---
srcpkgs/libupnp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index b13c99374a98..9e2da2d594c3 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -1,6 +1,6 @@
# Template file for 'libupnp'
pkgname=libupnp
-version=1.14.4
+version=1.14.12
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
@@ -8,8 +8,9 @@ short_desc="Portable Open Source UPnP Development Kit"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://pupnp.github.io/pupnp/"
+changelog="https://pupnp.github.io/pupnp/ChangeLog"
distfiles="https://github.com/pupnp/pupnp/releases/download/release-$version/$pkgname-$version.tar.bz2"
-checksum=cd649ef53070e9b88680f730ed5b3f919658582d43dd315a2ed8b6105c6fbe63
+checksum=091c80aada1e939c2294245c122be2f5e337cc932af7f7d40504751680b5b5ac
CFLAGS="-D_FILE_OFFSET_BITS=64"
From 39d4f1a1d7ac2015168176d44e2b01c424bb6d1e Mon Sep 17 00:00:00 2001
From: octeep <octeep@pm.me>
Date: Sat, 28 May 2022 02:10:35 +0100
Subject: [PATCH 349/609] gerbera: update to 1.11.0
---
srcpkgs/gerbera/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 4e0e2a94a9fb..7b4f1a5f1f3d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.6.4
-revision=5
+version=1.11.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
@@ -12,8 +12,9 @@ short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
+changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
+checksum=0c13049792a28ec0e3086ba61c7f9675626a1dbadb043650a452192727418be7
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 999ebe6b3fbfe8bb1b519055108d9897c09f4e5f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Fri, 1 Jul 2022 12:15:54 +0200
Subject: [PATCH 350/609] libplacebo: update to 4.192.1.
---
common/shlibs | 2 +-
srcpkgs/libplacebo/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 439cf15127b4..092894ad8d1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3447,7 +3447,7 @@ libSoapySDR.so.0.7 SoapySDR-0.7.0_1
libeditorconfig.so.0 editorconfig-0.12.2_1
libcfitsio.so.9 cfitsio-3.480_1
libapparmor.so.1 libapparmor-2.12.0_1
-libplacebo.so.157 libplacebo-4.157.0_1
+libplacebo.so.192 libplacebo-4.192.1_1
libw2xc.so waifu2x-converter-cpp-5.2_1
libnova-0.15.so.0 libnova-0.15.0_1
libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index c8a7b7d79548..6375ff2aa185 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,6 +1,6 @@
# Template file for 'libplacebo'
pkgname=libplacebo
-version=4.157.0
+version=4.192.1
revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
@@ -10,11 +10,11 @@ hostmakedepends="pkg-config python3-Mako Vulkan-Headers"
makedepends="shaderc Vulkan-Headers vulkan-loader $(vopt_if lcms lcms2-devel)
$(vopt_if opengl libepoxy-devel)"
short_desc="Reusable library for GPU-accelerated video/image rendering"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://code.videolan.org/videolan/libplacebo"
distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz"
-checksum=8ee7773fb7813520b6b1e5f8f207cdf0071a7cf48ca0ce871e956ae6f4d0d538
+checksum=e6c5805cf4d955b5941dd12b00fe157b61e77995bc1786b9a86df0ca99a0edc4
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 354ef15781f02adc85a96c51cf2efe5efa66460f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Fri, 1 Jul 2022 12:22:39 +0200
Subject: [PATCH 351/609] mpv: revbump for libplacebo-4.192.1.
---
srcpkgs/mpv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f7093a16fa85..5d016e225da5 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
version=0.34.1
-revision=1
+revision=2
build_style=waf3
configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
--enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
From e9b7dab8707003fac0656f6a6e93210471813323 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Fri, 1 Jul 2022 12:23:53 +0200
Subject: [PATCH 352/609] vlc: revbump for libplacebo-4.192.1.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 69d14f330ed5..42f9f58c3cb9 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.17.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From a12ae5754fd8b07c2f6a22749451e95d4de98402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 14:56:28 +0200
Subject: [PATCH 353/609] tarpaulin: orphan package
---
srcpkgs/tarpaulin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index d983c3fadbd1..906c16a73721 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -8,7 +8,7 @@ make_check_args="-- --test-threads 1"
hostmakedepends="pkg-config cmake"
makedepends="openssl-devel zlib-devel"
short_desc="Code coverage tool for Rust/Cargo projects"
-maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://github.com/xd009642/tarpaulin"
distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
From c3a1ab78449f4edadab03f6932480db7591bef01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 1 Jul 2022 09:44:10 -0400
Subject: [PATCH 354/609] zfsbootmenu: drop perl-Config-IniFiles dependency
---
srcpkgs/zfsbootmenu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 3e27d86b9c0d..b5db95441392 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,11 +1,11 @@
# Template file for 'zfsbootmenu'
pkgname=zfsbootmenu
version=2.0.0
-revision=1
+revision=2
build_style=gnu-makefile
depends="dracut zfs kexec-tools fzf bash pigz mbuffer ncurses
- perl-Config-IniFiles perl-Sort-Versions perl-boolean perl-YAML-PP"
-short_desc="ZFS Boot Environment menu, implemented in Dracut"
+ perl-Sort-Versions perl-boolean perl-YAML-PP"
+short_desc="ZFS bootloader for root-on-ZFS systems"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
homepage="https://github.com/zbm-dev/zfsbootmenu"
From 5c82d109fd7355b2c0f9ccefdc04b66f21fe1480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jul 2022 20:51:59 +0700
Subject: [PATCH 355/609] git: update to 2.37.0.
---
srcpkgs/git/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 702dca4ef81f..2f22f5ae5bf7 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
# Template file for 'git'
pkgname=git
-version=2.36.1
+version=2.37.0
revision=1
hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
homepage="https://git-scm.com/"
changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370
+checksum=9f7fa1711bd00c4ec3dde2fe44407dc13f12e4772b5e3c72a58db4c07495411f
replaces="git-perl>=0"
register_shell=/usr/bin/git-shell
python_version=3
From c0f0226c4d78d3be2497ff6a57dd582678e32252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 15 Nov 2021 21:46:23 +0700
Subject: [PATCH 356/609] gmic: fix license, clean do_build
---
srcpkgs/gmic/patches/01-includedir.patch | 44 +++++++++++++++++++
srcpkgs/gmic/patches/02-opt-flags.patch | 28 ++++++++++++
.../patches/03-plugindir-and-no-wget.patch | 15 +++++++
.../gmic/patches/04-no-krita-and-order.patch | 39 ++++++++++++++++
srcpkgs/gmic/template | 31 +++----------
5 files changed, 131 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/gmic/patches/01-includedir.patch
create mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
create mode 100644 srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch
create mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
new file mode 100644
index 000000000000..2cf9031443e5
--- /dev/null
+++ b/srcpkgs/gmic/patches/01-includedir.patch
@@ -0,0 +1,44 @@
+Index: gmic-2.9.9/src/Makefile
+===================================================================
+--- gmic-2.9.9.orig/src/Makefile
++++ gmic-2.9.9/src/Makefile
+@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
+ NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
+
+ # Minimal set of flags mandatory to compile G'MIC.
+-MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
++MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
+ MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
+
+ ifndef NO_SRIPDLIB
+ MANDATORY_CFLAGS += -std=c++11 -pedantic
+ endif
+-MANDATORY_LIBS += -L$(USR)/$(LIB)
++MANDATORY_LIBS +=
+ ifdef IS_GCC
+ MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
+ MANDATORY_LIBS += -lm
+@@ -250,7 +250,7 @@ endif
+ # Enable faster X11 display, using XShm extension.
+ # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
+ XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
+-XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
++XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
+
+ # Enable image display, using GDI32 (Windows).
+ GDI32_CFLAGS = -Dcimg_display=2
+@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
+
+ # Enable support of most classical image file formats, using the GraphicsMagick++ library.
+ # (http://www.graphicsmagick.org/Magick++/)
+-MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
++MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
+ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
+ OPENEXR_LIBS = -lIlmImf -lHalf
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
new file mode 100644
index 000000000000..0d3a5894e589
--- /dev/null
+++ b/srcpkgs/gmic/patches/02-opt-flags.patch
@@ -0,0 +1,28 @@
+Index: gmic-2.9.9/src/Makefile
+===================================================================
+--- gmic-2.9.9.orig/src/Makefile
++++ gmic-2.9.9/src/Makefile
+@@ -192,9 +192,9 @@ endif
+
+ # Enable optimizations for 'cli'.
+ FLTO = -flto
+-OPT_CLI_CFLAGS = -Ofast
++OPT_CLI_CFLAGS =
+ ifdef IS_GCC
+-OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
++OPT_CLI_CFLAGS = $(FLTO)
+ OPT_CLI_LIBS = $(FLTO)
+ endif
+ ifdef icpc
+Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
+===================================================================
+--- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
++++ gmic-2.9.9/gmic-qt/gmic_qt.pro
+@@ -445,7 +445,6 @@ translations/zh_tw.ts
+
+ # PRE_TARGETDEPS +=
+
+-QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
+ QMAKE_LFLAGS_RELEASE += -s
+ QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
+
diff --git a/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch
new file mode 100644
index 000000000000..5b403240efc9
--- /dev/null
+++ b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch
@@ -0,0 +1,15 @@
+Index: gmic-2.9.9/src/Makefile
+===================================================================
+--- gmic-2.9.9.orig/src/Makefile
++++ gmic-2.9.9/src/Makefile
+@@ -67,8 +67,8 @@ INCLUDE = include
+ SO = .so
+ PIC = -fPIC
+ EXE =
+-WGET = wget --no-check-certificate --quiet -O
+-PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins
++WGET = false
++PLUGINDIR = /usr/lib/gimp/2.0/plug-ins
+ VERSION = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c3)
+ VERSION1 = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c1)
+ VERSION2 = $(shell grep 'gmic_version\ ' gmic.h | tail -c3 | head -c1)
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
new file mode 100644
index 000000000000..18ce17a97a7b
--- /dev/null
+++ b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
@@ -0,0 +1,39 @@
+Index: gmic-2.9.9/src/Makefile
+===================================================================
+--- gmic-2.9.9.orig/src/Makefile
++++ gmic-2.9.9/src/Makefile
+@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
+ #-------------------------------
+ # Define main Makefile entries.
+ #-------------------------------
+
+ # Multi-targets
+ #--------------
+-all:
++all: cli lib gimp gmic_qt libc zart
++
++gmic_qt: gimp
++
++gimp zart: cli lib libc
++
++cli lib libc: all-banner
++
++all-banner:
+ @echo "**"
+ ifeq ($(OS),Unix)
+ @echo "** Start building G'MIC with default Unix configuration."
+ else
+ ifeq ($(OS),Darwin)
+ @echo "** Start building G'MIC with default MacOSX configuration."
+ else
+ @echo "** Start building G'MIC with default Windows configuration."
+ endif
+ endif
+ @echo "**"
+- $(MAKE) cli lib gimp krita gmic_qt libc zart
+
+ native:
+ $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
+
+ # CLI (standard)
+ #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..b9871e7bbe7c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,52 +1,31 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
+make_build_args=NOSTRIP=yes
+make_use_env=yes
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="CECILL-2.1"
+license="CECILL-2.1, CECILL-C"
homepage="http://gmic.eu/"
distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-disable_parallel_build="yes"
+# disable_parallel_build="yes"
post_extract() {
mv ../zart-${_zart_hash} zart
}
-post_patch() {
- vsed -i Makefile -e "s,-I[\$](USR),-I$XBPS_CROSS_BASE/usr,g"
- vsed -i Makefile -e "s/-Ofast/-O2/g"
- # uses gimptool-2.0 to determine PLUGINDIR which fails in cross builds
- vsed -i Makefile -e "s,^PLUGINDIR = .*,PLUGINDIR = /usr/lib/gimp/2\.0/plug-ins,g"
- vsed -i ../gmic-qt/gmic_qt.pro -e "s/-Ofast/-O2/g"
- # Not supported on ppc but we already compile for baselines
- case "$XBPS_TARGET_MACHINE" in
- ppc*) vsed -i Makefile -e 's;-mtune=generic;;' ;;
- esac
-}
-
-do_build() {
- make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
- CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
- CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
- cli lib libc
-
- for _target in gimp gmic_qt zart; do
- make $_target
- done
-}
-
post_install() {
vlicense ../COPYING
}
From d37bea4f9228b9b70d97782b86fdf927ab51c13b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 17:19:25 +0200
Subject: [PATCH 357/609] skaffold: fix checksum
---
srcpkgs/skaffold/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 81555a927f40..e04ce3ca784d 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://skaffold.dev/"
changelog="https://github.com/GoogleContainerTools/skaffold/releases"
distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=f285e554257c914c5ab247a0a1a2e28e66926c6cda8959365869328b2af61c51
+checksum=8716bb69853c721bc4e57e3912b8eb5b31bb1850300555fce238ebf7cf57c727
From 3ef06b08c3294ec656cae6c8bdedb550eeedcb6f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 17:19:28 +0200
Subject: [PATCH 358/609] sigi: broken on ppc64 BE because of rustix junk
---
srcpkgs/sigi/template | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
index e7651b6d4dec..fd42f7fa00d5 100644
--- a/srcpkgs/sigi/template
+++ b/srcpkgs/sigi/template
@@ -10,6 +10,11 @@ homepage="https://github.com/hiljusti/sigi"
distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
checksum=81f1171495ca53246df1f271e7bc631454e94c8294b95e277f29136572bef6ad
+case "$XBPS_TARGET_MACHINE" in
+ ppc64le*) ;;
+ ppc64*) broken="some rustix junk";;
+esac
+
post_install() {
vman sigi.1
}
From 0a14e0f8375f54338dacccc6d32e0ac524dd5003 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 17:19:47 +0200
Subject: [PATCH 359/609] qemu, qemu-user-static: fix build on ppc32
---
.../qemu/patches/fix-linux-user-ppc32.patch | 117 ++++++++++++++++++
1 file changed, 117 insertions(+)
create mode 100644 srcpkgs/qemu/patches/fix-linux-user-ppc32.patch
diff --git a/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch b/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch
new file mode 100644
index 000000000000..cd47435d5aa9
--- /dev/null
+++ b/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch
@@ -0,0 +1,117 @@
+commit 37814f62c2cc7aba2eea073014d6c53dcd5bf42c
+Author: q66 <daniel@octaforge.org>
+Date: Fri Jul 1 16:53:55 2022 +0200
+
+ fix linux-user build on 32-bit ppc
+
+ Partial revert https://gitlab.com/qemu-project/qemu/-/commit/9d1401b79463e74adbfac69d836789d4e103fb61
+ and https://gitlab.com/qemu-project/qemu/-/commit/0a7e01904d407baa73c1baddbdfc9ccf2ace8356
+
+diff --git a/common-user/host/ppc/safe-syscall.inc.S b/common-user/host/ppc/safe-syscall.inc.S
+new file mode 100644
+index 0000000..e69de29
+diff --git a/common-user/safe-syscall-error.c b/common-user/safe-syscall-error.c
+index cf74b50..a36132c 100644
+--- a/common-user/safe-syscall-error.c
++++ b/common-user/safe-syscall-error.c
+@@ -12,6 +12,7 @@
+ #include "qemu/osdep.h"
+ #include "user/safe-syscall.h"
+
++#if !defined(__powerpc__) || defined(__powerpc64__)
+ /*
+ * This is intended to be invoked via tail-call on the error path
+ * from the assembly in host/arch/safe-syscall.inc.S. This takes
+@@ -23,3 +24,4 @@ long safe_syscall_set_errno_tail(int value)
+ errno = value;
+ return -1;
+ }
++#endif
+diff --git a/include/user/safe-syscall.h b/include/user/safe-syscall.h
+index 61a04e2..793fe84 100644
+--- a/include/user/safe-syscall.h
++++ b/include/user/safe-syscall.h
+@@ -125,6 +125,8 @@
+ * kinds of restartability.
+ */
+
++#if !defined(__powerpc__) || defined(__powerpc64__)
++
+ /* The core part of this function is implemented in assembly */
+ extern long safe_syscall_base(int *pending, long number, ...);
+ extern long safe_syscall_set_errno_tail(int value);
+@@ -137,4 +139,10 @@ extern char safe_syscall_end[];
+ safe_syscall_base(&((TaskState *)thread_cpu->opaque)->signal_pending, \
+ __VA_ARGS__)
+
++#else
++
++#define safe_syscall syscall
++
++#endif
++
+ #endif
+diff --git a/linux-user/include/host/ppc/host-signal.h b/linux-user/include/host/ppc/host-signal.h
+new file mode 100644
+index 0000000..b80384d
+--- /dev/null
++++ b/linux-user/include/host/ppc/host-signal.h
+@@ -0,0 +1,38 @@
++/*
++ * host-signal.h: signal info dependent on the host architecture
++ *
++ * Copyright (c) 2003-2005 Fabrice Bellard
++ * Copyright (c) 2021 Linaro Limited
++ *
++ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
++ * See the COPYING file in the top-level directory.
++ */
++
++#ifndef PPC_HOST_SIGNAL_H
++#define PPC_HOST_SIGNAL_H
++
++/* The third argument to a SA_SIGINFO handler is ucontext_t. */
++typedef ucontext_t host_sigcontext;
++
++static inline uintptr_t host_signal_pc(host_sigcontext *uc)
++{
++ return uc->uc_mcontext.regs->nip;
++}
++
++static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc)
++{
++ uc->uc_mcontext.regs->nip = pc;
++}
++
++static inline void *host_signal_mask(host_sigcontext *uc)
++{
++ return &uc->uc_sigmask;
++}
++
++static inline bool host_signal_write(siginfo_t *info, host_sigcontext *uc)
++{
++ return uc->uc_mcontext.regs->trap != 0x400
++ && (uc->uc_mcontext.regs->dsisr & 0x02000000);
++}
++
++#endif
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 092e70b..b8dfa8a 100644
+--- a/linux-user/signal.c
++++ b/linux-user/signal.c
+@@ -800,6 +800,7 @@ void queue_signal(CPUArchState *env, int sig, int si_type,
+ /* Adjust the signal context to rewind out of safe-syscall if we're in it */
+ static inline void rewind_if_in_safe_syscall(void *puc)
+ {
++#if !defined(__powerpc__) || defined(__powerpc64__)
+ host_sigcontext *uc = (host_sigcontext *)puc;
+ uintptr_t pcreg = host_signal_pc(uc);
+
+@@ -807,6 +808,7 @@ static inline void rewind_if_in_safe_syscall(void *puc)
+ && pcreg < (uintptr_t)safe_syscall_end) {
+ host_signal_set_pc(uc, (uintptr_t)safe_syscall_start);
+ }
++#endif
+ }
+
+ static void host_signal_handler(int host_sig, siginfo_t *info, void *puc)
From 3ba7326ca27bd9d7467f2f40de6a9974926a263c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Jul 2022 11:20:41 -0500
Subject: [PATCH 360/609] yara: update to 4.2.2.
---
srcpkgs/yara/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index df2a2f39937f..34db8bb94746 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
# Template file for 'yara'
pkgname=yara
-version=4.2.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--enable-magic --enable-cuckoo"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://virustotal.github.io/yara/"
distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=f26d9c481e6789181431ac410665f6ba25d551c2948995f84c9e17df7a93731a
+checksum=20bd56857c4b037c4baae71587b7d22d0b7bbb075a7afa516ba35dae50fadd25
pre_configure() {
autoreconf -fi
From e6165de2fe86562a1011e6c4e304c29ed39aeb0e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Jul 2022 11:29:48 -0500
Subject: [PATCH 361/609] python3-youtubesearch: update to 1.6.6.
---
srcpkgs/python3-youtubesearch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 494188c3a466..34b0fbfd7a88 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
# Template file for 'python3-youtubesearch'
pkgname=python3-youtubesearch
-version=1.6.5
+version=1.6.6
revision=1
wrksrc="youtube-search-python-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/alexmercerind/youtube-search-python"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=5e47c2bd09829aa830bc7f855693c20dfe49d2390c3041b0a44422cc743b3f00
+checksum=6474472d1a93df9a803eea32c939be4af9bd6af6a13ea997ab3c339d0f9f2851
make_check=no # no tests defined
post_install() {
From c5ea210fdbad782e112dbccad1c5755287c3f331 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Jul 2022 11:32:05 -0500
Subject: [PATCH 362/609] ytmdl: add missing dependency
---
srcpkgs/ytmdl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 5dfe4a7636a8..2575c3ee61d1 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,7 +1,7 @@
# Template file for 'ytmdl'
pkgname=ytmdl
version=2022.03.16
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama
@@ -10,7 +10,7 @@ depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama
python3-Unidecode python3-urllib3 python3-youtube-search
python3-pyDes python3-simber python3-rich python3-musicbrainzngs
python3-typing_extensions python3-ytmusicapi python3-youtubesearch
- python3-spotipy"
+ python3-spotipy python3-redis"
short_desc="Get songs from youtube in mp3 format with all tags from itunes"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
From 581c90643e52d40144675d31e8f43cdcd3ec6532 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 1 Jul 2022 17:38:31 +0100
Subject: [PATCH 363/609] rofi-rbw: update to 1.0.1.
---
srcpkgs/rofi-rbw/patches/wofi.patch | 28 ----------------------------
srcpkgs/rofi-rbw/template | 6 +++---
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/rofi-rbw/patches/wofi.patch
diff --git a/srcpkgs/rofi-rbw/patches/wofi.patch b/srcpkgs/rofi-rbw/patches/wofi.patch
deleted file mode 100644
index 9627b6771b3c..000000000000
--- a/srcpkgs/rofi-rbw/patches/wofi.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d059d0a4f352d295c116639798f8b5e110967e4f Mon Sep 17 00:00:00 2001
-From: Fabian Winter <5821180+fdw@users.noreply.github.com>
-Date: Mon, 27 Jun 2022 20:55:21 +0200
-Subject: [PATCH] Return correct values from wofi
-
-Returning no targets might not be the best idea...
-
-Issue: #51
----
- src/rofi_rbw/selector.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/rofi_rbw/selector.py b/src/rofi_rbw/selector.py
-index d2c9844..e5d8696 100644
---- a/src/rofi_rbw/selector.py
-+++ b/src/rofi_rbw/selector.py
-@@ -198,9 +198,9 @@ def show_selection(
- encoding='utf-8'
- )
- if wofi.returncode == 0:
-- return [], DEFAULT(), wofi.stdout
-+ return DEFAULT(), DEFAULT(), wofi.stdout
- else:
-- return [], CANCEL(), wofi.stdout
-+ return CANCEL(), CANCEL(), wofi.stdout
-
- def select_target(
- self,
diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template
index 5a2ef1eedcec..d50f8ff13b21 100644
--- a/srcpkgs/rofi-rbw/template
+++ b/srcpkgs/rofi-rbw/template
@@ -1,7 +1,7 @@
# Template file for 'rofi-rbw'
pkgname=rofi-rbw
-version=1.0.0
-revision=2
+version=1.0.1
+revision=1
build_style=python3-pep517
make_install_target="rofi_rbw-${version}-py3-none-any.whl"
hostmakedepends="python3-setuptools python3-wheel"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/fdw/rofi-rbw"
changelog="https://raw.githubusercontent.com/fdw/rofi-rbw/HEAD/CHANGELOG.md"
distfiles="https://github.com/fdw/rofi-rbw/archive/${version}.tar.gz"
-checksum=25cebb7d0cbff19cd0dc54834455de0ae291c74c4d51d66a5c10a57093b49799
+checksum=37f14462a7a918df2ac9350db8e3822fc7bf9af490dddb60299ea73c976f6c97
post_install() {
vman src/rofi_rbw/docs/rofi-rbw.1
From 889a57912b644e33c52a713d37d3c66e1edb844e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 14:21:47 +0200
Subject: [PATCH 364/609] python3-ddt: update to 1.5.0.
---
srcpkgs/python3-ddt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ddt/template b/srcpkgs/python3-ddt/template
index 7b72f8743042..80b7023d7e7c 100644
--- a/srcpkgs/python3-ddt/template
+++ b/srcpkgs/python3-ddt/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ddt'
pkgname=python3-ddt
-version=1.4.4
+version=1.5.0
revision=1
wrksrc=ddt-${version}
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://ddt.readthedocs.io/"
distfiles="https://github.com/datadriventests/ddt/archive/refs/tags/${version}.tar.gz"
-checksum=658c994827f84acc1b67f0d882960724328459078d4a3fdd4737c642fe0ea090
+checksum=5ba3bad9966b832931c03fa73cf8670e886166c3684354f8826636d2961767f9
post_install() {
vlicense LICENSE.md
From 39b54dc02e5d761e006ed0873e56f5194b8f865e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 1 Jul 2022 14:15:13 -0400
Subject: [PATCH 365/609] vkQuake: update to 1.20.1.
---
srcpkgs/vkQuake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 88e2b0eaf0eb..7af2e754d21a 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
# Template file for 'vkQuake'
pkgname=vkQuake
-version=1.20.0
+version=1.20.1
revision=1
build_wrksrc="Quake"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/Novum/vkQuake"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=2ff682a4b289607c56200d9d0920e3a360fe1b8aeb8cb39d4e0f4b460f4ad744
+checksum=81ec663afba5d88e298d27cfeef5cdf40bc1aeb1d6683f13ae32021701543283
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 0d0c6bf7a952a8a9c0ab5154e8cee8de522128ef Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 20:26:12 +0200
Subject: [PATCH 366/609] conmon: only include docs on archs supported by go
---
srcpkgs/conmon/template | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index b0182acf49eb..763a2d6697dc 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -3,7 +3,7 @@ pkgname=conmon
version=2.1.2
revision=1
build_style=gnu-makefile
-hostmakedepends="pkg-config go-md2man"
+hostmakedepends="pkg-config"
makedepends="libglib-devel libseccomp-devel"
short_desc="OCI container runtime monitor"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
@@ -12,13 +12,23 @@ homepage="https://github.com/containers/conmon"
distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
checksum=8ba76eb54c319197235fd39c3a5b5a975b5a21e02cd4be985b8619220a497a0e
+_have_docs=no
+
+case "$XBPS_MACHINE" in
+ x86_64*|ppc64le*|aarch64*|arm*|i686*) _have_docs=yes;;
+esac
+
+if [ "$_have_docs" = "yes" ]; then
+ hostmakedepends+=" go-md2man"
+fi
+
post_build() {
- make -C docs GOMD2MAN=go-md2man
+ [ "$_have_docs" = "yes" ] && make -C docs GOMD2MAN=go-md2man || :
}
do_install() {
vbin bin/conmon
vmkdir usr/libexec/podman
ln -sf ../../bin/conmon "${DESTDIR}/usr/libexec/podman"
- make -C docs install DESTDIR="$DESTDIR" PREFIX=/usr
+ [ "$_have_docs" = "yes" ] && make -C docs install DESTDIR="$DESTDIR" PREFIX=/usr || :
}
From 588642bd10162234eccb1c8b5b7dadaf37274018 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 30 Jun 2022 12:49:03 -0400
Subject: [PATCH 367/609] openjdk11: fix memory corruption issue on musl
https://bugs.openjdk.org/browse/JDK-8289477
---
.../files/musl_patches/8289477.patch | 35 +++++++++++++++++++
srcpkgs/openjdk11/template | 3 +-
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/openjdk11/files/musl_patches/8289477.patch
diff --git a/srcpkgs/openjdk11/files/musl_patches/8289477.patch b/srcpkgs/openjdk11/files/musl_patches/8289477.patch
new file mode 100644
index 000000000000..57ac4866b578
--- /dev/null
+++ b/srcpkgs/openjdk11/files/musl_patches/8289477.patch
@@ -0,0 +1,35 @@
+From da6d1fc0e0aeb1fdb504aced4b0dba0290ec240f Mon Sep 17 00:00:00 2001
+From: Thomas Stuefe <stuefe@openjdk.org>
+Date: Thu, 30 Jun 2022 06:19:25 +0000
+Subject: [PATCH] 8289477: Memory corruption with CPU_ALLOC, CPU_FREE on muslc
+
+Reviewed-by: dholmes, clanger
+---
+ src/hotspot/os/linux/os_linux.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
+index 726926218907..8ee10e201c69 100644
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -4591,7 +4591,8 @@ static int _cpu_count(const cpu_set_t* cpus) {
+ // dynamic check - see 6515172 for details.
+ // If anything goes wrong we fallback to returning the number of online
+ // processors - which can be greater than the number available to the process.
+-int os::Linux::active_processor_count() {
++static int get_active_processor_count() {
++ // Note: keep this function, with its CPU_xx macros, *outside* the os namespace (see JDK-8289477).
+ cpu_set_t cpus; // can represent at most 1024 (CPU_SETSIZE) processors
+ cpu_set_t* cpus_p = &cpus;
+ int cpus_size = sizeof(cpu_set_t);
+@@ -4663,6 +4664,10 @@ int os::Linux::active_processor_count() {
+ return cpu_count;
+ }
+
++int os::Linux::active_processor_count() {
++ return get_active_processor_count();
++}
++
+ // Determine the active processor count from one of
+ // three different sources:
+ //
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 48be7fa6bfc8..b148ebe1e008 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,7 +1,7 @@
# Template file for 'openjdk11'
pkgname=openjdk11
version=11.0.12+7
-revision=2
+revision=3
_java_ver="${version%%.*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*"
@@ -43,6 +43,7 @@ provides="java-environment-${version}_1"
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
+disable_parallel_check=yes
build_options="docs"
case "$XBPS_TARGET_MACHINE" in
From ab6a65646fca39aa5d4c334f0330e8352bdbfbf8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 30 Jun 2022 12:49:14 -0400
Subject: [PATCH 368/609] openjdk17: fix memory corruption issue on musl
https://bugs.openjdk.org/browse/JDK-8289477
---
.../files/musl_patches/8289477.patch | 35 +++++++++++++++++++
srcpkgs/openjdk17/template | 3 +-
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/openjdk17/files/musl_patches/8289477.patch
diff --git a/srcpkgs/openjdk17/files/musl_patches/8289477.patch b/srcpkgs/openjdk17/files/musl_patches/8289477.patch
new file mode 100644
index 000000000000..57ac4866b578
--- /dev/null
+++ b/srcpkgs/openjdk17/files/musl_patches/8289477.patch
@@ -0,0 +1,35 @@
+From da6d1fc0e0aeb1fdb504aced4b0dba0290ec240f Mon Sep 17 00:00:00 2001
+From: Thomas Stuefe <stuefe@openjdk.org>
+Date: Thu, 30 Jun 2022 06:19:25 +0000
+Subject: [PATCH] 8289477: Memory corruption with CPU_ALLOC, CPU_FREE on muslc
+
+Reviewed-by: dholmes, clanger
+---
+ src/hotspot/os/linux/os_linux.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
+index 726926218907..8ee10e201c69 100644
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -4591,7 +4591,8 @@ static int _cpu_count(const cpu_set_t* cpus) {
+ // dynamic check - see 6515172 for details.
+ // If anything goes wrong we fallback to returning the number of online
+ // processors - which can be greater than the number available to the process.
+-int os::Linux::active_processor_count() {
++static int get_active_processor_count() {
++ // Note: keep this function, with its CPU_xx macros, *outside* the os namespace (see JDK-8289477).
+ cpu_set_t cpus; // can represent at most 1024 (CPU_SETSIZE) processors
+ cpu_set_t* cpus_p = &cpus;
+ int cpus_size = sizeof(cpu_set_t);
+@@ -4663,6 +4664,10 @@ int os::Linux::active_processor_count() {
+ return cpu_count;
+ }
+
++int os::Linux::active_processor_count() {
++ return get_active_processor_count();
++}
++
+ // Determine the active processor count from one of
+ // three different sources:
+ //
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 03ac17c81b4d..3ae920a80676 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,7 +1,7 @@
# Template file for 'openjdk17'
pkgname=openjdk17
version=17.0.3+7
-revision=2
+revision=3
_gtest_ver=1.8.1
_java_ver="${version%%.*}"
_jdk_update="${version#*+}"
@@ -52,6 +52,7 @@ patch_args="-Np1 --directory=$build_wrksrc"
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
+disable_parallel_check=yes
build_options="docs"
case "$XBPS_TARGET_MACHINE" in
From 2113b6dc90d0ce9a700ca91d21ab3eb81bd40f71 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 24 Mar 2022 13:12:36 -0400
Subject: [PATCH 369/609] python3-ruamel.yaml: update to 0.17.21.
---
srcpkgs/python3-ruamel.yaml/template | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ruamel.yaml/template b/srcpkgs/python3-ruamel.yaml/template
index b8ad65ed0883..4f9dadaa0006 100644
--- a/srcpkgs/python3-ruamel.yaml/template
+++ b/srcpkgs/python3-ruamel.yaml/template
@@ -1,25 +1,23 @@
# Template file for 'python3-ruamel.yaml'
pkgname=python3-ruamel.yaml
-version=0.16.12
-revision=4
+version=0.17.21
+revision=1
wrksrc="ruamel.yaml-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
-depends="python3"
+depends="python3-ruamel.yaml.clib"
short_desc="YAML parser/emitter in Python 3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://yaml.readthedocs.io/"
+changelog="https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/CHANGES"
distfiles="${PYPI_SITE}/r/ruamel.yaml/ruamel.yaml-${version}.tar.gz"
-checksum=076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e
+checksum=8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af
+make_check=no # no tests included in distfiles
export RUAMEL_NO_PIP_INSTALL_CHECK=1
-do_check() {
- :
-}
-
post_install() {
vlicense LICENSE
}
From 27c738ab5e356ecc8b2800997e2beba739e4cbac Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 24 Mar 2022 13:32:43 -0400
Subject: [PATCH 370/609] whipper: add patch to support ruamel.yaml>=0.17
---
.../patches/ruamel.yaml-0.17_compat.patch | 109 ++++++++++++++++++
srcpkgs/whipper/template | 2 +-
2 files changed, 110 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch
diff --git a/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch b/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch
new file mode 100644
index 000000000000..206547e4b3e9
--- /dev/null
+++ b/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch
@@ -0,0 +1,109 @@
+From e0942417a1c267781a8b676789730457dcb2e6fa Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Sun, 20 Jun 2021 15:18:37 +0200
+Subject: [PATCH] Use custom YAML subclass to be compatible with
+ ruamel_yaml>=0.17
+
+Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
+---
+ whipper/common/yaml.py | 18 ++++++++++++++++++
+ whipper/result/logger.py | 11 ++++++-----
+ whipper/test/test_result_logger.py | 14 ++++++--------
+ 3 files changed, 30 insertions(+), 13 deletions(-)
+ create mode 100644 whipper/common/yaml.py
+
+diff --git a/whipper/common/yaml.py b/whipper/common/yaml.py
+new file mode 100644
+index 00000000..4edb0b36
+--- /dev/null
++++ b/whipper/common/yaml.py
+@@ -0,0 +1,18 @@
++from ruamel.yaml import YAML as ruamel_YAML
++from ruamel.yaml.compat import StringIO
++
++# https://yaml.readthedocs.io/en/latest/example.html#output-of-dump-as-a-string
++class YAML(ruamel_YAML):
++ def __init__(self, *args, **kwargs):
++ super().__init__()
++ self.width = 4000
++ self.default_flow_style = False
++
++ def dump(self, data, stream=None, **kw):
++ inefficient = False
++ if stream is None:
++ inefficient = True
++ stream = StringIO()
++ ruamel_YAML.dump(self, data, stream, **kw)
++ if inefficient:
++ return stream.getvalue()
+diff --git a/whipper/result/logger.py b/whipper/result/logger.py
+index b7043adc..f4471a00 100644
+--- a/whipper/result/logger.py
++++ b/whipper/result/logger.py
+@@ -1,12 +1,12 @@
+ import time
+ import hashlib
+ import re
+-import ruamel.yaml as yaml
+ from ruamel.yaml.comments import CommentedMap as OrderedDict
+
+ import whipper
+
+ from whipper.common import common
++from whipper.common.yaml import YAML
+ from whipper.result import result
+
+
+@@ -148,11 +148,12 @@ def logRip(self, ripResult, epoch):
+ data["EOF"] = "End of status report"
+ riplog["Conclusive status report"] = data
+
++ yaml = YAML(
++ typ="rt",
++ pure=True
++ )
+ riplog = yaml.dump(
+- riplog,
+- default_flow_style=False,
+- width=4000,
+- Dumper=yaml.RoundTripDumper
++ riplog
+ )
+ # Add a newline after the "Log creation date" line
+ riplog = re.sub(
+diff --git a/whipper/test/test_result_logger.py b/whipper/test/test_result_logger.py
+index 411b61af..98c89ab5 100644
+--- a/whipper/test/test_result_logger.py
++++ b/whipper/test/test_result_logger.py
+@@ -3,8 +3,8 @@
+ import os
+ import re
+ import unittest
+-import ruamel.yaml
+
++from whipper.common.yaml import YAML
+ from whipper.result.result import TrackResult, RipResult
+ from whipper.result.logger import WhipperLogger
+
+@@ -163,16 +163,14 @@ def testLogger(self):
+ ))
+ )
+
+- yaml = ruamel.yaml.YAML()
++ yaml = YAML(
++ typ='rt',
++ pure=True
++ )
+ parsedLog = yaml.load(actual)
+ self.assertEqual(
+ actual,
+- ruamel.yaml.dump(
+- parsedLog,
+- default_flow_style=False,
+- width=4000,
+- Dumper=ruamel.yaml.RoundTripDumper
+- )
++ yaml.dump(parsedLog)
+ )
+ log_body = "\n".join(actualLines[:-1]).encode()
+ self.assertEqual(
diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index c5bbd74cfacc..e0f5cf8b8026 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -1,7 +1,7 @@
# Template file for 'whipper'
pkgname=whipper
version=0.10.0
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
makedepends="libsndfile-devel python3-devel"
From beb6c14e566799e70e273c527741b5626f989d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 14:49:29 +0200
Subject: [PATCH 371/609] i3status-rust: update to 0.22.0.
---
srcpkgs/i3status-rust/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index e8282155e7b0..230dbca134cb 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
# Template file for 'i3status-rust'
pkgname=i3status-rust
-version=0.21.10
+version=0.22.0
revision=1
build_style=cargo
make_check_args="--bins"
@@ -11,8 +11,8 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/greshake/i3status-rust"
changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
-distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=d20d883dbd02026cd396ee5797f33606bcebbe0185cf8ca06b76bc325d854bb6
+distfiles="https://github.com/greshake/i3status-rust/archive/refs/tags/v${version}.tar.gz"
+checksum=cd28a90ccb2f9faaaef1e528619f1018981609d77f409abe4877350d810d3324
post_install() {
vmkdir usr/share/i3status-rust
From 4a3455b7505151b6ed422fe200beb75f47231839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 14:09:36 +0200
Subject: [PATCH 372/609] comrak: update to 0.13.1.
---
srcpkgs/comrak/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/comrak/template b/srcpkgs/comrak/template
index 1cf003b7127c..4a6efc39ee13 100644
--- a/srcpkgs/comrak/template
+++ b/srcpkgs/comrak/template
@@ -1,6 +1,6 @@
# Template file for 'comrak'
pkgname=comrak
-version=0.13.0
+version=0.13.1
revision=1
build_style=cargo
short_desc="CommonMark + GFM compatible Markdown parser and renderer"
@@ -8,10 +8,11 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="BSD-2-Clause"
homepage="https://github.com/kivikakk/comrak"
distfiles="https://github.com/kivikakk/comrak/archive/${version}.tar.gz"
-checksum=e4b65fd55ef0dfc3835f24a5234a52b457534a2b500971f4c2e800f4ee889a69
+checksum=a6169ba0ad7117c423ade7946d64e97fffe33217bf7094a850493c6dfba556c8
case "$XBPS_TARGET_MACHINE" in
- i686*) broken="LLVM ran out of registers during register allocation: https://pastebin.com/raw/DLCa9nEz" ;;
+# Tests don't compile on i686: ran out of registers during register allocation
+ i686*) make_check=no ;;
esac
post_patch() {
From 8d33ad8cb8bd82810ea6d01833da2d2b60aa3946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 13:24:48 +0200
Subject: [PATCH 373/609] python3-hcloud: update to 1.17.0.
---
srcpkgs/python3-hcloud/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template
index 5b2584860022..12eb46af1027 100644
--- a/srcpkgs/python3-hcloud/template
+++ b/srcpkgs/python3-hcloud/template
@@ -1,6 +1,6 @@
# Template file for 'python3-hcloud'
pkgname=python3-hcloud
-version=1.16.0
+version=1.17.0
revision=1
wrksrc="${pkgname/python3-/}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/hetznercloud/hcloud-python"
distfiles="${PYPI_SITE}/h/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc
+checksum=f8142e0438be277c6fa1ddee13aecd5da152b48c6dec7fd4970def1b5dc219e2
post_install() {
vlicense LICENSE
From b9f6d69d02da0d6d47b21b50f761796c777a79b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 26 Jun 2022 16:47:17 +0200
Subject: [PATCH 374/609] python3-jsonschema: update to 4.6.1.
---
srcpkgs/python3-jsonschema/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index 120392ad1be3..a1dd7ff5d073 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,20 +1,24 @@
# Template file for 'python3-jsonschema'
pkgname=python3-jsonschema
-version=4.4.0
+version=4.6.1
revision=1
wrksrc="jsonschema-${version}"
build_style=python3-pep517
-make_check_args="--deselect jsonschema/tests/test_cli.py::TestCLIIntegration::test_license"
-hostmakedepends="python3-setuptools_scm python3-wheel"
+hostmakedepends="hatchling hatch-vcs"
depends="python3-attrs python3-pyrsistent"
-checkdepends="python3-pytest python3-Twisted $depends"
short_desc="Implementation of JSON Schema for Python3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/Julian/jsonschema"
changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83
+checksum=ec2802e6a37517f09d47d9ba107947589ae1d25ff557b925d83a321fc2aa5d3b
+# Tests require jsonschema to be installed already. Setting PYTHONPATH doesn't seem to do trick
+make_check=no
+
+pre_build() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
+}
post_install() {
vlicense COPYING LICENSE
From 17fdf53b7e5c791593fc6c5524881b5218ab5f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 08:53:19 +0200
Subject: [PATCH 375/609] python3-bracex: update to 2.3.post1.
---
srcpkgs/python3-bracex/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-bracex/template b/srcpkgs/python3-bracex/template
index a88b1f66737c..89025d991378 100644
--- a/srcpkgs/python3-bracex/template
+++ b/srcpkgs/python3-bracex/template
@@ -1,10 +1,10 @@
# Template file for 'python3-bracex'
pkgname=python3-bracex
-version=2.2.1
+version=2.3.post1
revision=1
wrksrc="${pkgname/python3-/}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="hatchling"
depends="python3"
checkdepends="python3-pytest"
short_desc="Bash style brace expansion for Python"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://github.com/facelessuser/bracex"
changelog="https://raw.githubusercontent.com/facelessuser/bracex/master/docs/src/markdown/about/changelog.md"
distfiles="${PYPI_SITE}/b/bracex/bracex-${version}.tar.gz"
-checksum=1c8d1296e00ad9a91030ccb4c291f9e4dc7c054f12c707ba3c5ff3e9a81bcd21
+checksum=e7b23fc8b2cd06d3dec0692baabecb249dda94e06a617901ff03a6c56fd71693
post_install() {
vlicense LICENSE.md
From 963e418a616f1d0eeb473f23783bed128db1d2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 08:59:13 +0200
Subject: [PATCH 376/609] python3-wcmatch: update to 8.4.
---
srcpkgs/python3-wcmatch/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-wcmatch/template b/srcpkgs/python3-wcmatch/template
index d132c7721d80..60ad0128e422 100644
--- a/srcpkgs/python3-wcmatch/template
+++ b/srcpkgs/python3-wcmatch/template
@@ -1,12 +1,12 @@
# Template file for 'python3-wcmatch'
pkgname=python3-wcmatch
-version=8.3
+version=8.4
revision=1
wrksrc="${pkgname/python3-/}-${version}"
-build_style=python3-module
-make_check_args="--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_realpath
---deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_tilde"
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+#make_check_args="--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_realpath
+#--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_tilde"
+hostmakedepends="hatchling"
depends="python3-bracex"
checkdepends="python3-pytest ${depends}"
short_desc="Wilcard File Name matching library"
@@ -15,7 +15,7 @@ license="MIT"
homepage="https://github.com/facelessuser/wcmatch"
changelog="https://raw.githubusercontent.com/facelessuser/wcmatch/main/docs/src/markdown/about/changelog.md"
distfiles="${PYPI_SITE}/w/wcmatch/wcmatch-${version}.tar.gz"
-checksum=371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db
+checksum=ba4fc5558f8946bf1ffc7034b05b814d825d694112499c86035e0e4d398b6a67
post_install() {
vlicense LICENSE.md
From 6a89241542e213dae68c1c70b5a98291d24b3b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 10 Jun 2022 17:30:55 +0200
Subject: [PATCH 377/609] python3-ansible-lint: update to 6.3.0.
---
srcpkgs/python3-ansible-lint/template | 41 ++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 19b1453782e9..a2887ed6ad5c 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,13 +1,42 @@
# Template file for 'python3-ansible-lint'
pkgname=python3-ansible-lint
-version=6.2.2
+version=6.3.0
revision=1
wrksrc="${pkgname/python3-/}-${version}"
build_style=python3-pep517
+# These require ansible-lint installed properly, or they are flaky
+make_check_args="--deselect test/test_eco.py::test_eco
+ --deselect test/test_main.py::test_call_from_outside_venv
+ --deselect test/test_cli_role_paths.py::test_run_single_role_path_no_trailing_slash_script
+ --deselect test/test_cli_role_paths.py::test_run_multiple_role_path_with_trailing_slash
+ --deselect test/test_cli_role_paths.py::test_run_role_name_with_prefix
+ --deselect test/test_cli_role_paths.py::test_run_role_name_from_meta
+ --deselect test/test_cli_role_paths.py::test_run_invalid_role_name_from_meta
+ --deselect test/test_cli_role_paths.py::test_run_role_three_dir_deep
+ --deselect test/test_cli_role_paths.py::test_run_playbook
+ --deselect test/test_cli_role_paths.py::test_run_role_name_invalid
+ --deselect test/test_cli_role_paths.py::test_run_single_role_path_no_trailing_slash_module
+ --deselect test/test_cli_role_paths.py::test_run_inside_role_dir
+ --deselect test/test_cli_role_paths.py::test_run_single_role_path_with_trailing_slash
+ --deselect test/test_cli_role_paths.py::test_run_multiple_role_path_no_trailing_slash
+ --deselect test/test_cli_role_paths.py::test_run_single_role_path_with_roles_path_env
+ --deselect test/test_verbosity.py::test_default_verbosity
+ --deselect test/test_task_includes.py::test_included_tasks
+ --deselect test/test_utils.py::test_cli_auto_detect
+ --deselect test/test_list_rules.py::test_list_rules_includes_opt_in_rules
+ --deselect test/test_formatter_json.py::test_code_climate_parsable_ignored
+ --deselect test/test_examples.py::test_custom_kinds
+ --deselect src/ansiblelint/rules/only_builtins.py::test_only_builtin_fail
+ --deselect test/test_import_playbook.py::test_task_hook_import_playbook
+ --deselect test/test_rules_collection.py::test_rich_rule_listing"
+make_install_target="ansible_lint-*-*-*-*.whl"
hostmakedepends="python3-wheel python3-setuptools_scm"
depends="ansible-core python3-yamllint python3-six python3-yaml
python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch
- python3-ansible-compat"
+ python3-ansible-compat python3-jsonschema"
+checkdepends="${depends} python3-pytest black python3-flake8 python3-flaky
+ python3-mypy pylint python3-pytest-cov python3-pytest-xdist
+ python3-pytest-forked"
short_desc="Linter for Ansible files"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
# Note about licensing from upstream:
@@ -18,12 +47,10 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/ansible-community/ansible-lint"
distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=b8e2956fede90bd28150e97f209a8af787c6001f584bb6613112a1ce1aea311d
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
+checksum=f57f520ae5d810ce062157dc7d633990ad2fbec81bbbb34ccc4ce3a0c21fcd38
+make_check_pre="env PYTHONPATH=src"
post_patch() {
vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
}
From 546fb206b3064acba7e810fea58bcfaece632915 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 30 Jun 2022 14:59:30 +0200
Subject: [PATCH 378/609] bmake: update to 20220612.
---
srcpkgs/bmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index babb5d6d3938..98bbd90eab3e 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
# Template file for 'bmake'
pkgname=bmake
-version=20220418
+version=20220612
revision=1
create_wrksrc=yes
short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://www.crufty.net/help/sjg/bmake.html"
distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=6ea7de515cba74f173dc14ee17b1488ae032582028d2e86ea12f70369cc896f5
+checksum=e34bcc6375c75ae5b53551da0b1d6c1205cdee61e4f564e2cfe04081a5a682fa
python_version=3
do_configure() {
From 6bdc8ce6919c6b9c6c593ff2d30c94b07bd4ad22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Jul 2022 23:46:15 +0200
Subject: [PATCH 379/609] mathcomp: update to 1.15.0.
---
srcpkgs/mathcomp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 9c218e87e686..bfda9502f24c 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
-version=1.14.0
-revision=3
+version=1.15.0
+revision=1
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="CECILL-B"
homepage="https://github.com/math-comp/math-comp"
distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz"
-checksum=d259cc95a2f8f74c6aa5f3883858c9b79c6e87f769bde9a415115fa4876ebb31
+checksum=33105615c937ae1661e12e9bc00e0dbad143c317a6ab78b1a15e1d28339d2d95
nocross="ocaml"
do_install() {
From 282cb8302fd305524164a8ec1091deef0f7910f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 1 Jul 2022 16:38:37 +0200
Subject: [PATCH 380/609] doctl: update to 1.78.0.
---
srcpkgs/doctl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index b04f9077a4de..8d5ad0293ff4 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
# Template file for 'doctl'
pkgname=doctl
-version=1.77.0
+version=1.78.0
revision=1
build_style=go
go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/digitalocean/doctl"
distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=56514dd2d50d74703aef2c184127804e1b08ff2216130125bd066255ebe3220e
+checksum=8b2fb24f00b98db8f6a730cf8d7703b2e0b8fd0abe23cd1a64e325d4e8f49ffe
From c1978bc90fd9db44e67ae9e6fecbc5c7500cf0dd Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Fri, 1 Jul 2022 12:42:25 -0700
Subject: [PATCH 381/609] wf-recorder: update to 0.3.0.
---
srcpkgs/wf-recorder/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..e278eb001600 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,17 +1,17 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
-version=0.2.1
+version=0.3.0
revision=1
build_style=meson
-hostmakedepends="pkg-config ninja scdoc wayland-devel"
+hostmakedepends="pkg-config scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
- pulseaudio-devel ocl-icd-devel"
+ pulseaudio-devel"
short_desc="Screen recorder for wlroots-based compositors"
maintainer="Jony <maybe-one-day-ubermensch@protonmail.com>"
license="MIT"
homepage="https://github.com/ammen99/wf-recorder"
distfiles="https://github.com/ammen99/${pkgname}/archive/v${version}.tar.gz"
-checksum=45cf04cf58cf241c22fa2fbb70481a3747ad33e6930e4bdba7b9cc7018789ad1
+checksum=3af1e933872653233d87167bab73d96f984d00e995385190b586be4d89dbbfdf
# silly workaround to prevent vector/bool/etc from being defined
case "$XBPS_TARGET_MACHINE" in
From 8e8004b780074c2bd7a0586ac389a5549b9e9b88 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 29 Jun 2022 15:49:52 -0700
Subject: [PATCH 382/609] libopenraw: split pixbuf loader into subpackage
The pixbuf loader can cause issues loading files and isn't always needed.
The pixbuf loader is also considered deprecated upstream, so it should probably
be split into its own package.
---
srcpkgs/libopenraw-pixbuf-loader | 1 +
srcpkgs/libopenraw/template | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libopenraw-pixbuf-loader
diff --git a/srcpkgs/libopenraw-pixbuf-loader b/srcpkgs/libopenraw-pixbuf-loader
new file mode 120000
index 000000000000..aa7a4d2d924b
--- /dev/null
+++ b/srcpkgs/libopenraw-pixbuf-loader
@@ -0,0 +1 @@
+libopenraw
\ No newline at end of file
diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template
index 5b2f7bbd814f..542d63319c58 100644
--- a/srcpkgs/libopenraw/template
+++ b/srcpkgs/libopenraw/template
@@ -1,7 +1,7 @@
# Template file for 'libopenraw'
pkgname=libopenraw
version=0.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config curl"
@@ -10,8 +10,8 @@ short_desc="Library for camera RAW files decoding"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
#changelog="https://raw.githubusercontent.com/hfiguiere/libopenraw/master/NEWS"
-homepage="https://${pkgname}.freedesktop.org/wiki/"
-distfiles="https://${pkgname}.freedesktop.org/download/${pkgname}-${version}.tar.bz2"
+homepage="https://libopenraw.freedesktop.org/wiki/"
+distfiles="https://libopenraw.freedesktop.org/download/libopenraw-${version}.tar.bz2"
checksum=6405634f555849eb01cb028e2a63936e7b841151ea2a1571ac5b5b10431cfab9
post_install() {
@@ -29,3 +29,11 @@ libopenraw-devel_package() {
vmove usr/include
}
}
+
+libopenraw-pixbuf-loader_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ description=" - pixbuf loader"
+ pkg_install() {
+ vmove "usr/lib/gdk-pixbuf-2.0"
+ }
+}
From 2139993c964e33d38cc45879387de08a3f1e9250 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jul 2022 08:20:04 +0200
Subject: [PATCH 383/609] wine: update to 7.12.
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 6f807b194d5d..e043313f260d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=7.11
+version=7.12
revision=1
_pkgver=${version/r/-r}
create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="fa28deed99efba8e4b0cd9bb56ce62e57a4d15560baebd4bd69b6754ab41dc3f
- f706e242dcd5d687e636f670415c313059fd76680c7909b7aa3d1848f14700ca"
+checksum="809cec13716636e6eafd4c3da7312456a844d316020a5578611bcdba21069c68
+ 9789d236b19724429ab213fe6c5980642f4c55003fb47023288a25e28f1ae450"
build_options="mingw staging xshm"
build_options_default="mingw xshm"
From 381f3681f31c4e6c28ef477b8b9243e88961f0ae Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jul 2022 10:09:00 +0200
Subject: [PATCH 384/609] linux5.4: update to 5.4.202.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index cda95ec80d98..13a8fb7496bf 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.201
+version=5.4.202
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=813dd73120c1f72e69feda9c029902450ebfbac6323fe4cf3c5547a298c36e61
+checksum=5ca1bce19eab6a07d7d25c9f1a9c1f27e2b7802188705957cda8095a202a533d
python_version=3
nodebug=yes # -dbg package is generated below manually
From 05a65366e9068a82d46869d01310159df29a8c2d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jul 2022 10:21:56 +0200
Subject: [PATCH 385/609] libvirt: update to 8.5.0.
---
srcpkgs/libvirt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index acccee487bee..da6bb0480fa8 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
# Template file for 'libvirt'
pkgname=libvirt
-version=8.4.0
+version=8.5.0
revision=1
build_style=meson
configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://libvirt.org"
changelog="https://libvirt.org/news.html"
distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=601a6e9bb03a43d05659f63e4a403df253ab0975b4a973f10a5607f3bbc018dd
+checksum=401e99b5e1b83de39a86347e091a85eb4dba82a87053dfcb5aa250328f97db62
# At least one test times out on CI but works locally
make_check=ci-skip
From c9ddaaa74a50374db94cf2ceccc1e100a4bda685 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jul 2022 10:25:23 +0200
Subject: [PATCH 386/609] libvirt-python3: update to 8.5.0.
---
srcpkgs/libvirt-python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 70bd2af43cfe..e7c07e23a344 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
# Template file for 'libvirt-python3'
pkgname=libvirt-python3
-version=8.4.0
+version=8.5.0
revision=1
wrksrc="libvirt-python-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="LGPL-2.1-or-later"
homepage="https://pypi.org/project/libvirt-python/"
distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=6d252ad4e0f765620bbde450be8f2b844e4f85c568b207ac644f52c6a982f46c
+checksum=5ceb23983bb0968250b95110f4e7a5321cc30044d7d89209654413315452777f
do_check() {
PYTHONPATH="$(cd build/lib.* && pwd)" pytest
From ee9d1de8393d84fec046a616073dc35a9643d86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 2 Jul 2022 15:41:11 +0700
Subject: [PATCH 387/609] grpc: split libgrpc, ship plugin on cross-compile
Why we're at it, clean build steps, remove all reference to absl in
pkg-config and cmake config.
---
common/shlibs | 24 ++++-----
srcpkgs/grpc/patches/absl-is-private.patch | 58 ++++++++++++++++++++++
srcpkgs/grpc/template | 30 ++++++-----
srcpkgs/libgrpc | 1 +
4 files changed, 89 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/grpc/patches/absl-is-private.patch
create mode 120000 srcpkgs/libgrpc
diff --git a/common/shlibs b/common/shlibs
index 092894ad8d1e..7e4bcbef47f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3659,18 +3659,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
libaal-1.0.so.7 libaal-1.0.7_1
libaal-minimal.so.0 libaal-1.0.7_1
libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.18 grpc-1.39.0_1
-libgpr.so.18 grpc-1.39.0_1
-libgrpc++.so.1.39 grpc-1.39.0_1
-libgrpc++_alts.so.1.39 grpc-1.39.0_1
-libgrpc++_error_details.so.1.39 grpc-1.39.0_1
-libgrpc++_reflection.so.1.39 grpc-1.39.0_1
-libgrpc++_unsecure.so.1.39 grpc-1.39.0_1
-libgrpc.so.18 grpc-1.39.0_1
-libgrpc_plugin_support.so.1.39 grpc-1.39.0_1
-libgrpc_unsecure.so.18 grpc-1.39.0_1
-libgrpcpp_channelz.so.1.39 grpc-1.39.0_1
-libupb.so.18 grpc-1.39.0_1
+libaddress_sorting.so.18 libgrpc-1.39.0_6
+libgpr.so.18 libgrpc-1.39.0_6
+libgrpc++.so.1.39 libgrpc-1.39.0_6
+libgrpc++_alts.so.1.39 libgrpc-1.39.0_6
+libgrpc++_error_details.so.1.39 libgrpc-1.39.0_6
+libgrpc++_reflection.so.1.39 libgrpc-1.39.0_6
+libgrpc++_unsecure.so.1.39 libgrpc-1.39.0_6
+libgrpc.so.18 libgrpc-1.39.0_6
+libgrpc_plugin_support.so.1.39 libgrpc-1.39.0_6
+libgrpc_unsecure.so.18 libgrpc-1.39.0_6
+libgrpcpp_channelz.so.1.39 libgrpc-1.39.0_6
+libupb.so.18 libgrpc-1.39.0_6
libircclient.so.1 libircclient-1.10_5
libFAudio.so.0 FAudio-19.05_1
libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/patches/absl-is-private.patch b/srcpkgs/grpc/patches/absl-is-private.patch
new file mode 100644
index 000000000000..a79277a26806
--- /dev/null
+++ b/srcpkgs/grpc/patches/absl-is-private.patch
@@ -0,0 +1,58 @@
+--- grpc-1.39.1.orig/CMakeLists.txt
++++ grpc-1.39.1/CMakeLists.txt
+@@ -15856,7 +15865,7 @@ generate_pkgconfig(
+ "gpr"
+ "gRPC platform support library"
+ "${gRPC_CORE_VERSION}"
+- "absl_base absl_memory absl_optional absl_status absl_str_format absl_strings absl_synchronization absl_time"
++ ""
+ "-lgpr"
+ ""
+ "gpr.pc")
+@@ -15866,7 +15875,7 @@ generate_pkgconfig(
+ "gRPC"
+ "high performance general RPC framework"
+ "${gRPC_CORE_VERSION}"
+- "gpr openssl absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
++ "gpr openssl"
+ "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
+ ""
+ "grpc.pc")
+@@ -15876,7 +15885,7 @@ generate_pkgconfig(
+ "gRPC unsecure"
+ "high performance general RPC framework without SSL"
+ "${gRPC_CORE_VERSION}"
+- "gpr absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
++ "gpr"
+ "-lgrpc_unsecure"
+ ""
+ "grpc_unsecure.pc")
+@@ -15886,7 +15895,7 @@ generate_pkgconfig(
+ "gRPC++"
+ "C++ wrapper for gRPC"
+ "${gRPC_CPP_VERSION}"
+- "grpc absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
++ "grpc"
+ "-lgrpc++"
+ ""
+ "grpc++.pc")
+@@ -15896,7 +15905,7 @@ generate_pkgconfig(
+ "gRPC++ unsecure"
+ "C++ wrapper for gRPC without SSL"
+ "${gRPC_CPP_VERSION}"
+- "grpc_unsecure absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
++ "grpc_unsecure"
+ "-lgrpc++_unsecure"
+ ""
+ "grpc++_unsecure.pc")
+--- grpc-1.39.1.orig/cmake/pkg-config-template.pc.in
++++ grpc-1.39.1/cmake/pkg-config-template.pc.in
+@@ -6,7 +6,7 @@ libdir=${exec_prefix}/lib
+ Name: @PC_NAME@
+ Description: @PC_DESCRIPTION@
+ Version: @PC_VERSION@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/grpc_absl
+ Requires: @PC_REQUIRES@
+ Libs: -L${libdir} @PC_LIB@
+ Libs.private: @PC_LIBS_PRIVATE@
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 9b35682fdb17..765d4213a648 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
# Template file for 'grpc'
pkgname=grpc
version=1.39.1
-revision=5
+revision=6
_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
@@ -39,23 +39,29 @@ post_extract() {
post_patch() {
# re2 doesn't install CMake config modules;
# key variables are set in configure_args
- vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d'
-}
-
-post_build() {
- # Clean up unneeded absl linker arguments from pkgconfig files
- sed -e 's/-labsl_[^[:space:]]\+[[:space:]]*//g' \
- -i build/lib/pkgconfig/*.pc
+ # also install all plugin on cross-compiling
+ vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d' \
+ -e 's/gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING/gRPC_INSTALL/'
}
post_install() {
- # Remove unnecessary absl static libs and cmake modules
+ # Remove unnecessary absl static libs, pkg-config and cmake modules
rm "${DESTDIR}"/usr/lib/libabsl*.a
+ rm -rf "${DESTDIR}/usr/lib/pkgconfig/"absl_*
rm -rf "${DESTDIR}/usr/lib/cmake/absl"
- # Add custom absl include root to grpcpp cflags
- vsed -e 's,^Cflags:.*,& -I${includedir}/grpc_absl,' \
- -i ${DESTDIR}/usr/lib/pkgconfig/grpc++*.pc
+ # Clean up unneeded absl linker arguments from cmake files
+ sed -e 's/absl::[a-zA-Z_-]*;//g' \
+ -e 's/ "absl::[a-zA-Z_-]*"/ /g' \
+ -i ${DESTDIR}/usr/lib/cmake/grpc/gRPCTargets.cmake
+}
+
+libgrpc_package() {
+ short_desc+=" - libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share
+ }
}
grpc-devel_package() {
diff --git a/srcpkgs/libgrpc b/srcpkgs/libgrpc
new file mode 120000
index 000000000000..e5f1f1766d34
--- /dev/null
+++ b/srcpkgs/libgrpc
@@ -0,0 +1 @@
+grpc
\ No newline at end of file
From 26c2e3ae91204df5fde09c0870497434265b7418 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 14:34:56 +0200
Subject: [PATCH 388/609] uftrace: update to 0.12.
---
srcpkgs/uftrace/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index bd4f9e01118f..dc02ffb24ec2 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -1,6 +1,6 @@
# Template file for 'uftrace'
pkgname=uftrace
-version=0.11
+version=0.12
revision=1
archs="x86_64* i686* aarch64* arm*"
build_style=configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://github.com/namhyung/uftrace"
distfiles="https://github.com/namhyung/uftrace/archive/v${version}.tar.gz"
-checksum=101dbb13cb3320ee76525ec26426f2aa1de4e3ee5af74f79cb403ae4d2c6c871
+checksum=2aad01f27d4f18717b681824c7a28ac3e1efd5e7bbed3ec888a3ea5af60e3700
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone"; export LDFLAGS=-largp;;
From 20d10795f994db91f379501362017664e9e24abe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 14:38:20 +0200
Subject: [PATCH 389/609] ugrep: update to 3.8.3.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index db31f14bbfb3..ff4fdce87528 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.8.2
+version=3.8.3
revision=1
build_style=gnu-configure
makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a5f9bf2ab204b05f34f752321ad96ab950a86a955737d313886614742e9c5fbe
+checksum=deb7e143ee07019fdaa98a4529596d965185542a195855c1bfb6779fb8dd5e55
post_install() {
vlicense LICENSE.txt LICENSE
From 76eb01fe649d325a5b752a3513df8b45bbb05a35 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 14:39:19 +0200
Subject: [PATCH 390/609] nsd: update to 4.6.0.
---
srcpkgs/nsd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 2e42a1014fb0..3ba577bb3640 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
# Template file for 'nsd'
pkgname=nsd
-version=4.5.0
+version=4.6.0
revision=1
build_style=gnu-configure
configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://www.nlnetlabs.nl/projects/nsd/"
changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5ae7a704ab92c8a49f3c8f3a29565ce194c51a721c29c75ea7d43c13372d79c5
+checksum=09062d9b83dfcdde4e4e53ec3615496d68c2821d8381d0d464ebea31a5975c81
system_accounts="nsd"
nsd_homedir=/var/db/nsd
make_dirs="/var/db/nsd 0755 nsd nsd"
From 1b6686d942a55bbe899f91fb3d641e1e9c435f80 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 14:56:56 +0200
Subject: [PATCH 391/609] sbcl: update to 2.2.6.
---
srcpkgs/sbcl/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 43e3045f5fc9..cb023f8a731d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,11 +1,11 @@
# Template file for 'sbcl'
pkgname=sbcl
-version=2.2.5
+version=2.2.6
revision=1
# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
hostmakedepends="iana-etc texinfo"
-makedepends="zlib-devel"
+makedepends="libzstd-devel zlib-devel"
conf_files="/etc/sbclrc"
short_desc="Steel Bank Common Lisp"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -13,7 +13,7 @@ license="custom:BSD+public_domain"
homepage="http://www.sbcl.org/"
changelog="http://www.sbcl.org/news.html"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8584b541370fd6ad6e58d3f97982077dfcab240f30d4e9b18f15da91c2f13ed1
+checksum=3e23048c8fa826fb913220beb2ac3697dbc5c0cdf2e89fed8db39ed1712304a0
nocross=yes
nopie=yes
@@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
case "$XBPS_TARGET_MACHINE" in
x86_64)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
- checksum+=" 9e8a2824ba2024a212f642536e6420bbfedfe07446cabe12d568ead52cdd95db"
+ checksum+=" 9fd7132a10270a4929fcd07291c8fe66bdb51cf0f024f0cbec7fc02eb9595996"
;;
arm*)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"
From f03cbe2800df5427f329ef6638b46988dc8024ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 2 Jul 2022 21:13:57 +0700
Subject: [PATCH 392/609] grpc: fix libre2 reference in cross-compiled cmake
---
srcpkgs/grpc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 765d4213a648..6410f6692a13 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,13 +1,13 @@
# Template file for 'grpc'
pkgname=grpc
version=1.39.1
-revision=6
+revision=7
_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
-DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
-DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
- -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
+ -D_gRPC_RE2_LIBRARIES=-lre2
-D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
hostmakedepends="which protobuf"
_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
From a9c15f886218ed40ae511ac3eb79af03bc6df47d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 17:12:36 +0200
Subject: [PATCH 393/609] sbcl: fix non-simd platforms.
---
srcpkgs/sbcl/patches/docstrings.patch | 77 +++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
create mode 100644 srcpkgs/sbcl/patches/docstrings.patch
diff --git a/srcpkgs/sbcl/patches/docstrings.patch b/srcpkgs/sbcl/patches/docstrings.patch
new file mode 100644
index 000000000000..c296e96efb1e
--- /dev/null
+++ b/srcpkgs/sbcl/patches/docstrings.patch
@@ -0,0 +1,77 @@
+From 900eff6ae477b2674b8504d5420d565ca09ac813 Mon Sep 17 00:00:00 2001
+From: Robert Schiele <rschiele@gmail.com>
+Date: Fri, 24 Jun 2022 16:50:54 +0200
+Subject: [PATCH] take contrib blocklist into account for doc generation
+
+If some contrib module is blocked for building also block it in
+documentation generation since this will fail otherwise.
+
+Additionally this fixes a shift operation that is needed
+unconditionally when parsing the script parameters since otherwise
+the first parameter is used for the second parameter as well if it
+turns out to be empty.
+---
+ doc/manual/generate-texinfo.lisp | 9 +++++----
+ doc/manual/make-tempfiles.sh | 8 +++++---
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/doc/manual/generate-texinfo.lisp b/doc/manual/generate-texinfo.lisp
+index 83451754d..44e5edca8 100644
+--- a/doc/manual/generate-texinfo.lisp
++++ b/doc/manual/generate-texinfo.lisp
+@@ -32,8 +32,9 @@
+ finally (return result)))
+
+ (defun generate-docstrings-texinfo (runtime
+- &key (docstring-directory "docstrings/"))
+- (let* ((contribs (sort (documented-contribs) #'string< :key #'car))
++ &key (docstring-directory "docstrings/")
++ (blocklist '()))
++ (let* ((contribs (sort (documented-contribs :exclude (append '("asdf") blocklist)) #'string< :key #'car))
+ (packages (sort (append *documented-packages*
+ (map 'list #'cdr contribs))
+ #'string<)))
+@@ -92,10 +93,10 @@
+ \f
+ ;;;; Entry point
+
+-(destructuring-bind (program runtime docstring-directory) *posix-argv*
++(destructuring-bind (program runtime docstring-directory blocklist) *posix-argv*
+ (declare (ignore program))
+ (generate-docstrings-texinfo
+- runtime :docstring-directory docstring-directory)
++ runtime :docstring-directory docstring-directory :blocklist (uiop:split-string blocklist))
+
+ (expand-variables)
+ (generate-external-format-texinfo))
+diff --git a/doc/manual/make-tempfiles.sh b/doc/manual/make-tempfiles.sh
+index bf36ab1ec..faf1bbbf9 100644
+--- a/doc/manual/make-tempfiles.sh
++++ b/doc/manual/make-tempfiles.sh
+@@ -26,18 +26,20 @@ if [ -z "$1" ] ; then
+ else
+ SBCLRUNTIME="`command -v sbcl`"
+ fi
++ . $SBCL_TOP/output/build-config
+ else
+ SBCLRUNTIME="$1"
+- shift
++ SBCL_CONTRIB_BLOCKLIST=
+ fi
++shift
+
+ if [ -z "$1" ] ; then
+ DOCSTRINGDIR="${DOCSTRINGDIR:-docstrings/}"
+ else
+ DOCSTRINGDIR="$1"
+- shift
+ fi
++shift
+
+ ${SBCLRUNTIME} \
+ --noinform --no-sysinit --no-userinit --noprint --disable-debugger \
+- --script generate-texinfo.lisp "${SBCLRUNTIME}" "${DOCSTRINGDIR}"
++ --script generate-texinfo.lisp "${SBCLRUNTIME}" "${DOCSTRINGDIR}" "${SBCL_CONTRIB_BLOCKLIST}"
+--
+2.36.1
+
From 27488aa54d484884b2657b366cc6bef4ae12b530 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 17:15:13 +0200
Subject: [PATCH 394/609] linux5.18: update to 5.18.9.
---
srcpkgs/linux5.18/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index be6582401d64..d32cba55c931 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.18'
pkgname=linux5.18
-version=5.18.7
+version=5.18.9
revision=1
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee
- 783de8b66193fd9bd2acabad8fdc7a14ac74aca35b7e606b10ac94ced77b430e"
+ 8d508fd3ae9ea8921405c3ef6d9364e633f9154d88a6da0794714a78c3a884ea"
skip_extraction="patch-${version}.xz"
python_version=3
From 9ad5e562cf9774830617f65b3a4f9f401e224730 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 17:16:00 +0200
Subject: [PATCH 395/609] linux5.15: update to 5.15.52.
---
srcpkgs/linux5.15/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a54741bf8478..e2059fc5af90 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.15'
pkgname=linux5.15
-version=5.15.50
+version=5.15.52
revision=1
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 16bfe772c0ac272bc4b5be68b3e1aead51eebdab2d61b360a0d18126f52c50a8"
+ 6553acafe1e1b71ae05e32d38b5d1c4008f2833af29fc664cdcd4b6cfee46b6c"
skip_extraction="patch-${version}.xz"
python_version=3
From 2c09eb2989b117d7f20fc7b22f527bb7ecfc8a9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 17:17:21 +0200
Subject: [PATCH 396/609] linux5.10: update to 5.10.128.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 781879543adc..7aff9ab6aae8 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.125
+version=5.10.128
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=b9356ea02532c063f0b19a82e67c2afbd7c5460184fce7011222cf8667568f60
+checksum=ec59e9d208d7ddf949bf45e780f1df984763b2e31e2b8d888d7d3092741cd34b
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From e5cba7a74a330987ee2e3f332b4a82b6065ccd3d Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 2 Jul 2022 05:04:18 +0200
Subject: [PATCH 397/609] gsmartcontrol: update to 1.1.4.
---
.../{INSTALL.msg => files/README.voidlinux} | 3 +--
srcpkgs/gsmartcontrol/template | 11 ++++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
rename srcpkgs/gsmartcontrol/{INSTALL.msg => files/README.voidlinux} (73%)
diff --git a/srcpkgs/gsmartcontrol/INSTALL.msg b/srcpkgs/gsmartcontrol/files/README.voidlinux
similarity index 73%
rename from srcpkgs/gsmartcontrol/INSTALL.msg
rename to srcpkgs/gsmartcontrol/files/README.voidlinux
index 6890d48eeb0e..3b74ae753f71 100644
--- a/srcpkgs/gsmartcontrol/INSTALL.msg
+++ b/srcpkgs/gsmartcontrol/files/README.voidlinux
@@ -1,7 +1,6 @@
* gsmartcontrol needs elevated privileges, so its desktop menu entry requires
a running polkit authentication agent. Almost all desktop shell environments
- provide it. You can also use lxpolkit (from lxsession) that is a lightweighti
- polkit auth agent.
+ provide it. You can also use lxsession's lxpolkit, a light polkit auth agent.
* action "options > update Drive Database" does not work since
smartmontools package does not provide this feature.
diff --git a/srcpkgs/gsmartcontrol/template b/srcpkgs/gsmartcontrol/template
index 3574f4a63770..7f20e697a921 100644
--- a/srcpkgs/gsmartcontrol/template
+++ b/srcpkgs/gsmartcontrol/template
@@ -1,7 +1,7 @@
# Template file for 'gsmartcontrol'
pkgname=gsmartcontrol
-version=1.1.3
-revision=5
+version=1.1.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtkmm-devel pcre-devel desktop-file-utils"
@@ -9,11 +9,12 @@ depends="smartmontools hicolor-icon-theme"
short_desc="GUI to smartmontools"
maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-2.0-or-later"
-homepage="http://gsmartcontrol.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=b64f62cffa4430a90b6d06cd52ebadd5bcf39d548df581e67dfb275a673b12a9
+homepage="https://gsmartcontrol.shaduri.dev"
+distfiles="https://github.com/ashaduri/gsmartcontrol/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
+checksum=fc409f2b8a84cc40bb103d6c82401b9d4c0182d5a3b223c93959c7ad66191847
post_install() {
# license files uneeded
rm -f ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE_*
+ vdoc ${FILESDIR}//README.voidlinux
}
From 85a5373c429232e6a0303f5d44f9c3bf0afac6af Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 22:00:15 +0200
Subject: [PATCH 398/609] dino: backport fix for quote formatting.
Upstream:
https://github.com/dino/dino/commit/1309d7e2e42a1fdced3127c641f108fb72cc2fdd
---
srcpkgs/dino/patches/quote.patch | 22 ++++++++++++++++++++++
srcpkgs/dino/template | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dino/patches/quote.patch
diff --git a/srcpkgs/dino/patches/quote.patch b/srcpkgs/dino/patches/quote.patch
new file mode 100644
index 000000000000..7e469cf65180
--- /dev/null
+++ b/srcpkgs/dino/patches/quote.patch
@@ -0,0 +1,22 @@
+From 1309d7e2e42a1fdced3127c641f108fb72cc2fdd Mon Sep 17 00:00:00 2001
+From: fiaxh <git@lightrise.org>
+Date: Mon, 14 Feb 2022 23:49:45 +0100
+Subject: [PATCH] Fix quote formating to not (partially) expect a space after >
+
+---
+ main/src/ui/util/helper.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala
+index 51f0cc9c1..427c2d3a2 100644
+--- a/main/src/ui/util/helper.vala
++++ b/main/src/ui/util/helper.vala
+@@ -259,7 +259,7 @@ public static string parse_add_markup_theme(string s_, string? highlight_word, b
+ theme_dependent = true;
+ quote_match_info.fetch_pos(0, out start, out end);
+ return parse_add_markup_theme(s[0:start], highlight_word, parse_links, parse_text_markup, parse_quotes, dark_theme, ref theme_dependent, already_escaped) +
+- @"<span color='$dim_color'>$gt " + parse_add_markup_theme(s[start + gt.length + 1:end], highlight_word, parse_links, parse_text_markup, false, dark_theme, ref theme_dependent, already_escaped) + "</span>" +
++ @"<span color='$dim_color'>$gt" + parse_add_markup_theme(s[start + gt.length:end], highlight_word, parse_links, parse_text_markup, false, dark_theme, ref theme_dependent, already_escaped) + "</span>" +
+ parse_add_markup_theme(s[end:s.length], highlight_word, parse_links, parse_text_markup, parse_quotes, dark_theme, ref theme_dependent, already_escaped);
+ }
+ }
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 4c8255603289..3d4008790b24 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
# Template file for 'dino'
pkgname=dino
version=0.3.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON"
hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"
From 9e123a91e0ba81d9afcf3692784a6fdde258eadb Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 2 Jul 2022 01:44:17 -0700
Subject: [PATCH 399/609] gandi-cli: remove package.
Upstream archived August 2021.
---
srcpkgs/gandi-cli/template | 20 --------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/gandi-cli/template
diff --git a/srcpkgs/gandi-cli/template b/srcpkgs/gandi-cli/template
deleted file mode 100644
index 71cbc44cc7d7..000000000000
--- a/srcpkgs/gandi-cli/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'gandi-cli'
-pkgname=gandi-cli
-version=1.6
-revision=2
-wrksrc="gandi.cli-${version}"
-build_style=python3-module
-hostmakedepends="python3-docutils python3-setuptools"
-depends="python3-setuptools python3-IPy python3-click python3-requests python3-yaml"
-checkdepends="$depends python3-pytest-cov"
-short_desc="Command line interface to Gandi.net"
-maintainer="Lon Willett <xgit@lonw.net>"
-license="GPL-3.0-or-later"
-homepage="http://cli.gandi.net"
-distfiles="https://github.com/Gandi/gandi.cli/archive/${version}.tar.gz"
-checksum=f9a8140604c2f8ff2bef31851456906d301bfef2a36101280bbaf531a05cb52e
-
-post_install() {
- rst2man --no-generator gandicli.man.rst > gandi.1
- vman gandi.1
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f8cb33ef4098..0ccc276d6820 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -81,6 +81,7 @@ replaces="
fontmatrix<=0.6.0.20171228_2
freshplayerplugin<=0.3.9_9
fuse-usmb<=20130204_7
+ gandi-cli<=1.6_2
gconf-editor<=3.0.1_3
gegl3<=0.3.28_2
gens-gs<=2.16.7_2
From e3165058602eb00f7c5a2069d0978fc6a5a175fd Mon Sep 17 00:00:00 2001
From: Sebastian Uharek <uharek@friendship-systems.com>
Date: Fri, 1 Jul 2022 19:56:56 +0200
Subject: [PATCH 400/609] k9s: update to 0.25.21
---
srcpkgs/k9s/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 44e326c54e34..e700fe95a3c3 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
# Template file for 'k9s'
pkgname=k9s
-version=0.25.18
+version=0.25.21
revision=1
build_style=go
go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://k9scli.io/"
distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=2a911c57011164c0f11e3cdf763182abf189efde80b7a764e361aa070b7e3f46
+checksum=751525f86cf77f6fa50014dbf69dcc13c55079ffabc467a83c4c592e78479535
# fix: collect2: fatal error: cannot find 'ld'
export LDFLAGS="-fuse-ld=bfd"
From 853baf771ca9a38b211a4d4c69fdbceaacecbd2d Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Sun, 20 Feb 2022 01:41:25 +0200
Subject: [PATCH 401/609] New package: CKAN-1.30.4
---
srcpkgs/CKAN/template | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 srcpkgs/CKAN/template
diff --git a/srcpkgs/CKAN/template b/srcpkgs/CKAN/template
new file mode 100644
index 000000000000..4bc12f642bcd
--- /dev/null
+++ b/srcpkgs/CKAN/template
@@ -0,0 +1,28 @@
+# Template file for 'CKAN'
+pkgname=CKAN
+version=1.30.4
+revision=1
+archs="x86_64* i686*" # Only support archs that are supported by KSP itself
+hostmakedepends="curl msbuild-bin"
+makedepends="libgdiplus"
+depends="libgdiplus mono"
+short_desc="Find, install, and manage mods for Kerbal Space Program"
+maintainer="Eugen Zagorodniy <zag@disroot.org>"
+license="MIT"
+homepage="https://github.com/KSP-CKAN/CKAN"
+changelog="https://raw.githubusercontent.com/KSP-CKAN/CKAN/master/CHANGELOG.md"
+distfiles="https://github.com/KSP-CKAN/CKAN/archive/refs/tags/v$version.tar.gz"
+checksum=7c73543bf109fd1bc7917bb1955acaab14086e709e92351d4a6b10d780d53d23
+
+do_build() {
+ ./build --configuration=Release
+}
+
+do_install() {
+ vbin debian/ckan
+ vman debian/ckan.1
+ vlicense debian/copyright
+ vinstall _build/ckan.exe 644 /usr/lib/ckan
+ vinstall debian/ckan.desktop 644 /usr/share/applications
+ vinstall debian/ckan.ico 644 /usr/share/icons
+}
From 13a88eb0d8f041de53c9d1ee178dac5e88306bd1 Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 1 Jul 2022 18:40:44 +0300
Subject: [PATCH 402/609] msbuild-bin: update to 16.10.1.
---
srcpkgs/msbuild-bin/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/msbuild-bin/template b/srcpkgs/msbuild-bin/template
index feae5ed72e4b..e5332b295954 100644
--- a/srcpkgs/msbuild-bin/template
+++ b/srcpkgs/msbuild-bin/template
@@ -1,8 +1,8 @@
# Template file for 'msbuild-bin'
-_xamarin_rel="xamarinxplat.2020.04.29.14.43-0xamarin5+ubuntu2004b1"
+_xamarin_rel="xamarinxplat.2021.05.26.14.00-0xamarin2+ubuntu2004b1"
pkgname=msbuild-bin
-version=16.6
-revision=2
+version=16.10.1
+revision=1
build_style=fetch
depends="mono"
short_desc="Xamarin/Mono fork of the Microsoft Build system"
@@ -10,7 +10,7 @@ maintainer="Aloz1 <kno0001@gmail.com>"
license="MIT"
homepage="https://github.com/mono/msbuild"
distfiles="http://download.mono-project.com/repo/ubuntu/pool/main/m/msbuild/msbuild_${version}+${_xamarin_rel}_all.deb"
-checksum=042bb1da521877e8ff4b2dd157304a7130bb489a3abe0642a0f9e7ff37b4f099
+checksum=32f1eba1c2df67bc55920cd45ce3689c32a5c705ae01fd7ead52ca180221b469
do_extract() {
bsdtar xf ${XBPS_SRCDISTDIR}/msbuild-bin-${version}/msbuild_${version}+${_xamarin_rel}_all.deb
From 72a788506dc9a0e3d927c8e02816212c2a36c12a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Jul 2022 20:23:54 -0400
Subject: [PATCH 403/609] .github/workflows/: set token permissions
---
.github/workflows/cycles.yml | 2 ++
.github/workflows/stale.yml | 3 +++
2 files changed, 5 insertions(+)
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 0bd148e77f0a..018c0909bdb1 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -7,6 +7,8 @@ on:
jobs:
cycles:
runs-on: ubuntu-latest
+ permissions:
+ issues: write
container:
image: 'ghcr.io/void-linux/xbps-src-masterdir:20220527RC01-x86_64-musl'
steps:
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 160897fedef1..c55c7966a678 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -9,6 +9,9 @@ on:
jobs:
stale:
runs-on: ubuntu-latest
+ permissions:
+ issues: write
+ pull-requests: write
steps:
- uses: actions/stale@v4
with:
From 0a05fc3d272e98e03b2c9d5656d6db2c9a95c15d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Jul 2022 08:37:05 +0200
Subject: [PATCH 404/609] linux5.4: update to 5.4.203.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 13a8fb7496bf..d8ff2be7236e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.202
+version=5.4.203
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=5ca1bce19eab6a07d7d25c9f1a9c1f27e2b7802188705957cda8095a202a533d
+checksum=fc933f5b13066cfa54aacb5e86747a167bad1d8d23972e4a03ab5ee36c29798a
python_version=3
nodebug=yes # -dbg package is generated below manually
From fa68de2f395a562076dd948f37353d11882a5594 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Jul 2022 08:40:58 +0200
Subject: [PATCH 405/609] linux4.19: update to 4.19.250.
---
srcpkgs/linux4.19/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 29b67f43ea24..bae808a0e993 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.19'
pkgname=linux4.19
-version=4.19.249
+version=4.19.250
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=ce4bbd420271bb9b6c09842c0d7201c7ba9d136f7025cf0fd7500c95e3f55191
+checksum=6ee30a46f3fa6576602085b7b4b0c640586f99d1c110982db411819308b5755c
python_version=3
nodebug=yes # -dbg package is generated below manually
From 5907e66793f0c62827df200f424ba80961c982c9 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Sun, 3 Jul 2022 03:30:31 +0530
Subject: [PATCH 406/609] New package: xfce4-datetime-plugin-0.8.1
---
srcpkgs/xfce4-datetime-plugin/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/xfce4-datetime-plugin/template
diff --git a/srcpkgs/xfce4-datetime-plugin/template b/srcpkgs/xfce4-datetime-plugin/template
new file mode 100644
index 000000000000..a0cad51eea8e
--- /dev/null
+++ b/srcpkgs/xfce4-datetime-plugin/template
@@ -0,0 +1,15 @@
+# Template file for 'xfce4-datetime-plugin'
+pkgname=xfce4-datetime-plugin
+version=0.8.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="xfce4-panel-devel"
+short_desc="Date and time display plugin for the Xfce panel"
+maintainer="Ishaan Bhimwal <ishaanbhimwal@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-datetime-plugin/-/raw/master/NEWS"
+distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/${version%.*}/xfce4-datetime-plugin-${version}.tar.bz2"
+checksum=e9f6f15be29ceb5c45718006b46dbd19b89981617d0768b2ef942b5a70af2540
From 26e42e62a5dcd058adcd71cd4c1f7b670a570d76 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Fri, 1 Jul 2022 00:30:33 +0200
Subject: [PATCH 407/609] wayland: update to 1.21.0.
---
srcpkgs/wayland/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 5ea25eaad1ce..697663da10f8 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -1,18 +1,18 @@
# Template file for 'wayland'
pkgname=wayland
-version=1.20.0
+version=1.21.0
revision=1
build_style=meson
# "Tests must not be built with NDEBUG defined, they rely on assert()."
configure_args="-Ddocumentation=false -Db_ndebug=false"
hostmakedepends="flex pkg-config"
makedepends="expat-devel libffi-devel libfl-devel libxml2-devel"
-short_desc="Wayland protocol compositor"
+short_desc="Core Wayland window system code and protocol"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayland.freedesktop.org/"
-distfiles="https://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
-checksum=b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725
+distfiles="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/wayland-${version}.tar.xz"
+checksum=6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wayland-devel"
From 489d60a063ee382826d42bd08d1a1c8086ad7f45 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 2 Jul 2022 16:14:49 +0200
Subject: [PATCH 408/609] goatcounter: update to 2.2.3, add service
---
srcpkgs/goatcounter/files/README.voidlinux | 16 ++++++++++++++++
srcpkgs/goatcounter/files/goatcounter/log/run | 2 ++
srcpkgs/goatcounter/files/goatcounter/run | 7 +++++++
srcpkgs/goatcounter/template | 13 ++++++++++---
4 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/goatcounter/files/README.voidlinux
create mode 100755 srcpkgs/goatcounter/files/goatcounter/log/run
create mode 100755 srcpkgs/goatcounter/files/goatcounter/run
diff --git a/srcpkgs/goatcounter/files/README.voidlinux b/srcpkgs/goatcounter/files/README.voidlinux
new file mode 100644
index 000000000000..1aa1c94b83a3
--- /dev/null
+++ b/srcpkgs/goatcounter/files/README.voidlinux
@@ -0,0 +1,16 @@
+The system service /etc/sv/goatcounter runs goatcounter as system user _goatcounter.
+
+By default sqlite database is used. The database will be stored in
+/var/db/goatcounter/db.sqlite3.
+
+To initialize the database, make sure you run goatcounter as the _goatcounter user:
+
+$ sudo -u _goatcounter goatcounter db create site \
+ -user.email 'admin@domain.name' \
+ -vhost site.name \
+ -db sqlite+/var/db/goatcounter/db.sqlite3
+
+By default the service listens on 5000 port and does not use TLS. In production
+envirnment you must adjust service config by creating /var/goatcounter/conf
+
+OPTS=-listen ... -db ...
diff --git a/srcpkgs/goatcounter/files/goatcounter/log/run b/srcpkgs/goatcounter/files/goatcounter/log/run
new file mode 100755
index 000000000000..0713d90a612e
--- /dev/null
+++ b/srcpkgs/goatcounter/files/goatcounter/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.notice -t goatcounter
diff --git a/srcpkgs/goatcounter/files/goatcounter/run b/srcpkgs/goatcounter/files/goatcounter/run
new file mode 100755
index 000000000000..e8f78fc6360c
--- /dev/null
+++ b/srcpkgs/goatcounter/files/goatcounter/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+: "${OPTS:=-db sqlite+/var/db/goatcounter/db.sqlite3?_busy_timeout=200&_journal_mode=wal&cache=shared -listen :5000 -public-port 5000 -tls none}"
+
+exec chpst -u _goatcounter goatcounter serve ${OPTS}
diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index 734920ce5987..9ba8c6fda1c7 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,9 +1,9 @@
# Template file for 'goatcounter'
pkgname=goatcounter
-version=2.0.3
+version=2.2.3
revision=1
build_style=go
-go_import_path=zgo.at/goatcounter
+go_import_path=zgo.at/goatcounter/v2
go_package="${go_import_path}/cmd/goatcounter"
go_ldflags="-X zgo.at/goatcounter.Version=${version}"
depends="tzdata"
@@ -12,4 +12,11 @@ maintainer="Martin Tournoij <martin@arp242.net>"
license="EUPL-1.2"
homepage="https://www.goatcounter.com/"
distfiles="https://github.com/zgoat/goatcounter/archive/v${version}.tar.gz"
-checksum=d7477240602c4d6522fb528276378879cda35dea0ba4b174143e36a410398023
+checksum=5b3b07afda42752d7c9600a8671bbb30e70a98c656505eda99a4e67b309a94fc
+system_accounts="_goatcounter"
+make_dirs="/var/db/goatcounter 0750 _goatcounter _goatcounter"
+
+post_install() {
+ vsv goatcounter
+ vdoc $FILESDIR/README.voidlinux
+}
From 5d0855077b833b3d12f4f9ce7405a35509cb59b2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Jul 2022 19:42:05 +0200
Subject: [PATCH 409/609] RcloneBrowser: do not check for updates by default
---
.../patches/do-not-check-for-updates.patch | 51 +++++++++++++++++++
srcpkgs/RcloneBrowser/template | 2 +-
2 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/RcloneBrowser/patches/do-not-check-for-updates.patch
diff --git a/srcpkgs/RcloneBrowser/patches/do-not-check-for-updates.patch b/srcpkgs/RcloneBrowser/patches/do-not-check-for-updates.patch
new file mode 100644
index 000000000000..56f1ae667451
--- /dev/null
+++ b/srcpkgs/RcloneBrowser/patches/do-not-check-for-updates.patch
@@ -0,0 +1,51 @@
+From 2976c391098c83bce55547db0b8c5d70c046fde1 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Fri, 1 Jul 2022 19:32:55 +0200
+Subject: [PATCH] do not check for updates
+
+---
+ src/main_window.cpp | 4 ++--
+ src/preferences_dialog.cpp | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/main_window.cpp b/src/main_window.cpp
+index 3bf6340..41d4f93 100644
+--- a/src/main_window.cpp
++++ b/src/main_window.cpp
+@@ -527,7 +527,7 @@ void MainWindow::rcloneGetVersion() {
+ // during first run the key might not exist yet
+ if (!(settings->contains("Settings/checkRcloneUpdates"))) {
+ // if checkRcloneUpdates does not exist create new key
+- settings->setValue("Settings/checkRcloneUpdates", true);
++ settings->setValue("Settings/checkRcloneUpdates", false);
+ };
+
+ bool checkRcloneUpdates =
+@@ -605,7 +605,7 @@ void MainWindow::rcloneGetVersion() {
+ // during first run the key might not exist yet
+ if (!(settings->contains("Settings/checkRcloneBrowserUpdates"))) {
+ // if checkRcloneBrowserUpdates does not exist create new key
+- settings->setValue("Settings/checkRcloneBrowserUpdates", true);
++ settings->setValue("Settings/checkRcloneBrowserUpdates", false);
+ };
+
+ bool checkRcloneBrowserUpdates =
+diff --git a/src/preferences_dialog.cpp b/src/preferences_dialog.cpp
+index 1564621..76eb531 100644
+--- a/src/preferences_dialog.cpp
++++ b/src/preferences_dialog.cpp
+@@ -94,9 +94,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) : QDialog(parent) {
+ settings->value("Settings/defaultRcloneOptions").toString());
+
+ ui.checkRcloneBrowserUpdates->setChecked(
+- settings->value("Settings/checkRcloneBrowserUpdates", true).toBool());
++ settings->value("Settings/checkRcloneBrowserUpdates", false).toBool());
+ ui.checkRcloneUpdates->setChecked(
+- settings->value("Settings/checkRcloneUpdates", true).toBool());
++ settings->value("Settings/checkRcloneUpdates", false).toBool());
+
+ if (QSystemTrayIcon::isSystemTrayAvailable()) {
+ ui.alwaysShowInTray->setChecked(
+--
+2.37.0
+
diff --git a/srcpkgs/RcloneBrowser/template b/srcpkgs/RcloneBrowser/template
index b96d82b57f8c..c3fecd0afb50 100644
--- a/srcpkgs/RcloneBrowser/template
+++ b/srcpkgs/RcloneBrowser/template
@@ -1,7 +1,7 @@
# Template file for 'RcloneBrowser'
pkgname=RcloneBrowser
version=1.8.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-devel"
makedepends="qt5-devel"
From 522c4367e4bdcb9d3c916d12a6f36cedd7c0f682 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 22 Jun 2022 22:52:43 -0500
Subject: [PATCH 410/609] gns3-server: update to 2.2.33.1.
---
srcpkgs/gns3-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 9b8660a43179..db9075e7a5a7 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
# Template file for 'gns3-server'
pkgname=gns3-server
-version=2.2.32
+version=2.2.33.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://gns3.com"
changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=9e208622f91fdca217964e9b93121d85b1415f7d26ba106be035a079beb21519
+checksum=f28ca99f8970757bf036801a93ffdb174ea00da02e8d60e87d44cf43e1e72aca
# The source archive contains statically linked artifacts for x86_64
# glibc, since this is the only architecture supported by upstream, we
From a6c99866832f497d629b383174eeec66e4cf4242 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 22 Jun 2022 22:52:48 -0500
Subject: [PATCH 411/609] gns3-gui: update to 2.2.33.1.
---
srcpkgs/gns3-gui/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index b5d09ed345dc..c8c891272550 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
# Template file for 'gns3-gui'
pkgname=gns3-gui
-version=2.2.32
+version=2.2.33.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://gns3.com"
changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=a43f51567ac69db894d2ac6e41edf1549bc992ddf98979e1576c59b08571d943
+checksum=2122e6259aa1f9e831a0a8b9a327102d2360b9238966b9475be73d3110dcbca8
post_patch() {
From 7f612232b77222a0996d3ed35b051cd51ff08faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 2 Jul 2022 09:52:02 +0200
Subject: [PATCH 412/609] you-get: update to 0.4.1620.
---
srcpkgs/you-get/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index 7858ee442407..b50a0af1a29c 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,6 +1,6 @@
# Template file for 'you-get'
pkgname=you-get
-version=0.4.1612
+version=0.4.1620
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -9,8 +9,9 @@ short_desc="Dumb downloader that scrapes the web"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
homepage="https://you-get.org/"
+changelog="https://raw.githubusercontent.com/soimort/you-get/develop/CHANGELOG.rst"
distfiles="${PYPI_SITE}/y/you-get/you-get-${version}.tar.gz"
-checksum=94a133b70c27d699c02eec03880d4893df97095c8ef943286effa15eed269f9c
+checksum=c020da4fd373d59892b2a1705f53d71eae9017a7e32d123dc30bef5b172660e6
post_install() {
vlicense LICENSE.txt
From 94503ea6e61e35b54760ae2025a64f5363de27fe Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Sun, 3 Jul 2022 19:20:06 +0700
Subject: [PATCH 413/609] phoronix-test-suite: update to 10.8.4
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 7b1b90a927f5..def8e818c01c 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,6 +1,6 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
-version=10.8.3
+version=10.8.4
revision=1
wrksrc="$pkgname"
depends="php"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.phoronix-test-suite.com/"
changelog="https://raw.githubusercontent.com/phoronix-test-suite/phoronix-test-suite/master/ChangeLog"
distfiles="https://phoronix-test-suite.com/releases/${pkgname}-${version}.tar.gz"
-checksum=4b742e28a9542fe2b57aacb691159d69d3e1c77d95da6d24b7867889ce84ba80
+checksum=1f2092d536c0a3193efc53e4a50f3cee65c0ef1a78d31e5404f1c663fff7b7f4
do_install() {
vsed -e "s/^\texport PTS_DIR=.*/\texport PTS_DIR=\/usr\/share\/webapps\/${pkgname}/g" -i phoronix-test-suite
From 8d1042b59d1925076bb7aa6f77443b199ecc7f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 3 Jul 2022 19:21:58 +0200
Subject: [PATCH 414/609] sslscan: update to 2.0.15.
---
srcpkgs/sslscan/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
index 3fe1ab72e294..fc845f38897a 100644
--- a/srcpkgs/sslscan/template
+++ b/srcpkgs/sslscan/template
@@ -1,6 +1,6 @@
# Template file for 'sslscan'
pkgname=sslscan
-version=2.0.14
+version=2.0.15
revision=1
build_style=gnu-makefile
makedepends="openssl-devel"
@@ -10,6 +10,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/rbsec/sslscan"
changelog="https://github.com/rbsec/sslscan/raw/master/Changelog"
distfiles="https://github.com/rbsec/sslscan/archive/refs/tags/${version}.tar.gz"
-checksum=0dd9f7d0f08c777dfebb1fd10ba369d3a2fd9b978f262384d30e1f45845a67ba
+checksum=0986ac647098b877f24c863c261bfb7cf545a41fd1120047337dfc44812c69a0
# No test suite
make_check=no
From 3cdf17c3aff379d5e20bd7db625400ae191d788b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 29 Jun 2022 11:11:05 +0200
Subject: [PATCH 415/609] wire-desktop: update to 3.27.2944.
---
srcpkgs/wire-desktop/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index e4ba10088bc8..e2402795f070 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,16 +1,16 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
-version=3.25.2940
+version=3.27.2944
revision=1
wrksrc="${pkgname}-linux-${version}"
-hostmakedepends="nodejs yarn git"
-depends="electron10"
+hostmakedepends="nodejs-lts yarn git"
+depends="electron13"
short_desc="Wire for desktop"
maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wire.com"
distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
-checksum=d1702bb64692b3970c2b49be4621069e7ea40b367be0917632cec50e123e570c
+checksum=378c945e6933855407aa03fe49a934409675bdfc370398c8f21da1fd13832af9
case "$XBPS_MACHINE" in
x86_64*|i686*) ;;
@@ -32,7 +32,7 @@ do_install() {
vmkdir usr/bin
cat << EOF > "wire-desktop.sh"
#!/bin/sh
-exec electron10 "/usr/lib/wire-desktop/app.asar" "\$@"
+exec electron13 "/usr/lib/wire-desktop/app.asar" "\$@"
EOF
vbin wire-desktop.sh wire-desktop
vmkdir usr/share/icons/hicolor/256x256/apps
From 4284780ebbbbd6a509ec5f90e365a18dd211a9fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 29 Jun 2022 11:11:17 +0200
Subject: [PATCH 416/609] electron10: remove package
---
.../musl-patches/chromium-musl-crashpad.patch | 23 -
...omium-musl-default-pthread-stacksize.patch | 31 -
.../musl-patches/chromium-musl-sandbox.patch | 176 -
.../musl-patches/chromium-musl-string_h.patch | 10 -
...chromium-musl_canonicalize_file_name.patch | 13 -
.../musl-patches/chromium-musl_cdefs.patch | 45 -
...omium-musl_define_temp_failure_retry.patch | 18 -
.../musl-patches/chromium-musl_dns.patch | 61 -
.../musl-patches/chromium-musl_exeinfo.patch | 96 -
.../chromium-musl_getcontext.patch | 25 -
.../musl-patches/chromium-musl_mallinfo.patch | 54 -
.../chromium-musl_pread_pwrite64.patch | 18 -
.../chromium-musl_push_back.patch | 13 -
.../chromium-musl_stack_size.patch | 41 -
.../chromium-musl_stack_trace.patch | 44 -
.../chromium-musl_tcp_listen.patch | 14 -
.../chromium-musl_xxx-ppc64le-support.patch | 179 -
.../files/patches/chromium-83-gcc-10.patch | 64 -
...chromium-chromium_atk_optional.patch.patch | 15 -
.../files/patches/chromium-clang-12.patch | 16 -
.../files/patches/chromium-ffmpeg-4.3.patch | 21 -
.../files/patches/chromium-gcc-shared.patch | 20 -
.../patches/chromium-harfbuzz-3.0.0.patch | 20 -
.../files/patches/chromium-libc_malloc.patch | 24 -
.../chromium-skia-harfbuzz-3.0.0.patch | 100 -
.../files/patches/chromium-skia-harmony.patch | 14 -
.../files/patches/chromium-time64.patch | 51 -
.../patches/chromium-toolchain-host.patch | 11 -
.../chromium-xxx-ppc64le-support.patch | 3686 -----------------
.../chromium-xxx-ppc64le-swiftshader.patch | 18 -
...a-script-to-list-patch-targets.patch.patch | 42 -
.../patches/electron-Build-fixes.patch.patch | 47 -
...ectron-dont-assume-python-is-python2.patch | 17 -
...lectron-exclude-content-test-patches.patch | 10 -
.../sndio-files/audio_manager_openbsd.cc | 148 -
.../files/sndio-files/audio_manager_openbsd.h | 65 -
.../files/sndio-files/sndio_input.cc | 200 -
.../files/sndio-files/sndio_input.h | 91 -
.../files/sndio-files/sndio_output.cc | 183 -
.../files/sndio-files/sndio_output.h | 86 -
...a_audio_linux_audio_manager_linux.cc.patch | 43 -
...src_3rdparty_chromium_media_BUILD.gn.patch | 12 -
...dparty_chromium_media_audio_BUILD.gn.patch | 23 -
...ty_chromium_media_media__options.gni.patch | 12 -
srcpkgs/electron10/template | 361 --
srcpkgs/electron10/update | 2 -
srcpkgs/removed-packages/template | 1 +
47 files changed, 1 insertion(+), 6263 deletions(-)
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl-crashpad.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl-sandbox.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl-string_h.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_canonicalize_file_name.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_cdefs.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_dns.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_exeinfo.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_getcontext.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_mallinfo.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_pread_pwrite64.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_push_back.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_stack_size.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_stack_trace.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_tcp_listen.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_xxx-ppc64le-support.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-chromium_atk_optional.patch.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-clang-12.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-gcc-shared.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-libc_malloc.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-skia-harmony.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-time64.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-toolchain-host.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-swiftshader.patch
delete mode 100644 srcpkgs/electron10/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
delete mode 100644 srcpkgs/electron10/files/patches/electron-Build-fixes.patch.patch
delete mode 100644 srcpkgs/electron10/files/patches/electron-dont-assume-python-is-python2.patch
delete mode 100644 srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
delete mode 100644 srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc
delete mode 100644 srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.h
delete mode 100644 srcpkgs/electron10/files/sndio-files/sndio_input.cc
delete mode 100644 srcpkgs/electron10/files/sndio-files/sndio_input.h
delete mode 100644 srcpkgs/electron10/files/sndio-files/sndio_output.cc
delete mode 100644 srcpkgs/electron10/files/sndio-files/sndio_output.h
delete mode 100644 srcpkgs/electron10/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
delete mode 100644 srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
delete mode 100644 srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
delete mode 100644 srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
delete mode 100644 srcpkgs/electron10/template
delete mode 100644 srcpkgs/electron10/update
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl-crashpad.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl-crashpad.patch
deleted file mode 100644
index 70cffa3002bb..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl-crashpad.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -26,6 +26,7 @@
-
- #if defined(ARCH_CPU_X86_FAMILY)
- #include <asm/ldt.h>
-+#include <asm/ptrace-abi.h>
- #endif
-
- namespace crashpad {
-
---- a/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-+++ b/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-@@ -17,7 +17,9 @@
-
- #include_next <sys/ptrace.h>
-
-+#if defined(__GLIBC__)
- #include <sys/cdefs.h>
-+#endif
-
- // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
- #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl-default-pthread-stacksize.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
deleted file mode 100644
index d0c1361b8ed1..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc
-index 095c49b..5044bb8 100644
---- a/base/threading/platform_thread_linux.cc
-+++ b/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,7 @@ void TerminateOnThread() {}
-
- size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
- #if !defined(THREAD_SANITIZER)
-- return 0;
-+ return (1 << 23);
- #else
- // ThreadSanitizer bloats the stack heavily. Evidence has been that the
- // default stack size isn't enough for some browser tests.
-diff --git a/chrome/app/shutdown_signal_handlers_posix.cc b/chrome/app/shutdown_signal_handlers_posix.cc
-index 621d441..be21106 100644
---- a/chrome/app/shutdown_signal_handlers_posix.cc
-+++ b/chrome/app/shutdown_signal_handlers_posix.cc
-@@ -187,11 +187,11 @@ void InstallShutdownSignalHandlers(
- g_shutdown_pipe_read_fd = pipefd[0];
- g_shutdown_pipe_write_fd = pipefd[1];
- #if !defined(ADDRESS_SANITIZER)
-- const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
-+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 *8;
- #else
- // ASan instrumentation bloats the stack frames, so we need to increase the
- // stack size to avoid hitting the guard page.
-- const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
-+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 *8;
- #endif
- ShutdownDetector* detector = new ShutdownDetector(
- g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl-sandbox.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl-sandbox.patch
deleted file mode 100644
index f485f6cc75af..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl-sandbox.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 348ab6e..4550f9e 100644
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -139,21 +139,11 @@ namespace sandbox {
- // present (as in newer versions of posix_spawn).
- ResultExpr RestrictCloneToThreadsAndEPERMFork() {
- const Arg<unsigned long> flags(0);
--
-- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
-- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
-- CLONE_SIGHAND | CLONE_THREAD |
-- CLONE_SYSVSEM;
-- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
--
-- const uint64_t kGlibcPthreadFlags =
-- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
-- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
-- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
--
-- const BoolExpr android_test =
-- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
-- flags == kGlibcPthreadFlags);
-+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-+ CLONE_THREAD | CLONE_SYSVSEM;
-+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
-+ CLONE_DETACHED;
-+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
-
- // The following two flags are the two important flags in any vfork-emulating
- // clone call. EPERM any clone call that contains both of them.
-@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
- AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
- (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
-
-- return If(IsAndroid() ? android_test : glibc_test, Allow())
-+ return If(thread_clone_ok, Allow())
- .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
- .Else(CrashSIGSYSClone());
- }
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index 7dbcc87..589262f 100644
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -391,6 +391,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__)
- case __NR_waitpid:
- #endif
-+ case __NR_set_tid_address:
- return true;
- case __NR_clone: // Should be parameter-restricted.
- case __NR_setns: // Privileged.
-@@ -403,7 +404,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
- case __NR_set_thread_area:
- #endif
-- case __NR_set_tid_address:
- case __NR_unshare:
- #if !defined(__mips__) && !defined(__aarch64__)
- case __NR_vfork:
-@@ -513,6 +513,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_mlock:
- case __NR_munlock:
- case __NR_munmap:
-+ case __NR_mremap:
-+ case __NR_membarrier:
- return true;
- case __NR_madvise:
- case __NR_mincore:
-@@ -530,7 +532,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_modify_ldt:
- #endif
- case __NR_mprotect:
-- case __NR_mremap:
- case __NR_msync:
- case __NR_munlockall:
- case __NR_readahead:
-diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h
-index 59d0eab..7ae7002 100644
---- ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-@@ -1063,4 +1063,8 @@
- #define __NR_memfd_create 279
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 283
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h b/sandbox/linux/system_headers/arm_linux_syscalls.h
-index 1addd53..7843b5e 100644
---- ./sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-index ec75815..612fcfa 100644
---- ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-@@ -1271,4 +1271,8 @@
- #define __NR_memfd_create (__NR_Linux + 314)
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux + 318)
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
-index ddbf97f..1742acd 100644
---- ./sandbox/linux/system_headers/mips_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1433,4 +1433,8 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux + 358)
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-index a6afc62..7ed0a3b 100644
---- ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1422,5 +1422,9 @@
- #define __NR_memfd_create 356
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
-
-diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-index 349504a..ea3c7c9 100644
---- ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
-
-diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index 017f13c..50aeec3 100644
---- ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -88,10 +88,10 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const {
- case __NR_sysinfo:
- case __NR_times:
- case __NR_uname:
-- return Allow();
-- case __NR_sched_getaffinity:
- case __NR_sched_getparam:
- case __NR_sched_getscheduler:
-+ return Allow();
-+ case __NR_sched_getaffinity:
- case __NR_sched_setscheduler:
- return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
- case __NR_prlimit64:
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl-string_h.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl-string_h.patch
deleted file mode 100644
index e3c8a834dd07..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl-string_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mojo/public/cpp/platform/named_platform_channel_posix.cc.orig 2020-07-19 13:26:10.696171063 -0400
-+++ b/mojo/public/cpp/platform/named_platform_channel_posix.cc 2020-07-19 13:26:43.680151714 -0400
-@@ -5,6 +5,7 @@
- #include "mojo/public/cpp/platform/named_platform_channel.h"
-
- #include <errno.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_canonicalize_file_name.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_canonicalize_file_name.patch
deleted file mode 100644
index 05614daa7576..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_canonicalize_file_name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/nasm/config/config-linux.h b/third_party/nasm/config/config-linux.h
-index 7eb7c20..882b736 100644
---- a/third_party/nasm/config/config-linux.h
-+++ b/third_party/nasm/config/config-linux.h
-@@ -117,7 +117,7 @@
- #define HAVE_ACCESS 1
-
- /* Define to 1 if you have the `canonicalize_file_name' function. */
--#define HAVE_CANONICALIZE_FILE_NAME 1
-+/* #undef HAVE_CANONICALIZE_FILE_NAME */
-
- /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
- /* #undef HAVE_CPU_TO_LE16 */
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_cdefs.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_cdefs.patch
deleted file mode 100644
index fc7dc06ff21b..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_cdefs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/base/allocator/allocator_shim_internals.h b/base/allocator/allocator_shim_internal
-s.h
-index 0196f89..bb42b5d 100644
---- a/base/allocator/allocator_shim_internals.h
-+++ b/base/allocator/allocator_shim_internals.h
-@@ -7,7 +7,9 @@
-
- #if defined(__GNUC__)
-
-+#if defined(__GLIBC__)
- #include <sys/cdefs.h> // for __THROW
-+#endif
-
- #ifndef __THROW // Not a glibc system
- #ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
-diff --git a/third_party/libsync/src/include/sync/sync.h b/third_party/libsync/src/include/sync/sync.h
-index 50ed0ac..7552a49 100644
---- a/third_party/libsync/src/include/sync/sync.h
-+++ b/third_party/libsync/src/include/sync/sync.h
-@@ -19,12 +19,13 @@
- #ifndef __SYS_CORE_SYNC_H
- #define __SYS_CORE_SYNC_H
-
--#include <sys/cdefs.h>
- #include <stdint.h>
-
- #include <linux/types.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-
- struct sync_legacy_merge_data {
- int32_t fd2;
-@@ -158,6 +159,8 @@ struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info,
- struct sync_pt_info *itr);
- void sync_fence_info_free(struct sync_fence_info_data *info);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-
- #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_define_temp_failure_retry.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
deleted file mode 100644
index 61db658f849e..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/sandbox/linux/suid/sandbox.c 2019-11-19 09:28:05.000000000 +0800
-+++ b/sandbox/linux/suid/sandbox.c 2020-04-24 11:50:12.719880728 +0800
-@@ -42,6 +42,15 @@
- #define CLONE_NEWNET 0x40000000
- #endif
-
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+ (__extension__ \
-+ ({ long int __result; \
-+ do __result = (long int) (expression); \
-+ while (__result == -1L && errno == EINTR); \
-+ __result; }))
-+#endif
-+
- static bool DropRoot();
-
- #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_dns.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_dns.patch
deleted file mode 100644
index f49d8bd0afaf..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_dns.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index 2f94832..2dd1a98 100644
---- a/net/dns/dns_config_service_posix.cc
-+++ b/net/dns/dns_config_service_posix.cc
-@@ -150,7 +150,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- #if !defined(OS_ANDROID)
- ConfigParsePosixResult result;
- // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
--#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
-+#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
- // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
- // res_init behaves the same way.
- memset(&_res, 0, sizeof(_res));
-@@ -173,7 +173,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- #else
- res_nclose(&res);
- #endif // defined(OS_MACOSX) || defined(OS_FREEBSD)
--#endif // defined(OS_OPENBSD)
-+#endif // defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
-
- #if defined(OS_MACOSX) && !defined(OS_IOS)
- ConfigParsePosixResult error = DnsConfigWatcher::CheckDnsConfig();
-diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc
-index 952cff4..4b366f4 100644
---- a/net/dns/dns_reloader.cc
-+++ b/net/dns/dns_reloader.cc
-@@ -4,7 +4,7 @@
-
- #include "net/dns/dns_reloader.h"
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
-
- #include <resolv.h>
-diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
-index e8dea46..c86a830 100644
---- a/net/dns/host_resolver_manager.cc
-+++ b/net/dns/host_resolver_manager.cc
-@@ -2386,7 +2386,7 @@ HostResolverManager::HostResolverManager(
- NetworkChangeNotifier::AddConnectionTypeObserver(this);
- if (system_dns_config_notifier_)
- system_dns_config_notifier_->AddObserver(this);
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID)
- EnsureDnsReloaderInit();
- #endif
-diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
-index 0824540..3384978 100644
---- a/net/dns/host_resolver_proc.cc
-+++ b/net/dns/host_resolver_proc.cc
-@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,
- base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
- base::BlockingType::WILL_BLOCK);
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
- DnsReloaderMaybeReload();
- #endif
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_exeinfo.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_exeinfo.patch
deleted file mode 100644
index f1afc7c1b176..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_exeinfo.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
-index de2f356..f697c66 100644
---- a/base/debug/stack_trace_posix.cc
-+++ b/base/debug/stack_trace_posix.cc
-@@ -27,7 +27,7 @@
- #if !defined(USE_SYMBOLIZE)
- #include <cxxabi.h>
- #endif
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- #include <execinfo.h>
- #endif
-
-@@ -86,7 +86,7 @@ void DemangleSymbols(std::string* text) {
- // Note: code in this function is NOT async-signal safe (std::string uses
- // malloc internally).
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- std::string::size_type search_from = 0;
- while (search_from < text->size()) {
- // Look for the start of a mangled symbol, from search_from.
-@@ -121,7 +121,7 @@ void DemangleSymbols(std::string* text) {
- search_from = mangled_start + 2;
- }
- }
--#endif // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- }
- #endif // !defined(USE_SYMBOLIZE)
-
-@@ -133,7 +133,7 @@ class BacktraceOutputHandler {
- virtual ~BacktraceOutputHandler() = default;
- };
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
- // This should be more than enough to store a 64-bit number in hex:
- // 16 hex digits + 1 for null-terminator.
-@@ -216,7 +216,7 @@ void ProcessBacktrace(void* const* trace,
- }
- #endif // defined(USE_SYMBOLIZE)
- }
--#endif // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-
- void PrintToStderr(const char* output) {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
-@@ -828,7 +828,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- // Though the backtrace API man page does not list any possible negative
- // return values, we take no chance.
- return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -841,13 +841,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- PrintBacktraceOutputHandler handler;
- ProcessBacktrace(trace_, count_, prefix_string, &handler);
- #endif
- }
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
- const char* prefix_string) const {
- StreamBacktraceOutputHandler handler(os);
-diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-index 798f150..97acc7c 100644
---- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-@@ -14,7 +14,7 @@
- #define ENABLE_CRASH_OVERRIDES 1
-
- /* Define to 1 if you have the `backtrace' function. */
--#define HAVE_BACKTRACE 1
-+/* #undef HAVE_BACKTRACE */
-
- /* Define to 1 if you have the <CrashReporterClient.h> header file. */
- /* #undef HAVE_CRASHREPORTERCLIENT_H */
-@@ -55,7 +55,7 @@
- #define HAVE_ERRNO_H 1
-
- /* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H 1
-+/* #undef HAVE_EXECINFO_H */
-
- /* Define to 1 if you have the <fcntl.h> header file. */
- #define HAVE_FCNTL_H 1
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_getcontext.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_getcontext.patch
deleted file mode 100644
index 7697243a9104..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_getcontext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index b895f6d..4f13352 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -490,7 +490,9 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
- siginfo.si_code = SI_USER;
- siginfo.si_pid = getpid();
- ucontext_t context;
-+#if defined(__GLIBC__)
- getcontext(&context);
-+#endif
- return HandleSignal(sig, &siginfo, &context);
- }
-
-@@ -675,8 +677,10 @@ bool ExceptionHandler::WriteMinidump() {
- sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
-
- CrashContext context;
-+#if defined(__GLIBC__)
- int getcontext_result = getcontext(&context.context);
- if (getcontext_result)
-+#endif
- return false;
-
- #if defined(__i386__)
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_mallinfo.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_mallinfo.patch
deleted file mode 100644
index dfe7c6595edc..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_mallinfo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/base/trace_event/malloc_dump_provider.cc.orig
-+++ b/base/trace_event/malloc_dump_provider.cc
-@@ -243,7 +243,7 @@
- allocated_objects_count = main_heap_info.block_count;
- #elif defined(OS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
--#else
-+#elif defined(__GLIBC__)
- struct mallinfo info = mallinfo();
- DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
-
---- a/base/process/process_metrics_posix.cc.orig 2019-10-24 11:10:48.553159245 -0400
-+++ b/base/process/process_metrics_posix.cc 2019-10-24 11:14:29.025025854 -0400
-@@ -110,14 +110,14 @@
- malloc_statistics_t stats = {0};
- malloc_zone_statistics(nullptr, &stats);
- return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(__GLIBC__) || defined(OS_ANDROID)
- struct mallinfo minfo = mallinfo();
- #if BUILDFLAG(USE_TCMALLOC)
- return minfo.uordblks;
- #else
- return minfo.hblkhd + minfo.arena;
- #endif
--#elif defined(OS_FUCHSIA)
-+#else
- // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
- return 0;
- #endif
---- a/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
-+++ b/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
-@@ -84,7 +84,7 @@
- }
-
- size_t Process::GetMallocUsage() {
--#if defined(HAVE_MALLINFO)
-+#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
- struct mallinfo mi;
- mi = ::mallinfo();
- return mi.uordblks;
-
---- a/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
-+++ b/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
-@@ -122,7 +122,9 @@
- /* #undef HAVE_MALLCTL */
-
- /* Define to 1 if you have the `mallinfo' function. */
-+#if defined(__GLIBC__)
- #define HAVE_MALLINFO 1
-+#endif
-
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_pread_pwrite64.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_pread_pwrite64.patch
deleted file mode 100644
index 2aeaaeb7593f..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_pread_pwrite64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
-index 5d9c2e8..2682349 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -166,6 +166,13 @@ extern "C" {
- # undef __NR_waitpid
- #endif
-
-+#ifdef pread64
-+#undef pread64
-+#endif
-+#ifdef pwrite64
-+#undef pwrite64
-+#endif
-+
- /* As glibc often provides subtly incompatible data structures (and implicit
- * wrapper functions that convert them), we provide our own kernel data
- * structures for use by the system calls.
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_push_back.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_push_back.patch
deleted file mode 100644
index cff340287da5..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_push_back.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc
-index 08bf79c..3ee5353 100644
---- a/net/socket/udp_socket_posix.cc
-+++ b/net/socket/udp_socket_posix.cc
-@@ -1194,7 +1194,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
- msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
- msgvec->reserve(buffers.size());
- for (size_t j = 0; j < buffers.size(); j++)
-- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
-+ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, nullptr, 0, 0, 0}, 0});
- int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
- SendResult send_result(0, 0, std::move(buffers));
- if (result < 0) {
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_size.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_size.patch
deleted file mode 100644
index cf41d27ade6e..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_size.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/third_party/blink/renderer/platform/wtf/stack_util.cc b/third_party/blink/renderer/platform/wtf/stack_util.cc
-index b242164..1a0b519 100644
---- a/third_party/blink/renderer/platform/wtf/stack_util.cc
-+++ b/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -28,7 +28,7 @@
- // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
- // correctly for the main thread.
-
--#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
- defined(OS_FUCHSIA)
- // pthread_getattr_np() can fail if the thread is not invoked by
- // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -55,6 +55,9 @@ size_t GetUnderestimatedStackSize() {
- pthread_attr_destroy(&attr);
- #endif
-
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+ return 0;
-+#else
- // Return a 512k stack size, (conservatively) assuming the following:
- // - that size is much lower than the pthreads default (x86 pthreads has a 2M
- // default.)
-@@ -62,6 +65,8 @@ size_t GetUnderestimatedStackSize() {
- // low as 512k.
- //
- return 512 * 1024;
-+#endif
-+
- #elif defined(OS_MACOSX)
- // pthread_get_stacksize_np() returns too low a value for the main thread on
- // OSX 10.9,
-@@ -97,7 +102,7 @@ return Threading::ThreadStackSize();
- }
-
- void* GetStackStart() {
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
- defined(OS_FUCHSIA)
- pthread_attr_t attr;
- int error;
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_trace.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_trace.patch
deleted file mode 100644
index 9a1f2b044583..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_trace.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/base/debug/stack_trace.cc b/base/debug/stack_trace.cc
-index d8ca822..ffe1f08 100644
---- a/base/debug/stack_trace.cc
-+++ b/base/debug/stack_trace.cc
-@@ -225,7 +225,9 @@ void StackTrace::Print() const {
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- OutputToStreamWithPrefix(os, nullptr);
-+#endif
- }
-
- std::string StackTrace::ToString() const {
-@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const {
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
- std::stringstream stream;
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- OutputToStreamWithPrefix(&stream, prefix_string);
- #endif
- return stream.str();
- }
-
- std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
--#if !defined(__UCLIBC__) & !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) & !defined(_AIX)
- s.OutputToStream(&os);
- #else
- os << "StackTrace::OutputToStream not implemented.";
-diff --git a/base/logging.cc b/base/logging.cc
-index 36b8bfc..dd830fe 100644
---- a/base/logging.cc
-+++ b/base/logging.cc
-@@ -607,7 +607,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
- LogMessage::~LogMessage() {
- size_t stack_start = stream_.tellp();
- #if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
-- !defined(OS_AIX)
-+ !defined(OS_AIX) && defined(__GLIBC__)
- if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
- // Include a stack trace on a fatal, unless a debugger is attached.
- base::debug::StackTrace stack_trace;
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_tcp_listen.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_tcp_listen.patch
deleted file mode 100644
index fa62317b11ac..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_tcp_listen.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/content/public/common/socket_permission_request.h b/content/public/common/socket_permission_request.h
-index 7316621..6171219 100644
---- a/content/public/common/socket_permission_request.h
-+++ b/content/public/common/socket_permission_request.h
-@@ -9,6 +9,9 @@
-
- #include <string>
-
-+#ifdef TCP_LISTEN
-+#undef TCP_LISTEN
-+#endif
-
- namespace content {
-
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_xxx-ppc64le-support.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_xxx-ppc64le-support.patch
deleted file mode 100644
index a7d660feb023..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_xxx-ppc64le-support.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
-index a6aec544e..2a4a7f1bc 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -16,7 +16,7 @@
- #if defined(__mips__)
- // sys/user.h in eglibc misses size_t definition
- #include <stddef.h>
--#elif defined(__powerpc64__)
-+#elif defined(__powerpc64__) && defined(__GLIBC__)
- // Manually define greg_t on ppc64
- typedef unsigned long long greg_t;
- #endif
-@@ -361,11 +361,11 @@ typedef struct pt_regs regs_struct;
- #define SECCOMP_ARCH AUDIT_ARCH_PPC64
- #endif
-
--#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
-+#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
-
- #define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
- #define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
--#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
-+#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
- #define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
- #define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
- #define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
-diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc
-index d53a7ff56..c290f0e92 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -499,9 +499,9 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
- // Same as MIPS, need to invert ret and set error register (cr0.SO)
- if (ret_val <= -1 && ret_val >= -4095) {
- ret_val = -ret_val;
-- ctx->uc_mcontext.regs->ccr |= (1 << 28);
-+ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
- } else {
-- ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
-+ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
- }
- #endif
- SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
-diff --git third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-index cdce9bf8..73d77dda 100644
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
-
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-- defined(__powerpc__) || defined(__ppc__) || \
-+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
- defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
-diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
-index f9a60e37..25f3a0b7 100644
---- a/third_party/breakpad/BUILD.gn
-+++ b/third_party/breakpad/BUILD.gn
-@@ -637,6 +637,7 @@ if (is_linux || is_android) {
-
- if (current_cpu == "ppc64") {
- defines = [ "HAVE_GETCONTEXT" ]
-+ libs += [ "ucontext" ]
- } else {
- sources += [
- "breakpad/src/common/linux/breakpad_getcontext.S"
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index 03afec7a..0264ecf1 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-@@ -273,6 +273,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-
- #elif defined(__powerpc64__)
-
-+#include <asm/elf.h>
-+#include <asm/ptrace.h>
-+
- uintptr_t ThreadInfo::GetInstructionPointer() const {
- return mcontext.gp_regs[PT_NIP];
- }
-@@ -290,9 +293,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
- out->ctr = mcontext.gp_regs[PT_CTR];
-
- for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-- out->float_save.fpregs[i] = mcontext.fp_regs[i];
-+ out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
-
-- out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
-+ out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
-
- for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
- out->vector_save.save_vr[i] = \
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 1090470f..e580233d 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -257,6 +257,9 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
-
- #elif defined(__powerpc64__)
-
-+#include <asm/elf.h>
-+#include <asm/ptrace.h>
-+
- uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
- }
-@@ -280,9 +283,9 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
- out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
-
- for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-- out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
-+ out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
-
-- out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
-+ out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
-
- for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
- out->vector_save.save_vr[i] =
-diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index 5a7ab50c..ee8b858c 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -105,6 +105,11 @@
- #define PR_SET_PTRACER 0x59616d61
- #endif
-
-+/* musl hack, can't include asm/ptrace.h as that causes conflicts */
-+#if defined(__powerpc64__) && !defined(PT_NIP)
-+#define PT_NIP 32
-+#endif
-+
- namespace google_breakpad {
-
- namespace {
-diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index 8e335a09..b2a0f155 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -469,7 +469,7 @@ struct MContext64 {
- SignalThreadContext64 gp_regs;
- SignalFloatContext64 fp_regs;
- SignalVectorContext64 *v_regs;
-- int64_t vmx_reserve[69];
-+ int64_t vmx_reserve[101];
- };
-
- struct ContextTraits64 : public Traits64 {
-diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
-index dea0d1f3..b203e5b2 100644
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -30,6 +30,7 @@
-
- #if defined(ARCH_CPU_PPC64_FAMILY)
- #include <sys/ucontext.h>
-+#include <asm/ptrace.h>
- #endif
-
- namespace crashpad {
-diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
-index 9955ce44..4c1cc488 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -4216,9 +4216,13 @@ struct kernel_statfs {
- }
- #endif
- #if defined(__NR_fstatat64)
-+ // musl does #define fstatat64 fstatat
-+ #undef fstatat64
- LSS_INLINE _syscall4(int, fstatat64, int, d,
- const char *, p,
- struct kernel_stat64 *, b, int, f)
-+ // set it back like it was
-+ #define fstatat64 fstatat
- #endif
- #if defined(__NR_waitpid)
- // waitpid is polyfilled below when not available.
diff --git a/srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch b/srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch
deleted file mode 100644
index 974b49cde703..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e473f41284ccc8fa4bc4622d087194b18a1ec23a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 7 Apr 2020 16:37:10 +0000
-Subject: [PATCH] GCC: fix includes for gcc-10
-
----
- chrome/browser/search/background/ntp_backgrounds.h | 1 +
- third_party/webrtc/call/rtx_receive_stream.h | 1 +
- .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
- ui/gfx/linux/drm_util_linux.h | 2 ++
- 5 files changed, 6 insertions(+)
-
-diff --git a/chrome/browser/search/background/ntp_backgrounds.h b/chrome/browser/search/background/ntp_backgrounds.h
-index 7afc0a2..ea5818e 100644
---- a/chrome/browser/search/background/ntp_backgrounds.h
-+++ b/chrome/browser/search/background/ntp_backgrounds.h
-@@ -6,6 +6,7 @@
- #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
-
- #include <array>
-+#include <cstddef>
-
- class GURL;
-
-diff --git a/third_party/webrtc/call/rtx_receive_stream.h b/third_party/webrtc/call/rtx_receive_stream.h
-index 8ffa440..113a816 100644
---- a/third_party/webrtc/call/rtx_receive_stream.h
-+++ b/third_party/webrtc/call/rtx_receive_stream.h
-@@ -12,6 +12,7 @@
- #define CALL_RTX_RECEIVE_STREAM_H_
-
- #include <map>
-+#include <cstdint>
-
- #include "call/rtp_packet_sink_interface.h"
-
-diff --git a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-index 22528c9..69e624e 100644
---- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-+++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-@@ -12,6 +12,7 @@
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
-
- #include <array>
-+#include <cstddef>
-
- namespace webrtc {
-
-diff --git a/ui/gfx/linux/drm_util_linux.h b/ui/gfx/linux/drm_util_linux.h
-index 86ff2eb..990f12c 100644
---- a/ui/gfx/linux/drm_util_linux.h
-+++ b/ui/gfx/linux/drm_util_linux.h
-@@ -7,6 +7,8 @@
-
- #include "ui/gfx/buffer_types.h"
-
-+#include <cstdint>
-+
- namespace ui {
-
- int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);
---
-2.24.1
-
diff --git a/srcpkgs/electron10/files/patches/chromium-chromium_atk_optional.patch.patch b/srcpkgs/electron10/files/patches/chromium-chromium_atk_optional.patch.patch
deleted file mode 100644
index 667b4a7a00c5..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-chromium_atk_optional.patch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/build/config/ui.gni 2020-06-25 00:39:28.000000000 +0200
-+++ - 2020-08-22 18:01:01.182749726 +0200
-@@ -47,8 +47,10 @@
- # Make sure glib is not used if building for ChromeOS/Chromecast
- assert(!use_glib || (is_linux && !is_chromeos && !is_chromecast))
-
--# Whether to use atk, the Accessibility ToolKit library
--use_atk = is_desktop_linux && !is_chromecast && use_glib
-+declare_args() {
-+ # Whether to use atk, the Accessibility ToolKit library
-+ use_atk = is_desktop_linux && !is_chromecast && use_glib
-+}
- # =============================================
- # PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
- # =============================================
diff --git a/srcpkgs/electron10/files/patches/chromium-clang-12.patch b/srcpkgs/electron10/files/patches/chromium-clang-12.patch
deleted file mode 100644
index 54b10751c430..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-clang-12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/third_party/blink/renderer/platform/disk_data_allocator.h 2020-09-21 20:39:25.000000000 +0200
-+++ - 2021-05-24 22:03:47.238393816 +0200
-@@ -36,12 +36,12 @@
- public:
- int64_t start_offset() const { return start_offset_; }
- size_t size() const { return size_; }
-- Metadata(Metadata&& other) = delete;
-
- private:
- Metadata(int64_t start_offset, size_t size)
- : start_offset_(start_offset), size_(size) {}
- Metadata(const Metadata& other) = default;
-+ Metadata(Metadata&& other) = default;
- Metadata& operator=(const Metadata& other) = default;
-
- int64_t start_offset_;
diff --git a/srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch b/srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch
deleted file mode 100644
index 6abb886ab990..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/media/base/media.cc b/media/base/media.cc
-index c282ee49a03..a298b40c79b 100644
---- a/media/base/media.cc
-+++ b/media/base/media.cc
-@@ -14,6 +14,7 @@
- #include "third_party/libyuv/include/libyuv.h"
-
- #if BUILDFLAG(ENABLE_FFMPEG)
-+#include <limits>
- #include "third_party/ffmpeg/ffmpeg_features.h" // nogncheck
- extern "C" {
- #include <libavutil/cpu.h>
-@@ -41,7 +42,7 @@ class MediaInitializer {
-
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
- // Remove allocation limit from ffmpeg, so calls go down to shim layer.
-- av_max_alloc(0);
-+ av_max_alloc(std::numeric_limits<size_t>::max());
- #endif // BUILDFLAG(USE_ALLOCATOR_SHIM)
-
- #endif // BUILDFLAG(ENABLE_FFMPEG)
diff --git a/srcpkgs/electron10/files/patches/chromium-gcc-shared.patch b/srcpkgs/electron10/files/patches/chromium-gcc-shared.patch
deleted file mode 100644
index 098b68322422..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-gcc-shared.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/build/toolchain/gcc_toolchain.gni 2019-11-19 02:27:43.000000000 +0100
-+++ - 2020-07-21 00:59:09.201421469 +0200
-@@ -371,7 +371,7 @@
- # .TOC file, overwrite it, otherwise, don't change it.
- tocfile = sofile + ".TOC"
-
-- link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\""
-+ link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -shared @\"$rspfile\""
-
- # Generate a map file to be used for binary size analysis.
- # Map file adds ~10% to the link time on a z620.
-@@ -450,7 +450,7 @@
- unstripped_sofile = sofile
- }
-
-- command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" @\"$rspfile\""
-+ command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" -shared @\"$rspfile\""
-
- if (defined(invoker.strip)) {
- strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\""
diff --git a/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch b/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
deleted file mode 100644
index c7724336bfba..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://github.com/chromium/chromium/commit/b289f6f3fcbc
-
-diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
-index 8ff0540d9a..20a7d37474 100644
---- a/components/paint_preview/common/subset_font.cc
-+++ b/components/paint_preview/common/subset_font.cc
-@@ -72,9 +72,11 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) {
- hb_set_t* glyphs =
- hb_subset_input_glyph_set(input.get()); // Owned by |input|.
- usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
-- hb_subset_input_set_retain_gids(input.get(), true);
-+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
-
-- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
-+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
-+ if (!subset_face)
-+ return nullptr;
- HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
- if (!subset_blob)
- return nullptr;
diff --git a/srcpkgs/electron10/files/patches/chromium-libc_malloc.patch b/srcpkgs/electron10/files/patches/chromium-libc_malloc.patch
deleted file mode 100644
index a5720b93ce7c..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-libc_malloc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/base/process/memory_linux.cc 2020-09-21 20:39:01.000000000 +0200
-+++ - 2020-10-02 20:23:17.972108815 +0200
-@@ -23,6 +23,12 @@
- #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
- #endif
-
-+#if defined(LIBC_GLIBC)
-+extern "C" {
-+extern void *__libc_malloc(size_t size);
-+}
-+#endif
-+
- namespace base {
-
- size_t g_oom_size = 0U;
-@@ -135,7 +141,7 @@
- (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
- *result = malloc(size);
- #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
-- *result = __libc_malloc(size);
-+ *result = ::__libc_malloc(size);
- #elif BUILDFLAG(USE_TCMALLOC)
- *result = tc_malloc_skip_new_handler(size);
- #endif
diff --git a/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch b/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch
deleted file mode 100644
index f47af201b6e4..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-# Minimal diff for harfbuzz 3.0.0 support; based on:
-# https://github.com/google/skia/commit/66684b17b382
-# https://github.com/google/skia/commit/51d83abcd24a
-
-diff --git a/gn/skia.gni b/gn/skia.gni
-index d98fdc19ee..199335d5c4 100644
---- a/third_party/skia/gn/skia.gni
-+++ b/third_party/skia/gn/skia.gni
-@@ -34,8 +34,6 @@ declare_args() {
- skia_include_multiframe_procs = false
- skia_lex = false
- skia_libgifcodec_path = "third_party/externals/libgifcodec"
-- skia_pdf_subset_harfbuzz =
-- false # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz.
- skia_qt_path = getenv("QT_PATH")
- skia_skqp_global_error_tolerance = 0
- skia_tools_require_resources = false
-@@ -99,6 +97,10 @@ declare_args() {
- skia_use_libfuzzer_defaults = true
- }
-
-+declare_args() {
-+ skia_pdf_subset_harfbuzz = skia_use_harfbuzz
-+}
-+
- declare_args() {
- skia_compile_sksl_tests = skia_compile_processors
- skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
-diff --git a/src/pdf/SkPDFSubsetFont.cpp b/src/pdf/SkPDFSubsetFont.cpp
-index 81c37eef3a..2340a7937b 100644
---- a/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
-+++ b/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
-@@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob) {
- blob.release());
- }
-
-+template<typename...> using void_t = void;
-+template<typename T, typename = void>
-+struct SkPDFHarfBuzzSubset {
-+ // This is the HarfBuzz 3.0 interface.
-+ // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of
-+ // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported.
-+ static HBFace Make(T input, hb_face_t* face) {
-+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
-+ // If it isn't known if a font is 'tricky', retain the hints.
-+ hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/);
-+ return HBFace(hb_subset_or_fail(face, input));
-+ }
-+};
-+template<typename T>
-+struct SkPDFHarfBuzzSubset<T, void_t<
-+ decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())),
-+ decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())),
-+ decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>()))
-+ >>
-+{
-+ // This is the HarfBuzz 2.0 (non-public) interface, used if it exists.
-+ // This code should be removed as soon as all users are migrated to the newer API.
-+ static HBFace Make(T input, hb_face_t* face) {
-+ hb_subset_input_set_retain_gids(input, true);
-+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
-+ // If it isn't known if a font is 'tricky', retain the hints.
-+ hb_subset_input_set_drop_hints(input, false);
-+ return HBFace(hb_subset(face, input));
-+ }
-+};
-+
- static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
- const SkPDFGlyphUse& glyphUsage,
- int ttcIndex) {
-@@ -71,11 +102,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
- hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
- glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
-
-- hb_subset_input_set_retain_gids(input.get(), true);
-- // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
-- // If it isn't known if a font is 'tricky', retain the hints.
-- hb_subset_input_set_drop_hints(input.get(), false);
-- HBFace subset(hb_subset(face.get(), input.get()));
-+ HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get());
-+ if (!subset) {
-+ return nullptr;
-+ }
- HBBlob result(hb_face_reference_blob(subset.get()));
- return to_data(std::move(result));
- }
-diff --git a/third_party/harfbuzz/BUILD.gn b/third_party/harfbuzz/BUILD.gn
-index 173830de62..4156607ef9 100644
---- a/third_party/skia/third_party/harfbuzz/BUILD.gn
-+++ b/third_party/skia/third_party/harfbuzz/BUILD.gn
-@@ -14,6 +14,9 @@ if (skia_use_system_harfbuzz) {
- "harfbuzz",
- "harfbuzz-icu",
- ]
-+ if (skia_pdf_subset_harfbuzz) {
-+ libs += [ "harfbuzz-subset" ]
-+ }
- }
- } else {
- third_party("harfbuzz") {
diff --git a/srcpkgs/electron10/files/patches/chromium-skia-harmony.patch b/srcpkgs/electron10/files/patches/chromium-skia-harmony.patch
deleted file mode 100644
index 1cb8aebf240d..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-skia-harmony.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-07-19 11:08:34.770972665 +0000
-+++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-07-19 11:08:44.274442065 +0000
-@@ -128,9 +128,9 @@ public:
- : fGetVarDesignCoordinates(nullptr)
- , fGetVarAxisFlags(nullptr)
- , fLibrary(nullptr)
-- , fIsLCDSupported(false)
-+ , fIsLCDSupported(true)
- , fLightHintingIsYOnly(false)
-- , fLCDExtra(0)
-+ , fLCDExtra(2)
- {
- if (FT_New_Library(&gFTMemory, &fLibrary)) {
- return;
diff --git a/srcpkgs/electron10/files/patches/chromium-time64.patch b/srcpkgs/electron10/files/patches/chromium-time64.patch
deleted file mode 100644
index 0330ce057f41..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-time64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: allow sandboxed code to call gettime64
- Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist
- and clock selection parameter filtering code.
-
- Add __NR_utimensat_time64 to syscall whitelist
-
- Conditionalise additions on the new calls existing, because they do not exist
- on 64-bit architectures.
-Author: Peter Michael Green <plugwash@raspbian.org>
-
-Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-===================================================================
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
- return Allow();
- #endif
-
-+#ifdef __NR_clock_gettime64
-+ if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) {
-+#else
- if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
-+#endif
- return RestrictClockID();
- }
-
-Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-===================================================================
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s
- case __NR_clock_getres: // Allowed only on Android with parameters
- // filtered by RestrictClokID().
- case __NR_clock_gettime: // Parameters filtered by RestrictClockID().
-+#ifdef __NR_clock_gettime64
-+ case __NR_clock_gettime64: // Parameters filtered by RestrictClockID().
-+ case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID().
-+#endif
- case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID().
- case __NR_clock_settime: // Privileged.
- #if defined(__i386__) || \
-@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno
- case __NR_utime:
- #endif
- case __NR_utimensat: // New.
-+#ifdef __NR_utimensat_time64
-+ case __NR_utimensat_time64:
-+#endif
- return true;
- default:
- return false;
diff --git a/srcpkgs/electron10/files/patches/chromium-toolchain-host.patch b/srcpkgs/electron10/files/patches/chromium-toolchain-host.patch
deleted file mode 100644
index 0dace261a08c..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-toolchain-host.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/build/toolchain/linux/unbundle/BUILD.gn 2020-07-21 17:36:34.064748261 +0200
-+++ - 2020-07-21 17:39:03.115740522 +0200
-@@ -35,7 +35,7 @@
- extra_ldflags = getenv("BUILD_LDFLAGS")
-
- toolchain_args = {
-- current_cpu = current_cpu
-+ current_cpu = host_cpu
- current_os = current_os
- }
- }
diff --git a/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch b/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch
deleted file mode 100644
index ba64e6e5a01a..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch
+++ /dev/null
@@ -1,3686 +0,0 @@
-commit e7944c162ca13b2c30b180c06f917f45643b8cca
-Author: q66 <daniel@octaforge.org>
-Date: Tue Aug 4 19:57:48 2020 +0200
-
- ppc64le support
-
-diff --git build/download_nacl_toolchains.py build/download_nacl_toolchains.py
-index 286a92a27..ec36a85d3 100755
---- a/build/download_nacl_toolchains.py
-+++ b/build/download_nacl_toolchains.py
-@@ -13,6 +13,10 @@ import sys
-
-
- def Main(args):
-+ # If `disable_nacl=1` is in GYP_DEFINES, exit
-+ if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
-+ return 0
-+
- script_dir = os.path.dirname(os.path.abspath(__file__))
- src_dir = os.path.dirname(script_dir)
- nacl_dir = os.path.join(src_dir, 'native_client')
-diff --git chrome/installer/linux/BUILD.gn chrome/installer/linux/BUILD.gn
-index b101b0cb2..9fd5a7617 100644
---- a/chrome/installer/linux/BUILD.gn
-+++ b/chrome/installer/linux/BUILD.gn
-@@ -92,8 +92,6 @@ packaging_files = packaging_files_binaries + [
- "$root_out_dir/xdg-mime",
- "$root_out_dir/xdg-settings",
- "$root_out_dir/locales/en-US.pak",
-- "$root_out_dir/MEIPreload/manifest.json",
-- "$root_out_dir/MEIPreload/preloaded_data.pb",
- ]
-
- action_foreach("calculate_deb_dependencies") {
-@@ -329,7 +327,6 @@ group("installer_deps") {
- ":theme_files",
- "//chrome",
- "//chrome:packed_resources",
-- "//chrome/browser/resources/media/mei_preload:component",
- "//sandbox/linux:chrome_sandbox",
- "//third_party/crashpad/crashpad/handler:crashpad_handler",
- ]
-diff --git sandbox/features.gni sandbox/features.gni
-index 09280d35f..42514157f 100644
---- a/sandbox/features.gni
-+++ b/sandbox/features.gni
-@@ -11,6 +11,7 @@ import("//build/config/nacl/config.gni")
- use_seccomp_bpf = (is_linux || is_android) &&
- (current_cpu == "x86" || current_cpu == "x64" ||
- current_cpu == "arm" || current_cpu == "arm64" ||
-- current_cpu == "mipsel" || current_cpu == "mips64el")
-+ current_cpu == "mipsel" || current_cpu == "mips64el" ||
-+ current_cpu == "ppc64")
-
- use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
-diff --git sandbox/linux/BUILD.gn sandbox/linux/BUILD.gn
-index c27351f9a..9141e1239 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -407,6 +407,8 @@ component("sandbox_services") {
-
- source_set("sandbox_services_headers") {
- sources = [
-+ "system_headers/ppc64_linux_syscalls.h",
-+ "system_headers/ppc64_linux_ucontext.h",
- "system_headers/arm64_linux_syscalls.h",
- "system_headers/arm_linux_syscalls.h",
- "system_headers/arm_linux_ucontext.h",
-diff --git sandbox/linux/bpf_dsl/linux_syscall_ranges.h sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-index 313511f22..0ca3a326f 100644
---- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-@@ -56,6 +56,13 @@
- #define MAX_PUBLIC_SYSCALL __NR_syscalls
- #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
-
-+#elif defined(__powerpc64__)
-+
-+#include <asm/unistd.h>
-+#define MIN_SYSCALL 0u
-+#define MAX_PUBLIC_SYSCALL 386u
-+#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
-+
- #else
- #error "Unsupported architecture"
- #endif
-diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
-index 1a407b952..a6aec544e 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -16,6 +16,9 @@
- #if defined(__mips__)
- // sys/user.h in eglibc misses size_t definition
- #include <stddef.h>
-+#elif defined(__powerpc64__)
-+// Manually define greg_t on ppc64
-+typedef unsigned long long greg_t;
- #endif
- #endif
-
-@@ -346,6 +349,51 @@ struct regs_struct {
- #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
- #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
- #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
-+
-+#elif defined(__powerpc64__)
-+#include <asm/ptrace.h>
-+
-+typedef struct pt_regs regs_struct;
-+
-+#ifdef ARCH_CPU_LITTLE_ENDIAN
-+#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
-+#else
-+#define SECCOMP_ARCH AUDIT_ARCH_PPC64
-+#endif
-+
-+#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
-+
-+#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
-+#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
-+#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
-+#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
-+#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
-+#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
-+#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
-+#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
-+#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
-+
-+#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
-+#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
-+#define SECCOMP_IP_MSB_IDX \
-+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
-+#define SECCOMP_IP_LSB_IDX \
-+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
-+#define SECCOMP_ARG_MSB_IDX(nr) \
-+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
-+#define SECCOMP_ARG_LSB_IDX(nr) \
-+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
-+
-+#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
-+#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
-+#define SECCOMP_PT_IP(_regs) (_regs).nip
-+#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
-+#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
-+#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
-+#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
-+#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
-+#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
-+
- #else
- #error Unsupported target platform
-
-diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-index a6d2c0dfb..37fdc179a 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) {
- SyscallSets::IsPrctl(sysno) ||
- SyscallSets::IsProcessGroupOrSession(sysno) ||
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- SyscallSets::IsSocketCall(sysno) ||
- #endif
- #if defined(__arm__)
-@@ -210,7 +211,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
- }
-
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- if (sysno == __NR_mmap)
- return RestrictMmapFlags();
- #endif
-@@ -228,7 +229,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
- return RestrictPrctl();
-
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- if (sysno == __NR_socketpair) {
- // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
- static_assert(AF_UNIX == PF_UNIX,
-@@ -268,7 +269,8 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
- }
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- if (SyscallSets::IsSocketCall(sysno))
- return RestrictSocketcallCommand();
- #endif
-diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-index fc36187c9..1affc9189 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-@@ -291,8 +291,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
- #if !defined(__aarch64__)
- TEST_BASELINE_SIGSYS(__NR_eventfd)
- TEST_BASELINE_SIGSYS(__NR_inotify_init)
-+#if !defined(__powerpc64__)
- TEST_BASELINE_SIGSYS(__NR_vserver)
- #endif
-+#endif
-
- #if defined(LIBC_GLIBC) && !defined(OS_CHROMEOS)
- BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) {
-diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index f51915edc..ca2f4f106 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -36,7 +36,8 @@
- #include <sys/ioctl.h>
- #include <sys/ptrace.h>
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(__arm__) && \
-- !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA)
-+ !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA) && \
-+ !defined(__powerpc64__)
- // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
- // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
- // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
-@@ -45,6 +46,11 @@
- #endif
- #endif // !OS_NACL_NONSFI
-
-+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
-+#ifdef __powerpc64__
-+#include <termios.h>
-+#endif
-+
- #if defined(OS_ANDROID)
-
- #if !defined(F_DUPFD_CLOEXEC)
-@@ -107,6 +113,15 @@ inline bool IsArchitectureMips() {
- #endif
- }
-
-+inline bool IsArchitecturePPC64() {
-+#if defined(__powerpc64__)
-+ return true;
-+#else
-+ return false;
-+#endif
-+}
-+
-+
- // Ubuntu's version of glibc has a race condition in sem_post that can cause
- // it to call futex(2) with bogus op arguments. To workaround this, we need
- // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
-@@ -248,6 +263,8 @@ ResultExpr RestrictFcntlCommands() {
- uint64_t kOLargeFileFlag = O_LARGEFILE;
- if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
- kOLargeFileFlag = 0100000;
-+ else if (IsArchitecturePPC64())
-+ kOLargeFileFlag = 0200000;
-
- const Arg<int> cmd(1);
- const Arg<long> long_arg(2);
-@@ -262,14 +279,23 @@ ResultExpr RestrictFcntlCommands() {
- F_SETLKW,
- F_GETLK,
- F_DUPFD,
-- F_DUPFD_CLOEXEC),
-- Allow())
-+ F_DUPFD_CLOEXEC
-+#if defined(__powerpc64__)
-+// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
-+// but glibc will sometimes still use the 32-bit versions. Allow both.
-+ ,
-+ 5, /* F_GETLK (32) */
-+ 6, /* F_SETLK (32) */
-+ 7 /* F_SETLKW (32) */
-+#endif
-+ ),
-+ Allow())
- .Case(F_SETFL,
- If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
- .Default(CrashSIGSYS());
- }
-
--#if defined(__i386__) || defined(__mips__)
-+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
- ResultExpr RestrictSocketcallCommand() {
- // Unfortunately, we are unable to restrict the first parameter to
- // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
-@@ -418,7 +444,7 @@ ResultExpr RestrictPrlimitToGetrlimit(pid_t target_pid) {
- ResultExpr RestrictPtrace() {
- const Arg<int> request(0);
- return Switch(request).CASES((
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__powerpc64__)
- PTRACE_GETREGS,
- PTRACE_GETFPREGS,
- PTRACE_GET_THREAD_AREA,
-diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-index ba4289f05..9a4d5ab2d 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-@@ -48,7 +48,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictMprotectFlags();
- // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
- SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
-
--#if defined(__i386__) || defined(__mips__)
-+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
- // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
- // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
- SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
-diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index d3693fd78..d492cf94b 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
- switch (sysno) {
- case __NR_gettimeofday:
- #if defined(__i386__) || defined(__x86_64__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_time:
- #endif
- return true;
-@@ -41,12 +42,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
- case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID().
- case __NR_clock_settime: // Privileged.
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_ftime: // Obsolete.
- #endif
- case __NR_settimeofday: // Privileged.
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_stime:
- #endif
- default:
-@@ -112,7 +115,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
- case __NR_faccessat: // EPERM not a valid errno.
- case __NR_fchmodat:
- case __NR_fchownat: // Should be called chownat ?
--#if defined(__x86_64__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
- case __NR_newfstatat: // fstatat(). EPERM not a valid errno.
- #elif defined(__i386__) || defined(__arm__) || \
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-@@ -131,7 +134,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
- case __NR_memfd_create:
- case __NR_mkdirat:
- case __NR_mknodat:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
- case __NR_oldlstat:
- case __NR_oldstat:
- #endif
-@@ -145,7 +148,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
- #endif
- case __NR_statfs: // EPERM not a valid errno.
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_statfs64:
- #endif
- case __NR_symlinkat:
-@@ -155,7 +159,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
- case __NR_truncate64:
- #endif
- case __NR_unlinkat:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_utime:
- #endif
- case __NR_utimensat: // New.
-@@ -174,7 +179,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
- #endif
- return true;
- // TODO(jln): these should be denied gracefully as well (moved below).
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_fadvise64: // EPERM not a valid errno.
- #endif
- #if defined(__i386__)
-@@ -187,11 +193,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
- case __NR_flock: // EPERM not a valid errno.
- case __NR_fstatfs: // Give information about the whole filesystem.
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_fstatfs64:
- #endif
- case __NR_fsync: // EPERM not a valid errno.
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
- case __NR_oldfstat:
- #endif
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-@@ -199,6 +206,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
- case __NR_sync_file_range: // EPERM not a valid errno.
- #elif defined(__arm__)
- case __NR_arm_sync_file_range: // EPERM not a valid errno.
-+#elif defined(__powerpc64__)
-+ case __NR_sync_file_range2: // EPERM not a valid errno.
- #endif
- default:
- return false;
-@@ -224,7 +233,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) {
- #endif
- case __NR_getdents64: // EPERM not a valid errno.
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_readdir:
- #endif
- return true;
-@@ -265,7 +275,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) {
- bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
- switch (sysno) {
- case __NR_capset:
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
- case __NR_ioperm: // Intel privilege.
- case __NR_iopl: // Intel privilege.
- #endif
-@@ -316,7 +326,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
- case __NR_rt_sigreturn:
- case __NR_rt_sigtimedwait:
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_sigaction:
- case __NR_sigprocmask:
- case __NR_sigreturn:
-@@ -332,7 +343,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
- #endif
- case __NR_signalfd4:
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_sigpending:
- case __NR_sigsuspend:
- #endif
-@@ -356,7 +368,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) {
- #endif
- case __NR_dup3:
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_shutdown:
- #endif
- return true;
-@@ -390,7 +402,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- case __NR_membarrier:
- case __NR_wait4:
- case __NR_waitid:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
- case __NR_waitpid:
- #endif
- return true;
-@@ -407,7 +419,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #endif
- case __NR_set_tid_address:
- case __NR_unshare:
--#if !defined(__mips__) && !defined(__aarch64__)
-+#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
- case __NR_vfork:
- #endif
- default:
-@@ -456,7 +468,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
- return true;
- default:
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_socketpair: // We will want to inspect its argument.
- #endif
- return false;
-@@ -466,7 +478,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
- bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
- switch (sysno) {
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_accept:
- case __NR_accept4:
- case __NR_bind:
-@@ -481,7 +493,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
- }
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- // Big multiplexing system call for sockets.
- bool SyscallSets::IsSocketCall(int sysno) {
- switch (sysno) {
-@@ -495,7 +508,8 @@ bool SyscallSets::IsSocketCall(int sysno) {
- }
- #endif
-
--#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
-+#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- bool SyscallSets::IsNetworkSocketInformation(int sysno) {
- switch (sysno) {
- case __NR_getpeername:
-@@ -520,7 +534,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_mincore:
- case __NR_mlockall:
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_mmap:
- #endif
- #if defined(__i386__) || defined(__arm__) || \
-@@ -550,7 +564,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
- switch (sysno) {
- case __NR_lseek:
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR__llseek:
- #endif
- #if !defined(__aarch64__)
-@@ -562,26 +577,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
- case __NR_readv:
- case __NR_pread64:
- #if defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_recv:
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_recvfrom: // Could specify source.
- case __NR_recvmsg: // Could specify source.
- #endif
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
- case __NR_select:
- #endif
--#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
- case __NR__newselect:
- #endif
- #if defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_send:
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_sendmsg: // Could specify destination.
- case __NR_sendto: // Could specify destination.
- #endif
-@@ -638,7 +655,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
- return true;
- case __NR_getpriority:
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_nice:
- #endif
- case __NR_setpriority:
-@@ -650,7 +668,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
- bool SyscallSets::IsAdminOperation(int sysno) {
- switch (sysno) {
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_bdflush:
- #endif
- case __NR_kexec_load:
-@@ -666,7 +685,8 @@ bool SyscallSets::IsAdminOperation(int sysno) {
-
- bool SyscallSets::IsKernelModule(int sysno) {
- switch (sysno) {
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_create_module:
- case __NR_get_kernel_syms: // Should ENOSYS.
- case __NR_query_module:
-@@ -699,7 +719,8 @@ bool SyscallSets::IsFsControl(int sysno) {
- case __NR_swapoff:
- case __NR_swapon:
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_umount:
- #endif
- case __NR_umount2:
-@@ -715,7 +736,7 @@ bool SyscallSets::IsNuma(int sysno) {
- case __NR_getcpu:
- case __NR_mbind:
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_migrate_pages:
- #endif
- case __NR_move_pages:
-@@ -744,14 +765,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) {
- switch (sysno) {
- case __NR_acct: // Privileged.
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_getrlimit:
- #endif
--#if defined(__i386__) || defined(__arm__)
-+#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
- case __NR_ugetrlimit:
- #endif
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_ulimit:
- #endif
- case __NR_getrusage:
-@@ -785,7 +807,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) {
- #endif
- case __NR_sysinfo:
- case __NR_uname:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
- case __NR_olduname:
- case __NR_oldolduname:
- #endif
-@@ -847,8 +869,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) {
- }
- #endif
-
-+/* shitty hack around Void's 4.19 kernel headers missing those numbers */
-+#if defined(__powerpc64__) && !defined(__NR_shmget)
-+#define __NR_shmget 395
-+#define __NR_shmctl 396
-+#define __NR_shmat 397
-+#define __NR_shmdt 398
-+#endif
-+
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
-- defined(__aarch64__) || \
-+ defined(__aarch64__) || defined(__powerpc64__) || \
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
- // These give a lot of ambient authority and bypass the setuid sandbox.
- bool SyscallSets::IsSystemVSharedMemory(int sysno) {
-@@ -880,7 +910,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
- #endif
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- // Big system V multiplexing system call.
- bool SyscallSets::IsSystemVIpc(int sysno) {
- switch (sysno) {
-@@ -900,7 +931,8 @@ bool SyscallSets::IsAnySystemV(int sysno) {
- return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
- IsSystemVSharedMemory(sysno);
- #elif defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- return IsSystemVIpc(sysno);
- #endif
- }
-@@ -953,7 +985,8 @@ bool SyscallSets::IsFaNotify(int sysno) {
- bool SyscallSets::IsTimer(int sysno) {
- switch (sysno) {
- case __NR_getitimer:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_alarm:
- #endif
- case __NR_setitimer:
-@@ -1012,18 +1045,22 @@ bool SyscallSets::IsMisc(int sysno) {
- case __NR_syncfs:
- case __NR_vhangup:
- // The system calls below are not implemented.
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_afs_syscall:
- #endif
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_break:
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_getpmsg:
- #endif
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_gtty:
- case __NR_idle:
- case __NR_lock:
-@@ -1031,20 +1068,22 @@ bool SyscallSets::IsMisc(int sysno) {
- case __NR_prof:
- case __NR_profil:
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_putpmsg:
- #endif
- #if defined(__x86_64__)
- case __NR_security:
- #endif
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_stty:
- #endif
--#if defined(__x86_64__)
-+#if defined(__x86_64__) || defined(__powerpc64__)
- case __NR_tuxcall:
- #endif
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__powerpc64__)
- case __NR_vserver:
- #endif
- return true;
-diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.h sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-index 923533ec9..411f72acd 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
- static bool IsDeniedGetOrModifySocket(int sysno);
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- // Big multiplexing system call for sockets.
- static bool IsSocketCall(int sysno);
- #endif
-
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- static bool IsNetworkSocketInformation(int sysno);
- #endif
-
-@@ -76,7 +77,7 @@ class SANDBOX_EXPORT SyscallSets {
- static bool IsSystemVSemaphores(int sysno);
- #endif
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
-- defined(__aarch64__) || \
-+ defined(__aarch64__) || defined(__powerpc64__) || \
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
- // These give a lot of ambient authority and bypass the setuid sandbox.
- static bool IsSystemVSharedMemory(int sysno);
-@@ -88,7 +89,8 @@ class SANDBOX_EXPORT SyscallSets {
- #endif
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- // Big system V multiplexing system call.
- static bool IsSystemVIpc(int sysno);
- #endif
-diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc
-index e47e98bf5..d53a7ff56 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -18,7 +18,7 @@ namespace sandbox {
- namespace {
-
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
-- defined(ARCH_CPU_MIPS_FAMILY)
-+ defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
- // Number that's not currently used by any Linux kernel ABIs.
- const int kInvalidSyscallNumber = 0x351d3;
- #else
-@@ -310,12 +310,56 @@ asm(// We need to be able to tell the kernel exactly where we made a
- // Enter the kernel
- "svc 0\n"
- "2:ret\n"
-+ ".cfi_endproc\n"
-+ ".size SyscallAsm, .-SyscallAsm\n"
-+#elif defined(__powerpc64__)
-+ ".text\n"
-+ ".align 4\n"
-+ ".type SyscallAsm @function\n"
-+ "SyscallAsm:\n"
-+ ".cfi_startproc\n"
-+
-+ // Check if r3 is negative
-+ "cmpdi 3, 0\n"
-+ "bgt 2f\n"
-+
-+ // Load address of 3f into r3 and return
-+ "mflr 10\n"
-+ "bl 1f\n"
-+ "1: mflr 3\n"
-+ "mtlr 10\n"
-+ "addi 3, 3, 4*13\n"
-+ "blr\n"
-+
-+ // Load arguments from array into r3-8
-+ // save param 3 in r10
-+ "2:\n"
-+ "mr 0, 3\n"
-+ "ld 3, 0(4)\n"
-+ "ld 5, 16(4)\n"
-+ "ld 6, 24(4)\n"
-+ "ld 7, 32(4)\n"
-+ "ld 8, 40(4)\n"
-+ "ld 4, 8(4)\n"
-+ "li 9, 0\n"
-+
-+ // Enter kernel
-+ "sc\n"
-+
-+ // Magic return address
-+ "3:\n"
-+ // Like MIPS, ppc64 return values are always positive.
-+ // Check for error in cr0.SO and negate upon error
-+ "bc 4, 3, 4f\n"
-+ "neg 3, 3\n"
-+ "4: blr\n"
-+
- ".cfi_endproc\n"
- ".size SyscallAsm, .-SyscallAsm\n"
- #endif
- ); // asm
-
--#if defined(__x86_64__)
-+#if defined(__x86_64__) || defined(__powerpc64__)
- extern "C" {
- intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
- }
-@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
- ret = inout;
- }
-
-+#elif defined(__powerpc64__)
-+ intptr_t ret = SyscallAsm(nr, args);
- #else
- #error "Unimplemented architecture"
- #endif
-@@ -445,8 +491,18 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
- // needs to be changed back.
- ret_val = -ret_val;
- SECCOMP_PARM4(ctx) = 1;
-- } else
-+ } else {
- SECCOMP_PARM4(ctx) = 0;
-+ }
-+#endif
-+#if defined(__powerpc64__)
-+ // Same as MIPS, need to invert ret and set error register (cr0.SO)
-+ if (ret_val <= -1 && ret_val >= -4095) {
-+ ret_val = -ret_val;
-+ ctx->uc_mcontext.regs->ccr |= (1 << 28);
-+ } else {
-+ ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
-+ }
- #endif
- SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
- }
-diff --git sandbox/linux/seccomp-bpf/trap.cc sandbox/linux/seccomp-bpf/trap.cc
-index 9884be8bb..98e4371aa 100644
---- a/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/sandbox/linux/seccomp-bpf/trap.cc
-@@ -232,6 +232,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
- SetIsInSigHandler();
- }
-
-+#if defined(__powerpc64__)
-+ // On ppc64+glibc, some syscalls seem to accidentally negate the first
-+ // parameter which causes checks against it to fail. For now, manually
-+ // negate them back.
-+ // TODO(shawn@anastas.io): investigate this issue further
-+ auto nr = SECCOMP_SYSCALL(ctx);
-+ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
-+ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
-+ if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
-+ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
-+ }
-+ }
-+#endif
-+
- // Copy the seccomp-specific data into a arch_seccomp_data structure. This
- // is what we are showing to TrapFnc callbacks that the system call
- // evaluator registered with the sandbox.
-diff --git sandbox/linux/services/credentials.cc sandbox/linux/services/credentials.cc
-index d7b5d8c44..4adc6d0d4 100644
---- a/sandbox/linux/services/credentials.cc
-+++ b/sandbox/linux/services/credentials.cc
-@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
- pid_t pid = -1;
- alignas(16) char stack_buf[PTHREAD_STACK_MIN];
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
-- defined(ARCH_CPU_MIPS_FAMILY)
-+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
- // The stack grows downward.
- void* stack = stack_buf + sizeof(stack_buf);
- #else
-diff --git sandbox/linux/services/syscall_wrappers.cc sandbox/linux/services/syscall_wrappers.cc
-index fcfd2aa12..f6eb32fb7 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -58,7 +58,7 @@ long sys_clone(unsigned long flags,
- #if defined(ARCH_CPU_X86_64)
- return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
- #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
-- defined(ARCH_CPU_MIPS_FAMILY)
-+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
- // CONFIG_CLONE_BACKWARDS defined.
- return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
- #endif
-diff --git sandbox/linux/syscall_broker/broker_process.cc sandbox/linux/syscall_broker/broker_process.cc
-index 8321d2379..7e5ad1de3 100644
---- a/sandbox/linux/syscall_broker/broker_process.cc
-+++ b/sandbox/linux/syscall_broker/broker_process.cc
-@@ -157,7 +157,7 @@ bool BrokerProcess::IsSyscallAllowed(int sysno) const {
- #if defined(__NR_fstatat)
- case __NR_fstatat:
- #endif
--#if defined(__x86_64__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
- case __NR_newfstatat:
- #endif
- return !fast_check_in_client_ || allowed_command_set_.test(COMMAND_STAT);
-diff --git sandbox/linux/system_headers/linux_seccomp.h sandbox/linux/system_headers/linux_seccomp.h
-index a60fe2ad3..9dccdb51d 100644
---- a/sandbox/linux/system_headers/linux_seccomp.h
-+++ b/sandbox/linux/system_headers/linux_seccomp.h
-@@ -29,6 +29,9 @@
- #ifndef EM_AARCH64
- #define EM_AARCH64 183
- #endif
-+#ifndef EM_PPC64
-+#define EM_PPC64 21
-+#endif
-
- #ifndef __AUDIT_ARCH_64BIT
- #define __AUDIT_ARCH_64BIT 0x80000000
-@@ -54,6 +57,12 @@
- #ifndef AUDIT_ARCH_AARCH64
- #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
- #endif
-+#ifndef AUDIT_ARCH_PPC64
-+#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
-+#endif
-+#ifndef AUDIT_ARCH_PPC64LE
-+#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
-+#endif
-
- // For prctl.h
- #ifndef PR_SET_SECCOMP
-diff --git sandbox/linux/system_headers/linux_signal.h sandbox/linux/system_headers/linux_signal.h
-index f5a736761..515b21a5f 100644
---- a/sandbox/linux/system_headers/linux_signal.h
-+++ b/sandbox/linux/system_headers/linux_signal.h
-@@ -13,7 +13,7 @@
- // (not undefined, but defined different values and in different memory
- // layouts). So, fill the gap here.
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
-
- #define LINUX_SIGHUP 1
- #define LINUX_SIGINT 2
-diff --git sandbox/linux/system_headers/linux_syscalls.h sandbox/linux/system_headers/linux_syscalls.h
-index 2b78a0cc3..0a70f5ea5 100644
---- a/sandbox/linux/system_headers/linux_syscalls.h
-+++ b/sandbox/linux/system_headers/linux_syscalls.h
-@@ -35,5 +35,9 @@
- #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
- #endif
-
-+#if defined(__powerpc64__)
-+#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
-
-diff --git sandbox/linux/system_headers/linux_ucontext.h sandbox/linux/system_headers/linux_ucontext.h
-index 22ce78027..a69b024c2 100644
---- a/sandbox/linux/system_headers/linux_ucontext.h
-+++ b/sandbox/linux/system_headers/linux_ucontext.h
-@@ -11,6 +11,8 @@
- #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
- #elif defined(__i386__)
- #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
-+#elif defined(__powerpc64__)
-+#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
- #else
- #error "No support for your architecture in PNaCl header"
- #endif
-diff --git sandbox/linux/system_headers/ppc64_linux_syscalls.h sandbox/linux/system_headers/ppc64_linux_syscalls.h
-new file mode 100644
-index 000000000..ccacffe22
---- /dev/null
-+++ b/sandbox/linux/system_headers/ppc64_linux_syscalls.h
-@@ -0,0 +1,12 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-+
-+#include <asm/unistd.h>
-+
-+//TODO: is it necessary to redefine syscall numbers for PPC64?
-+
-+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-diff --git sandbox/linux/system_headers/ppc64_linux_ucontext.h sandbox/linux/system_headers/ppc64_linux_ucontext.h
-new file mode 100644
-index 000000000..07728e087
---- /dev/null
-+++ b/sandbox/linux/system_headers/ppc64_linux_ucontext.h
-@@ -0,0 +1,12 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-+
-+#include <sys/ucontext.h>
-+
-+//TODO: is it necessary to redefine ucontext on PPC64?
-+
-+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-diff --git services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index fb89b3356..1e984731e 100644
---- a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -15,6 +15,11 @@
- #include "sandbox/linux/system_headers/linux_syscalls.h"
- #include "services/service_manager/sandbox/linux/sandbox_linux.h"
-
-+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
-+#ifdef __powerpc64__
-+#include <termios.h>
-+#endif
-+
- // TODO(vignatti): replace the local definitions below with #include
- // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
- #include <linux/types.h>
-diff --git third_party/angle/src/compiler/translator/InfoSink.h third_party/angle/src/compiler/translator/InfoSink.h
-index 3a807e1e..5258617a 100644
---- a/third_party/angle/src/compiler/translator/InfoSink.h
-+++ b/third_party/angle/src/compiler/translator/InfoSink.h
-@@ -92,7 +92,16 @@ class TInfoSinkBase
- stream.precision(8);
- stream << f;
- }
-- sink.append(stream.str());
-+
-+ // Hack to work around a bug where negative floating point values
-+ // are rendered like '.0.5' instead of '-0.5'
-+ std::string res(stream.str());
-+
-+ if (signbit(f)) { // test if f is negative
-+ res[0] = '-';
-+ }
-+
-+ sink.append(res);
- return *this;
- }
- // Write boolean values as their names instead of integral value.
-diff --git third_party/angle/src/libANGLE/Constants.h third_party/angle/src/libANGLE/Constants.h
-index 42964cc1..6607deeb 100644
---- a/third_party/angle/src/libANGLE/Constants.h
-+++ b/third_party/angle/src/libANGLE/Constants.h
-@@ -9,6 +9,7 @@
- #ifndef LIBANGLE_CONSTANTS_H_
- #define LIBANGLE_CONSTANTS_H_
-
-+#include <cstddef>
- #include "common/platform.h"
-
- #include <stdint.h>
-diff --git third_party/boringssl/BUILD.gn third_party/boringssl/BUILD.gn
-index b435499f4..ac8a84b6d 100644
---- a/third_party/boringssl/BUILD.gn
-+++ b/third_party/boringssl/BUILD.gn
-@@ -101,6 +101,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
- } else {
- public_configs = [ ":no_asm_config" ]
- }
-+ } else if (current_cpu == "ppc64") {
-+ if (is_linux) {
-+ # TODO: ppc64 (be) check
-+ sources += crypto_sources_linux_ppc64le
-+ } else {
-+ public_configs = [ ":no_asm_config" ]
-+ }
- } else {
- public_configs = [ ":no_asm_config" ]
- }
-diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
-index 5617de88..dc8bc176 100644
---- a/third_party/breakpad/BUILD.gn
-+++ b/third_party/breakpad/BUILD.gn
-@@ -598,7 +598,6 @@ if (is_linux || is_android) {
- "breakpad/src/client/minidump_file_writer.h",
- "breakpad/src/common/convert_UTF.cc",
- "breakpad/src/common/convert_UTF.h",
-- "breakpad/src/common/linux/breakpad_getcontext.S",
- "breakpad/src/common/linux/elf_core_dump.cc",
- "breakpad/src/common/linux/elf_core_dump.h",
- "breakpad/src/common/linux/elfutils.cc",
-@@ -636,6 +635,14 @@ if (is_linux || is_android) {
-
- libs = [ "dl" ]
-
-+ if (current_cpu == "ppc64") {
-+ defines = [ "HAVE_GETCONTEXT" ]
-+ } else {
-+ sources += [
-+ "breakpad/src/common/linux/breakpad_getcontext.S"
-+ ]
-+ }
-+
- include_dirs = [
- ".",
- "breakpad/src",
-@@ -686,7 +693,6 @@ if (is_linux || is_android) {
- "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
- "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
- "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
-- "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
- "breakpad/src/common/linux/elf_core_dump_unittest.cc",
- "breakpad/src/common/linux/file_id_unittest.cc",
- "breakpad/src/common/linux/linux_libc_support_unittest.cc",
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-index 07d9171a..9aed4cb3 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
- typedef MDRawContextARM64_Old RawContextCPU;
- #elif defined(__mips__)
- typedef MDRawContextMIPS RawContextCPU;
-+#elif defined(__powerpc64__)
-+typedef MDRawContextPPC64 RawContextCPU;
- #else
- #error "This code has not been ported to your platform yet."
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index aae1dc13..03afec7a 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-@@ -270,7 +270,42 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
- out->float_save.fir = mcontext.fpc_eir;
- #endif
- }
--#endif // __mips__
-+
-+#elif defined(__powerpc64__)
-+
-+uintptr_t ThreadInfo::GetInstructionPointer() const {
-+ return mcontext.gp_regs[PT_NIP];
-+}
-+
-+void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-+ out->context_flags = MD_CONTEXT_PPC64_FULL;
-+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+ out->gpr[i] = mcontext.gp_regs[i];
-+
-+ out->lr = mcontext.gp_regs[PT_LNK];
-+ out->srr0 = mcontext.gp_regs[PT_NIP];
-+ out->srr1 = mcontext.gp_regs[PT_MSR];
-+ out->cr = mcontext.gp_regs[PT_CCR];
-+ out->xer = mcontext.gp_regs[PT_XER];
-+ out->ctr = mcontext.gp_regs[PT_CTR];
-+
-+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+ out->float_save.fpregs[i] = mcontext.fp_regs[i];
-+
-+ out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
-+
-+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-+ out->vector_save.save_vr[i] = \
-+ {(((uint64_t)vregs.vrregs[i][0]) << 32)
-+ | vregs.vrregs[i][1],
-+ (((uint64_t)vregs.vrregs[i][2]) << 32)
-+ | vregs.vrregs[i][3]};
-+
-+ out->vrsave = vregs.vrsave;
-+ out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
-+ out->vector_save.save_vrvalid = 0xFFFFFFFF;
-+}
-+#endif // __powerpc64__
-
- void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
- assert(gp_regs || size);
-@@ -279,6 +314,11 @@ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
- *gp_regs = mcontext.gregs;
- if (size)
- *size = sizeof(mcontext.gregs);
-+#elif defined(__powerpc64__)
-+ if (gp_regs)
-+ *gp_regs = mcontext.gp_regs;
-+ if (size)
-+ *size = sizeof(mcontext.gp_regs);
- #else
- if (gp_regs)
- *gp_regs = ®s;
-@@ -294,6 +334,11 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
- *fp_regs = &mcontext.fpregs;
- if (size)
- *size = sizeof(mcontext.fpregs);
-+#elif defined(__powerpc64__)
-+ if (fp_regs)
-+ *fp_regs = &mcontext.fp_regs;
-+ if (size)
-+ *size = sizeof(mcontext.fp_regs);
- #else
- if (fp_regs)
- *fp_regs = &fpregs;
-@@ -302,4 +347,13 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
- #endif
- }
-
-+#if defined(__powerpc64__)
-+void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
-+ if (v_regs)
-+ *v_regs = &vregs;
-+ if (size)
-+ *size = sizeof(vregs);
-+}
-+#endif
-+
- } // namespace google_breakpad
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-index fb216fa6..593aac82 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-@@ -68,6 +68,10 @@ struct ThreadInfo {
- // Use the structures defined in <sys/user.h>
- struct user_regs_struct regs;
- struct user_fpsimd_struct fpregs;
-+#elif defined(__powerpc64__)
-+ // Use the structures defined in <sys/ucontext.h>.
-+ mcontext_t mcontext;
-+ vrregset_t vregs;
- #elif defined(__mips__)
- // Use the structure defined in <sys/ucontext.h>.
- mcontext_t mcontext;
-@@ -84,6 +88,11 @@ struct ThreadInfo {
-
- // Returns the pointer and size of float point register area.
- void GetFloatingPointRegisters(void** fp_regs, size_t* size);
-+
-+#if defined(__powerpc64__)
-+ // Returns the pointer and size of the vector register area. (PPC64 only)
-+ void GetVectorRegisters(void** v_regs, size_t* size);
-+#endif
- };
-
- } // namespace google_breakpad
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index ee515c41..1090470f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- out->float_save.fir = uc->uc_mcontext.fpc_eir; // Unused.
- #endif
- }
-+
-+#elif defined(__powerpc64__)
-+
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-+ return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
-+}
-+
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-+ return uc->uc_mcontext.gp_regs[PT_NIP];
-+}
-+
-+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
-+ const vrregset_t* vregs) {
-+ out->context_flags = MD_CONTEXT_PPC64_FULL;
-+
-+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+ out->gpr[i] = uc->uc_mcontext.gp_regs[i];
-+
-+ out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
-+ out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
-+ out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
-+ out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
-+ out->xer = uc->uc_mcontext.gp_regs[PT_XER];
-+ out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
-+
-+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+ out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
-+
-+ out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
-+
-+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-+ out->vector_save.save_vr[i] =
-+ {(((uint64_t)vregs->vrregs[i][0]) << 32)
-+ | vregs->vrregs[i][1],
-+ (((uint64_t)vregs->vrregs[i][2]) << 32)
-+ | vregs->vrregs[i][3]};
-+
-+ out->vrsave = vregs->vrsave;
-+ out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
-+ out->vector_save.save_vrvalid = 0xFFFFFFFF;
-+}
-+
- #endif
-
- } // namespace google_breakpad
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index 8e74a8a5..7cb667a7 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -55,6 +55,9 @@ struct UContextReader {
- #elif defined(__aarch64__)
- static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs);
-+#elif defined(__powerpc64__)
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-+ const vrregset_t* vregs);
- #else
- static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index c65feaa1..5a7ab50c 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -461,9 +461,16 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
- memcpy(&g_crash_context_.float_state, fp_ptr,
- sizeof(g_crash_context_.float_state));
- }
-+#elif defined(__powerpc64__)
-+ // On PPC64, we must copy VR state
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
-+ if (uc_ptr->uc_mcontext.v_regs) {
-+ memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
-+ sizeof(g_crash_context_.vector_state));
-+ }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- // FP state is not part of user ABI on ARM Linux.
-- // In case of MIPS Linux FP state is already part of ucontext_t
-+ // In case of MIPS, Linux FP state is already part of ucontext_t
- // and 'float_state' is not a member of CrashContext.
- ucontext_t* uc_ptr = (ucontext_t*)uc;
- if (uc_ptr->uc_mcontext.fpregs) {
-@@ -701,11 +708,19 @@ bool ExceptionHandler::WriteMinidump() {
- }
- #endif
-
--#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
-+#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
-+ && !defined(__powerpc64__)
- // FPU state is not part of ARM EABI ucontext_t.
- memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
- sizeof(context.float_state));
- #endif
-+
-+#if defined(__powerpc64__)
-+ // Vector registers must be copied on PPC64
-+ memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
-+ sizeof(context.vector_state));
-+#endif
-+
- context.tid = sys_gettid();
-
- // Add an exception stream to the minidump for better reporting.
-@@ -726,6 +741,9 @@ bool ExceptionHandler::WriteMinidump() {
- #elif defined(__mips__)
- context.siginfo.si_addr =
- reinterpret_cast<void*>(context.context.uc_mcontext.pc);
-+#elif defined(__powerpc64__)
-+ context.siginfo.si_addr =
-+ reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
- #else
- #error "This code has not been ported to your platform yet."
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-index f44483ff..36ce6d6c 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-@@ -192,7 +192,11 @@ class ExceptionHandler {
- siginfo_t siginfo;
- pid_t tid; // the crashing thread.
- ucontext_t context;
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ // PPC64's FP state is a part of ucontext_t like MIPS but the vector
-+ // state is not, so a struct is needed.
-+ vstate_t vector_state;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- // #ifdef this out because FP state is not part of user ABI for Linux ARM.
- // In case of MIPS Linux FP state is already part of ucontext_t so
- // 'float_state' is not required.
-diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-index 8d8809fa..e2eb031e 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) {
- }
-
- // Wait a while until the child should have crashed.
-- usleep(1000000);
-+ usleep(2000000);
- // Kill the child if it is still running.
- kill(child, SIGKILL);
-
-@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[] = {
- #if defined(__mips__)
- // mfc2 zero,Impl - usually illegal in userspace.
- 0x48, 0x00, 0x00, 0x48
-+#elif defined(__powerpc64__)
-+ 0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
- #else
- // This crashes with SIGILL on x86/x86-64/arm.
- 0xff, 0xff, 0xff, 0xff
-@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
-
- // These are defined here so the parent can use them to check the
- // data from the minidump afterwards.
-- // Use 4k here because the OS will hand out a single page even
-+ // Use the page size here because the OS will hand out a single page even
- // if a smaller size is requested, and this test wants to
- // test the upper bound of the memory range.
-- const uint32_t kMemorySize = 4096; // bytes
-+ const uint32_t kMemorySize = getpagesize(); // bytes
- const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
-
- const pid_t child = fork();
-diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-index fa3c1713..6ce709e2 100644
---- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-@@ -138,7 +138,9 @@ class MicrodumpWriter {
- const MicrodumpExtraInfo& microdump_extra_info,
- LinuxDumper* dumper)
- : ucontext_(context ? &context->context : NULL),
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ vector_state_(context ? &context->vector_state : NULL),
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- float_state_(context ? &context->float_state : NULL),
- #endif
- dumper_(dumper),
-@@ -337,6 +339,8 @@ class MicrodumpWriter {
- # else
- # error "This mips ABI is currently not supported (n32)"
- #endif
-+#elif defined(__powerpc64__)
-+ const char kArch[] = "ppc64";
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-@@ -409,7 +413,9 @@ class MicrodumpWriter {
- void DumpCPUState() {
- RawContextCPU cpu;
- my_memset(&cpu, 0, sizeof(RawContextCPU));
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
- #else
- UContextReader::FillCPUContext(&cpu, ucontext_);
-@@ -605,7 +611,9 @@ class MicrodumpWriter {
- void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
-
- const ucontext_t* const ucontext_;
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ const google_breakpad::vstate_t* const vector_state_;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_;
- #endif
- LinuxDumper* dumper_;
-diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-index 6339ac0c..291af106 100644
---- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappings) {
- CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
- ASSERT_TRUE(ContainsMicrodump(buf));
-
-+ int page_size = getpagesize();
- #ifdef __LP64__
-- ASSERT_NE(std::string::npos,
-- buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
-- "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+ // This test is only available for the following page sizes
-+ ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
-+ if (page_size == 4096) {
-+ ASSERT_NE(std::string::npos,
-+ buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
-+ "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+ } else {
-+ ASSERT_NE(std::string::npos,
-+ buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
-+ "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+ }
- #else
- ASSERT_NE(std::string::npos,
- buf.find("M 00001000 0000002A 00001000 "
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-index 41506898..b93e4afc 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-@@ -112,6 +112,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
- #elif defined(__mips__)
- stack_pointer =
- reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
-+#elif defined(__powerpc64__)
-+ stack_pointer =
-+ reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
- #else
- #error "This code hasn't been ported to your platform yet."
- #endif
-@@ -197,7 +200,10 @@ bool LinuxCoreDumper::EnumerateThreads() {
- memset(&info, 0, sizeof(ThreadInfo));
- info.tgid = status->pr_pgrp;
- info.ppid = status->pr_ppid;
--#if defined(__mips__)
-+#if defined(__powerpc64__)
-+ for (int i = 0; i < 31; i++)
-+ info.mcontext.gp_regs[i] = status->pr_reg[i];
-+#elif defined(__mips__)
- #if defined(__ANDROID__)
- for (int i = EF_R0; i <= EF_R31; i++)
- info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-index 1112035b..8523dad6 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len,
- reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
-
- // The number of bytes of stack which we try to capture.
-- static const ptrdiff_t kStackToCapture = 32 * 1024;
-+ // This now depends on page_size to avoid missing data
-+ // on systems with larger page sizes.
-+ static const ptrdiff_t kStackToCapture = 8 * page_size;
-
- const MappingInfo* mapping = FindMapping(stack_pointer);
- if (!mapping)
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-index f4a75d90..020981f5 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-@@ -63,7 +63,8 @@ namespace google_breakpad {
- (defined(__mips__) && _MIPS_SIM == _ABIO32)
- typedef Elf32_auxv_t elf_aux_entry;
- #elif defined(__x86_64) || defined(__aarch64__) || \
-- (defined(__mips__) && _MIPS_SIM != _ABIO32)
-+ (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
-+ defined(__powerpc64__)
- typedef Elf64_auxv_t elf_aux_entry;
- #endif
-
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-index 3ad48e50..1688c365 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-@@ -51,6 +51,8 @@
- #define TID_PTR_REGISTER "rcx"
- #elif defined(__mips__)
- #define TID_PTR_REGISTER "$1"
-+#elif defined(__powerpc64__)
-+#define TID_PTR_REGISTER "r8"
- #else
- #error This test has not been ported to this platform.
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-index e3ddb81a..fa28575e 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-@@ -149,19 +149,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child,
- return true;
- }
-
--bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
--{
-+bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
- #ifdef PTRACE_GETREGSET
- struct iovec io;
- info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
-- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
-+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
- return false;
- }
-
- info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
-- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
-+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
- return false;
- }
-+
-+#if defined(__powerpc64__)
-+ // Grab the vector registers on PPC64 too
-+ info->GetVectorRegisters(&io.iov_base, &io.iov_len);
-+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
-+ return false;
-+ }
-+#endif // defined(__powerpc64__)
-+
- return true;
- #else
- return false;
-@@ -298,6 +306,9 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
- #elif defined(__mips__)
- stack_pointer =
- reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
-+#elif defined(__powerpc64__)
-+ stack_pointer =
-+ reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
- #else
- #error "This code hasn't been ported to your platform yet."
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-index ea6b9a12..9b318fe0 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
- #elif defined(__mips__)
- pid_t* process_tid_location =
- reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
-+#elif defined(__powerpc64__)
-+ pid_t* process_tid_location =
-+ reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
- #else
- #error This test has not been ported to this platform.
- #endif
-@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeStackCopy) {
- uintptr_t heap_addr = thread_info.regs.rcx;
- #elif defined(__mips__)
- uintptr_t heap_addr = thread_info.mcontext.gregs[1];
-+#elif defined(__powerpc64__)
-+ uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
- #else
- #error This test has not been ported to this platform.
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-index f8cdf2a1..cb808c15 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-@@ -136,7 +136,9 @@ class MinidumpWriter {
- : fd_(minidump_fd),
- path_(minidump_path),
- ucontext_(context ? &context->context : NULL),
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ vector_state_(context ? &context->vector_state : NULL),
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- float_state_(context ? &context->float_state : NULL),
- #endif
- dumper_(dumper),
-@@ -468,7 +470,9 @@ class MinidumpWriter {
- if (!cpu.Allocate())
- return false;
- my_memset(cpu.get(), 0, sizeof(RawContextCPU));
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
- #else
- UContextReader::FillCPUContext(cpu.get(), ucontext_);
-@@ -897,7 +901,7 @@ class MinidumpWriter {
- dirent->location.rva = 0;
- }
-
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
- bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
- char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
- static const char vendor_id_name[] = "vendor_id";
-@@ -917,7 +921,9 @@ class MinidumpWriter {
-
- // processor_architecture should always be set, do this first
- sys_info->processor_architecture =
--#if defined(__mips__)
-+#if defined(__powerpc64__)
-+ MD_CPU_ARCHITECTURE_PPC64;
-+#elif defined(__mips__)
- # if _MIPS_SIM == _ABIO32
- MD_CPU_ARCHITECTURE_MIPS;
- # elif _MIPS_SIM == _ABI64
-@@ -1333,7 +1339,9 @@ class MinidumpWriter {
- const char* path_; // Path to the file where the minidum should be written.
-
- const ucontext_t* const ucontext_; // also from the signal handler
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ const google_breakpad::vstate_t* const vector_state_;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_; // ditto
- #endif
- LinuxDumper* dumper_;
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-index e3b0b16d..ccd8aa0a 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-@@ -48,6 +48,8 @@ class ExceptionHandler;
-
- #if defined(__aarch64__)
- typedef struct fpsimd_context fpstate_t;
-+#elif defined(__powerpc64__)
-+typedef vrregset_t vstate_t;
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- typedef std::remove_pointer<fpregset_t>::type fpstate_t;
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-index 3017a49a..364efd79 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-@@ -715,6 +715,9 @@ TEST(MinidumpWriterTest, InvalidStackPointer) {
- #elif defined(__mips__)
- context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
- invalid_stack_pointer;
-+#elif defined(__powerpc64__)
-+ context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
-+ invalid_stack_pointer;
- #else
- # error "This code has not been ported to your platform yet."
- #endif
-diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-index 4e938269..f0ff15d9 100644
---- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-+++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) {
- }
-
- #if defined(__x86_64__) || defined(__aarch64__) || \
-- (defined(__mips__) && _MIPS_SIM == _ABI64)
--
-+ (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
- struct kernel_stat st;
- if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
- #else
-diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-index fad59f40..616496d6 100644
---- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterMap) {
- TEST_F(MemoryMappedFileTest, MapWithOffset) {
- // Put more data in the test file this time. Offsets can only be
- // done on page boundaries, so we need a two page file to test this.
-- const int page_size = 4096;
-- char data1[2 * page_size];
-- size_t data1_size = sizeof(data1);
-+ const int page_size = getpagesize();
-+ char *data1 = static_cast<char*>(malloc(2 * page_size));
-+ EXPECT_TRUE(data1 != NULL);
-+ size_t data1_size = (2 * page_size);
- for (size_t i = 0; i < data1_size; ++i) {
- data1[i] = i & 0x7f;
- }
-diff --git third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-index 43c86314..27325b81 100644
---- a/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-@@ -57,8 +57,9 @@
-
- EXPECT_EQ(0U, allocator.pages_allocated());
- uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
-+ uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
- ASSERT_FALSE(p == NULL);
-- EXPECT_EQ(3U, allocator.pages_allocated());
-+ EXPECT_EQ(expected_pages, allocator.pages_allocated());
- for (unsigned i = 1; i < 10; ++i) {
- uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
- ASSERT_FALSE(p == NULL);
-diff --git third_party/breakpad/breakpad/src/processor/exploitability_linux.cc third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-index ccc9f145..debaed4d 100644
---- a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-+++ b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) {
- // Check architecture and set architecture variable to corresponding flag
- // in objdump.
- switch (context->GetContextCPU()) {
-+#if defined(__i386) || defined(__x86_64)
- case MD_CONTEXT_X86:
- architecture = "i386";
- break;
- case MD_CONTEXT_AMD64:
- architecture = "i386:x86-64";
- break;
-+#endif
- default:
- // Unsupported architecture. Note that ARM architectures are not
- // supported because objdump does not support ARM.
-diff --git third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-index 528ee5f2..72764d6c 100644
---- a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename) {
- }
-
- TEST(ExploitabilityTest, TestWindowsEngine) {
-+// The following tests are only executable on an x86-class linux machine.
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
- ExploitabilityFor("ascii_read_av.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngine) {
- ExploitabilityFor("read_av_clobber_write.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
- ExploitabilityFor("read_av_conditional.dmp"));
-+#endif
- }
-
- TEST(ExploitabilityTest, TestLinuxEngine) {
-+// The following tests are only executable on an x86-class linux machine.
-+#if defined(__i386) || defined(__x86_64)
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
- ExploitabilityFor("linux_null_read_av.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
- ExploitabilityFor("linux_executable_heap.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
- ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
--#ifndef _WIN32
-+#endif
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
- ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
- ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
- ExploitabilityFor("linux_write_to_under_4k.dmp"));
--#endif // _WIN32
-+#endif // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
- }
-
--#ifndef _WIN32
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
- TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
- ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
- uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
-@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, CalculateAddressTest) {
- context,
- &write_address));
- }
--#endif // _WIN32
-+#endif // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
-+
-
- } // namespace
-diff --git third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-index a60be323..35b11b6d 100644
---- a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-+++ b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-@@ -77,6 +77,8 @@
- #define ELF_ARCH EM_MIPS
- #elif defined(__aarch64__)
- #define ELF_ARCH EM_AARCH64
-+#elif defined(__powerpc64__)
-+ #define ELF_ARCH EM_PPC64
- #endif
-
- #if defined(__arm__)
-@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
- #elif defined (__mips__)
- // This file-local typedef simplifies the source code.
- typedef gregset_t user_regs_struct;
-+#elif defined(__powerpc64__)
-+typedef struct pt_regs user_regs_struct;
- #endif
-
- using google_breakpad::MDTypeHelper;
-@@ -321,6 +325,9 @@ struct CrashedProcess {
- #endif
- #if defined(__aarch64__)
- user_fpsimd_struct fpregs;
-+#endif
-+#if defined(__powerpc64__)
-+ mcontext_t mcontext;
- #endif
- uintptr_t stack_addr;
- const uint8_t* stack;
-@@ -535,6 +542,38 @@ ParseThreadRegisters(CrashedProcess::Thread* thread,
- thread->mcontext.fpc_eir = rawregs->float_save.fir;
- #endif
- }
-+#elif defined(__powerpc64__)
-+static void
-+ParseThreadRegisters(CrashedProcess::Thread* thread,
-+ const MinidumpMemoryRange& range) {
-+ const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
-+
-+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+ thread->mcontext.gp_regs[i] = rawregs->gpr[i];
-+
-+ thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
-+ thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
-+ thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
-+ thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
-+ thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
-+ thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
-+ thread->mcontext.v_regs->vrsave = rawregs->vrsave;
-+
-+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+ thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
-+
-+ thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
-+
-+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
-+ thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
-+ thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
-+ thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
-+ thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
-+ }
-+
-+ thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
-+}
-+
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-@@ -623,6 +662,12 @@ ParseSystemInfo(const Options& options, CrashedProcess* crashinfo,
- # else
- # error "This mips ABI is currently not supported (n32)"
- # endif
-+#elif defined(__powerpc64__)
-+ if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
-+ fprintf(stderr,
-+ "This version of minidump-2-core only supports PPC64.\n");
-+ exit(1);
-+ }
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-diff --git third_party/crashpad/crashpad/CONTRIBUTORS third_party/crashpad/crashpad/CONTRIBUTORS
-index 8724b7f3..8e29424e 100644
---- a/third_party/crashpad/crashpad/CONTRIBUTORS
-+++ b/third_party/crashpad/crashpad/CONTRIBUTORS
-@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
- Robert Sesek <rsesek@chromium.org>
- Scott Graham <scottmg@chromium.org>
- Joshua Peraza <jperaza@chromium.org>
-+Shawn Anastasio <shawn@anastas.io>
-diff --git third_party/crashpad/crashpad/compat/linux/sys/user.h third_party/crashpad/crashpad/compat/linux/sys/user.h
-index 6ed77a98..1fd83469 100644
---- a/third_party/crashpad/crashpad/compat/linux/sys/user.h
-+++ b/third_party/crashpad/crashpad/compat/linux/sys/user.h
-@@ -15,6 +15,7 @@
- #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
- #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
-
-+#include <cstddef>
- #include_next <sys/user.h>
-
- #include <features.h>
-diff --git third_party/crashpad/crashpad/minidump/minidump_context.h third_party/crashpad/crashpad/minidump/minidump_context.h
-index 3a3e603c..3118d9e9 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context.h
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context.h
-@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
- uint64_t fir;
- };
-
-+//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
-+//! Based on minidump_cpu_ppc64.h from breakpad
-+enum MinidumpContextPPC64Flags : uint32_t {
-+ //! \brief Identifies the context as PPC64.
-+ kMinidumpContextPPC64 = 0x01000000,
-+
-+ //! \brief Indicates the validity of general purpose registers.
-+ //!
-+ //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
-+ kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
-+
-+ //! \brief Indicates the validity of floating point registers.
-+ //!
-+ //! Registers `fp0`-`fp31`, `fpscr` are valid.
-+ kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
-+
-+ //! \brief Indicates the validity of Altivec/VMX registers.
-+ //!
-+ //! Registers `v0`-`v31`, `vscr`, `vrsave`.
-+ kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
-+
-+ //! \brief Indicates the validity of all registers
-+ kMinidumpContextPPC64All = kMinidumpContextPPC64Base |
-+ kMinidumpContextPPC64Floating |
-+ kMinidumpContextPPC64Vector
-+};
-+
-+//! \brief A PPC64 CPU context carried in a minidump file.
-+//! Based on minidump_cpu_ppc64.h from breakpad.
-+struct MinidumpContextPPC64 {
-+ uint64_t context_flags;
-+
-+ //! \brief General purpose registers.
-+ uint64_t nip;
-+ uint64_t msr;
-+ uint64_t regs[32];
-+ uint64_t ccr;
-+ uint64_t xer;
-+ uint64_t lnk;
-+ uint64_t ctr;
-+
-+ //! \brief Floating point registers.
-+ double fpregs[32];
-+
-+ //! \brief FPU status register.
-+ double fpscr;
-+
-+ //! \brief Altivec/VMX vector registers.
-+ struct {
-+ //! \brief Vector registers are 128bits.
-+ uint128_struct save_vr[32];
-+ uint128_struct save_vscr;
-+
-+ //! \brief Padding included for breakpad compatibiltiy.
-+ uint32_t save_pad5[4];
-+
-+ //! \brief VRSAVE register.
-+ uint32_t save_vrsave;
-+
-+ //! \brief Padding included for breakpad compatibiltiy.
-+ uint32_t save_pad6[7];
-+ } vregs;
-+};
-+
- } // namespace crashpad
-
- #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
-diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.cc third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-index d7e53a49..d89eb9e0 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) {
- break;
- }
-
-+ case kCPUArchitecturePPC64: {
-+ context = std::make_unique<MinidumpContextPPC64Writer>();
-+ reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
-+ ->InitalizeFromSnapshot(context_snapshot->ppc64);
-+ break;
-+ }
-+
- default: {
- LOG(ERROR) << "unknown context architecture "
- << context_snapshot->architecture;
-@@ -453,4 +460,47 @@ size_t MinidumpContextMIPS64Writer::ContextSize() const {
- return sizeof(context_);
- }
-
-+MinidumpContextPPC64Writer::MinidumpContextPPC64Writer()
-+ : MinidumpContextWriter(), context_() {
-+ context_.context_flags = kMinidumpContextPPC64;
-+}
-+
-+MinidumpContextPPC64Writer::~MinidumpContextPPC64Writer() = default;
-+
-+void MinidumpContextPPC64Writer::InitalizeFromSnapshot(
-+ const CPUContextPPC64* context_snapshot) {
-+ DCHECK_EQ(state(), kStateMutable);
-+ DCHECK_EQ(context_.context_flags, kMinidumpContextPPC64);
-+
-+ context_.context_flags = kMinidumpContextPPC64All;
-+
-+ memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
-+ context_.nip = context_snapshot->nip;
-+ context_.msr = context_snapshot->msr;
-+ context_.ccr = context_snapshot->ccr;
-+ context_.xer = context_snapshot->xer;
-+ context_.lnk = context_snapshot->lnk;
-+ context_.ctr = context_snapshot->ctr;
-+
-+ memcpy(context_.fpregs, context_snapshot->fpregs, sizeof(context_.fpregs));
-+ context_.fpscr = context_snapshot->fpscr;
-+
-+ memcpy(context_.vregs.save_vr, context_snapshot->vregs.save_vr,
-+ sizeof(context_.vregs.save_vr));
-+ memcpy(&context_.vregs.save_vscr, &context_snapshot->vregs.save_vscr,
-+ sizeof(context_.vregs.save_vscr));
-+ context_.vregs.save_vrsave = context_snapshot->vregs.save_vrsave;
-+}
-+
-+bool MinidumpContextPPC64Writer::WriteObject(
-+ FileWriterInterface* file_writer) {
-+ DCHECK_EQ(state(), kStateWritable);
-+ return file_writer->Write(&context_, sizeof(context_));
-+}
-+
-+size_t MinidumpContextPPC64Writer::ContextSize() const {
-+ DCHECK_GE(state(), kStateFrozen);
-+ return sizeof(context_);
-+}
-+
- } // namespace crashpad
-diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.h third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-index d4ab936e..1d22fc59 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
- DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
- };
-
-+class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
-+ public:
-+ MinidumpContextPPC64Writer();
-+ ~MinidumpContextPPC64Writer() override;
-+
-+ //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
-+ //!
-+ //! \param[in] context_snapshot The context snapshot to use as source data.
-+ //!
-+ //! \note Valid in #kStateMutable. No mutation of context() may be done before
-+ //! calling this method, and it is not normally necessary to alter
-+ //! context() after calling this method.
-+ void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
-+
-+ //! \brief Returns a pointer to the context structure that this object will
-+ //! write.
-+ //!
-+ //! \attention This returns a non-`const` pointer to this object’s private
-+ //! data so that a caller can populate the context structure directly.
-+ //! This is done because providing setter interfaces to each field in the
-+ //! context structure would be unwieldy and cumbersome. Care must be taken
-+ //! to populate the context structure correctly. The context structure
-+ //! must only be modified while this object is in the #kStateMutable
-+ //! state.
-+ MinidumpContextPPC64* context() { return &context_; }
-+
-+ protected:
-+ // MinidumpWritable:
-+ bool WriteObject(FileWriterInterface* file_writer) override;
-+
-+ // MinidumpContextWriter:
-+ size_t ContextSize() const override;
-+
-+ private:
-+ MinidumpContextPPC64 context_;
-+
-+ DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
-+};
-+
- } // namespace crashpad
-
- #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
-diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-index 3216a906..a9fcbe9d 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
- context, ExpectMinidumpContextMIPS64, kSeed);
- }
-
-+TEST(MinidumpContextWriter, PPC64_Zeros) {
-+ EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
-+ ExpectMinidumpContextPPC64);
-+}
-+
-+TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
-+ constexpr uint32_t kSeed = 64;
-+ CPUContextPPC64 context_ppc64;
-+ CPUContext context;
-+ context.ppc64 = &context_ppc64;
-+ InitializeCPUContextPPC64(&context, kSeed);
-+ FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
-+ context, ExpectMinidumpContextPPC64, kSeed);
-+}
-+
- } // namespace
- } // namespace test
- } // namespace crashpad
-diff --git third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-index a1340760..95dc9252 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-@@ -126,6 +126,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
- static constexpr char kCPU[] = "mips";
- #elif defined(ARCH_CPU_MIPS64EL)
- static constexpr char kCPU[] = "mips64";
-+#elif defined(ARCH_CPU_PPC64)
-+ static constexpr char kCPU[] = "ppc64";
- #else
- #error define kCPU for this CPU
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/capture_memory.cc third_party/crashpad/crashpad/snapshot/capture_memory.cc
-index a51626cc..61e0b20a 100644
---- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-+++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-@@ -111,6 +111,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
- for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
- MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
- }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
-+ for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
-+ MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
-+ }
- #else
- #error Port.
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/cpu_architecture.h third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-index 811a7209..f4f83981 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-@@ -43,7 +43,10 @@ enum CPUArchitecture {
- kCPUArchitectureMIPSEL,
-
- //! \brief 64-bit MIPSEL.
-- kCPUArchitectureMIPS64EL
-+ kCPUArchitectureMIPS64EL,
-+
-+ //! \brief 64-bit PPC64.
-+ kCPUArchitecturePPC64
- };
-
- } // namespace crashpad
-diff --git third_party/crashpad/crashpad/snapshot/cpu_context.cc third_party/crashpad/crashpad/snapshot/cpu_context.cc
-index 6fb8d7e7..b01f7cad 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer() const {
- return arm->pc;
- case kCPUArchitectureARM64:
- return arm64->pc;
-+ case kCPUArchitecturePPC64:
-+ return ppc64->nip;
- default:
- NOTREACHED();
- return ~0ull;
-@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() const {
- return arm->sp;
- case kCPUArchitectureARM64:
- return arm64->sp;
-+ case kCPUArchitecturePPC64:
-+ return ppc64->regs[1];
- default:
- NOTREACHED();
- return ~0ull;
-@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
- case kCPUArchitectureX86_64:
- case kCPUArchitectureARM64:
- case kCPUArchitectureMIPS64EL:
-+ case kCPUArchitecturePPC64:
- return true;
- case kCPUArchitectureX86:
- case kCPUArchitectureARM:
-diff --git third_party/crashpad/crashpad/snapshot/cpu_context.h third_party/crashpad/crashpad/snapshot/cpu_context.h
-index fb23c467..eebede63 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_context.h
-@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
- uint64_t fir;
- };
-
-+//! \brief A context structure carrying PPC64 CPU state.
-+struct CPUContextPPC64 {
-+ uint64_t nip;
-+ uint64_t msr;
-+ uint64_t regs[32];
-+ uint64_t ccr;
-+ uint64_t xer;
-+ uint64_t lnk;
-+ uint64_t ctr;
-+ double fpregs[32];
-+ double fpscr;
-+ struct {
-+ uint128_struct save_vr[32];
-+ uint128_struct save_vscr;
-+ uint32_t save_vrsave;
-+ } vregs;
-+};
-+
- //! \brief A context structure capable of carrying the context of any supported
- //! CPU architecture.
- struct CPUContext {
-@@ -382,6 +400,7 @@ struct CPUContext {
- CPUContextARM64* arm64;
- CPUContextMIPS* mipsel;
- CPUContextMIPS64* mips64;
-+ CPUContextPPC64* ppc64;
- };
- };
-
-diff --git third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-index 9f46a489..aa677c4e 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-@@ -15,6 +15,7 @@
- #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
- #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
-
-+#include <cstring>
- #include "build/build_config.h"
- #include "snapshot/cpu_context.h"
- #include "snapshot/linux/signal_context.h"
-@@ -174,6 +175,78 @@ void InitializeCPUContextMIPS(
-
- #endif // ARCH_CPU_MIPS_FAMILY || DOXYGEN
-
-+#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
-+
-+//! \brief Initalizes a CPUContextPPC64 structure from native context
-+//! structures on Linux.
-+//!
-+//! \param[in] thread_context The native thread context.
-+//! \param[in] float_context The native float context.
-+//! \param[in] vector_context The native vector context.
-+//! \param[out] context The CPUContextPPC64 structure to initalize.
-+template <typename Traits>
-+void InitializeCPUContextPPC64(
-+ const ThreadContext::t64_t& thread_context,
-+ const FloatContext::f64_t& float_context,
-+ const VectorContext::v64_t& vector_context,
-+ typename Traits::CPUContext* context) {
-+
-+ memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
-+ context->nip = thread_context.nip;
-+ context->msr = thread_context.msr;
-+ context->ccr = thread_context.ccr;
-+ context->xer = thread_context.xer;
-+ context->lnk = thread_context.lnk;
-+ context->ctr = thread_context.ctr;
-+
-+ memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
-+ context->fpscr = float_context.fpscr;
-+
-+ for (uint8_t i = 0; i < 32; i++) {
-+ context->vregs.save_vr[i] = {
-+ (((uint64_t)vector_context.vrregs[i][0]) << 32) |
-+ vector_context.vrregs[i][1],
-+ (((uint64_t)vector_context.vrregs[i][2]) << 32) |
-+ vector_context.vrregs[i][3]
-+ };
-+ }
-+ context->vregs.save_vrsave = vector_context.vrsave;
-+ context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
-+}
-+
-+template <typename Traits>
-+void InitializeCPUContextPPC64(
-+ const SignalThreadContext64 &thread_context,
-+ const SignalFloatContext64 &float_context,
-+ const SignalVectorContext64 &vector_context,
-+ typename Traits::CPUContext* context) {
-+
-+ memcpy(context->regs, thread_context.regs, sizeof(context->regs));
-+ context->nip = thread_context.nip;
-+ context->msr = thread_context.msr;
-+ context->ccr = thread_context.ccr;
-+ context->xer = thread_context.xer;
-+ context->lnk = thread_context.lnk;
-+ context->ctr = thread_context.ctr;
-+
-+ memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
-+ context->fpscr = float_context.fpscr;
-+
-+ for (uint8_t i = 0; i < 32; i++) {
-+ context->vregs.save_vr[i] = {
-+ (((uint64_t)vector_context.vrregs[i][0]) << 32) |
-+ vector_context.vrregs[i][1],
-+ (((uint64_t)vector_context.vrregs[i][2]) << 32) |
-+ vector_context.vrregs[i][3]
-+ };
-+ }
-+ context->vregs.save_vrsave = vector_context.vrsave;
-+ context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
-+}
-+
-+
-+#endif
-+
- } // namespace internal
- } // namespace crashpad
-
-diff --git third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-index be22c903..c5df23d1 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-@@ -159,9 +159,11 @@ void TestAgainstTarget(PtraceConnection* connection) {
- const bool is_vdso_mapping =
- device == 0 && inode == 0 && mapping_name == "[vdso]";
- static constexpr char kPrefix[] = "linux-vdso.so.";
-+ static constexpr char kPrefix64[] = "linux-vdso64.so.";
- return is_vdso_mapping ==
- (module_name.empty() ||
-- module_name.compare(0, strlen(kPrefix), kPrefix) == 0);
-+ module_name.compare(0, strlen(kPrefix), kPrefix) == 0 ||
-+ module_name.compare(0, strlen(kPrefix64), kPrefix64) == 0);
- },
- module_mapping->name,
- module_mapping->device,
-diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-index cd40b3b1..6bcf23b6 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
- reader, context_address, context_.mips64);
- }
-
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+
-+template <typename Traits>
-+static bool ReadContext(ProcessReaderLinux* reader,
-+ LinuxVMAddress context_address,
-+ typename Traits::CPUContext* dest_context) {
-+ const ProcessMemory* memory = reader->Memory();
-+
-+ LinuxVMAddress gp_regs_address = context_address +
-+ offsetof(UContext, mcontext) +
-+ offsetof(typename Traits::MContext, gp_regs);
-+
-+ typename Traits::SignalThreadContext thread_context;
-+ if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
-+ LOG(ERROR) << "Couldn't read gp_regs!";
-+ return false;
-+ }
-+
-+ LinuxVMAddress fp_regs_address = context_address +
-+ offsetof(UContext, mcontext) +
-+ offsetof(typename Traits::MContext, fp_regs);
-+
-+ typename Traits::SignalFloatContext fp_context;
-+ if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
-+ LOG(ERROR) << "Couldn't read fp_regs!";
-+ return false;
-+ }
-+
-+ LinuxVMAddress v_regs_ptr_address = context_address +
-+ offsetof(UContext, mcontext) +
-+ offsetof(typename Traits::MContext, vmx_reserve) + 8;
-+
-+ typename Traits::SignalVectorContext v_context;
-+ if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
-+ LOG(ERROR) << "Couldn't read v_regs!";
-+ return false;
-+ }
-+
-+ InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
-+ v_context, dest_context);
-+
-+ return true;
-+}
-+
-+template<>
-+bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
-+ ProcessReaderLinux* reader,
-+ LinuxVMAddress context_address) {
-+ context_.architecture = kCPUArchitecturePPC64;
-+ context_.ppc64 = &context_union_.ppc64;
-+
-+ return internal::ReadContext<ContextTraits64>(
-+ reader, context_address, context_.ppc64);
-+}
-+
-+template<>
-+bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
-+ ProcessReaderLinux* reader,
-+ LinuxVMAddress context_address) {
-+ // PPC64 is 64-bit
-+ return false;
-+}
-+
- #endif // ARCH_CPU_X86_FAMILY
-
- bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
-diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-index ea0cd210..e42df520 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- CPUContextMIPS mipsel;
- CPUContextMIPS64 mips64;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ CPUContextPPC64 ppc64;
- #endif
- } context_union_;
- CPUContext context_;
-diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-index e4ff1ab7..25534dd0 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
- 0);
- #undef CPU_ARCH_NAME
- }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+using NativeCPUContext = ucontext_t;
-+
-+void InitializeContext(NativeCPUContext* context) {
-+ for (size_t reg = 0; reg < 32; ++reg) {
-+ context->uc_mcontext.gp_regs[reg] = reg;
-+ }
-+
-+ memset(&context->uc_mcontext.fp_regs, 44,
-+ sizeof(context->uc_mcontext.fp_regs));
-+}
-
-+void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
-+ EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
-+
-+ for (size_t reg = 0; reg < 32; ++reg) {
-+ EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
-+ }
-+
-+ EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
-+ sizeof(actual.ppc64->fpregs)), 0);
-+}
- #else
- #error Port.
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-index b96abfe7..df12ca56 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
- : thread_info.thread_context.t32.regs[29];
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ stack_pointer = thread_info.thread_context.t64.gpr[1];
- #else
- #error Port.
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-index 5b572361..049c3285 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-@@ -612,6 +612,8 @@ bool WriteTestModule(const base::FilePath& module_path) {
- module.ehdr.e_machine = EM_AARCH64;
- #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
- module.ehdr.e_machine = EM_MIPS;
-+#elif defined(ARCH_CPU_PPC64)
-+ module.ehdr.e_machine = EM_PPC64;
- #endif
-
- module.ehdr.e_version = EV_CURRENT;
-diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index 11002468..8e335a09 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -422,6 +422,89 @@ static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
- "context offset mismatch");
- #endif
-
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+
-+struct SignalThreadContext64 {
-+ uint64_t regs[32];
-+ uint64_t nip;
-+ uint64_t msr;
-+ uint64_t orig_r3;
-+ uint64_t ctr;
-+ uint64_t lnk;
-+ uint64_t xer;
-+ uint64_t ccr;
-+ uint64_t softe;
-+ uint64_t trap;
-+ uint64_t dar;
-+ uint64_t dsisr;
-+ uint64_t result;
-+ uint64_t dscr;
-+ uint64_t fpr0[3];
-+};
-+
-+struct SignalFloatContext64 {
-+ double regs[32];
-+ double fpscr;
-+};
-+
-+struct SignalVectorContext64 {
-+ int32_t vrregs[32][4];
-+ struct {
-+ int32_t __pad[3];
-+ int32_t vscr_word;
-+ } vscr;
-+ int32_t vrsave;
-+ int32_t __pad[3];
-+} __attribute__((__aligned__(16)));
-+
-+
-+#pragma pack(pop)
-+struct MContext64 {
-+ uint64_t reserved[4];
-+ int32_t signal;
-+ int32_t __pad0;
-+ uint64_t handler;
-+ uint64_t oldmask;
-+ uint64_t pt_regs_ptr;
-+ SignalThreadContext64 gp_regs;
-+ SignalFloatContext64 fp_regs;
-+ SignalVectorContext64 *v_regs;
-+ int64_t vmx_reserve[69];
-+};
-+
-+struct ContextTraits64 : public Traits64 {
-+ using MContext = MContext64;
-+ using SignalThreadContext = SignalThreadContext64;
-+ using SignalFloatContext = SignalFloatContext64;
-+ using SignalVectorContext = SignalVectorContext64;
-+ using CPUContext = CPUContextPPC64;
-+};
-+
-+struct ContextTraits32 : public Traits32 {};
-+
-+struct UContext {
-+ uint64_t flags;
-+ uint64_t link;
-+ SignalStack<ContextTraits64> stack;
-+ Sigset<ContextTraits64> sigmask;
-+ MContext64 mcontext;
-+};
-+#pragma pack(push, 1)
-+
-+static_assert(sizeof(UContext) == sizeof(ucontext_t),
-+ "ucontext_t size mismatch");
-+static_assert(sizeof(MContext64) == sizeof(mcontext_t),
-+ "mcontext_t size mismatch");
-+static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
-+ "gregset_t size mismatch");
-+static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
-+ "fpregset_t size mismatch");
-+static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
-+ "vrregset_t size mismatch");
-+static_assert(offsetof(UContext, mcontext) ==
-+ offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
-+static_assert(offsetof(MContext64, gp_regs) ==
-+ offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-diff --git third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-index 8564d3d4..b690ecd4 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-@@ -203,6 +203,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
- : kCPUArchitectureMIPSEL;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ return kCPUArchitecturePPC64;
- #else
- #error port to your architecture
- #endif
-@@ -218,6 +220,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // Not implementable on MIPS
- return 0;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Not yet implemented on PPC64
-+ return 0;
- #else
- #error port to your architecture
- #endif
-@@ -238,6 +243,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // Not implementable on MIPS
- return std::string();
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Not yet implemented on PPC64
-+ return std::string();
- #else
- #error port to your architecture
- #endif
-@@ -371,6 +379,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // Not implementable on MIPS
- return false;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Not yet implemented on PPC64
-+ return false;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-index e3e2bebd..8ef43752 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
- thread.thread_info.float_context.f32,
- context_.mipsel);
- }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ context_.architecture = kCPUArchitecturePPC64;
-+ context_.ppc64 = &context_union_.ppc64;
-+ InitializeCPUContextPPC64<ContextTraits64>(
-+ thread.thread_info.thread_context.t64,
-+ thread.thread_info.float_context.f64,
-+ thread.thread_info.vector_context.v64,
-+ context_.ppc64);
- #else
- #error Port.
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-index 44cc6f6d..d4136461 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- CPUContextMIPS mipsel;
- CPUContextMIPS64 mips64;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ CPUContextPPC64 ppc64;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-diff --git third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-index d3d5ebdf..3fd730cb 100644
---- a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-+++ b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnection* connection) {
- if (type == AT_IGNORE) {
- continue;
- }
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+ if (type == AT_IGNOREPPC) {
-+ continue;
-+ }
-+#endif
- if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
- LOG(ERROR) << "duplicate auxv entry";
- return false;
-diff --git third_party/crashpad/crashpad/util/linux/ptrace_broker.cc third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-index 155a1e0c..5e50ceb5 100644
---- a/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-@@ -94,8 +94,8 @@ int PtraceBroker::Run() {
- }
-
- bool PtraceBroker::AllocateAttachments() {
-- constexpr size_t page_size = 4096;
-- constexpr size_t alloc_size =
-+ static size_t page_size = getpagesize();
-+ size_t alloc_size =
- (sizeof(ScopedPtraceAttach) + page_size - 1) & ~(page_size - 1);
- void* alloc = sbrk(alloc_size);
- if (reinterpret_cast<intptr_t>(alloc) == -1) {
-diff --git third_party/crashpad/crashpad/util/linux/ptracer.cc third_party/crashpad/crashpad/util/linux/ptracer.cc
-index 557e0d36..08ae434b 100644
---- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -398,6 +398,64 @@ bool GetThreadArea64(pid_t tid,
- return true;
- }
-
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
-+// That means we can simply use PTRACE_GETREGESET.
-+
-+template <typename Destination>
-+bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
-+ iovec iov;
-+ iov.iov_base = reinterpret_cast<void*>(dest);
-+ iov.iov_len = sizeof(*dest);
-+ if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
-+ PLOG_IF(ERROR, can_log) << "ptrace";
-+ return false;
-+ }
-+ if (iov.iov_len != sizeof(*dest)) {
-+ LOG_IF(ERROR, can_log) << "Unexpected registers size";
-+ return false;
-+ }
-+ return true;
-+}
-+
-+bool GetVectorRegisters64(pid_t tid,
-+ VectorContext* context,
-+ bool can_log) {
-+ return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
-+}
-+
-+bool GetFloatingPointRegisters64(pid_t tid,
-+ FloatContext* context,
-+ bool can_log) {
-+ return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
-+}
-+
-+bool GetThreadArea64(pid_t tid,
-+ const ThreadContext& context,
-+ LinuxVMAddress* address,
-+ bool can_log) {
-+ // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
-+ // is stored in GPR 13.
-+ ThreadContext::t64_t tc;
-+ if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
-+ LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
-+ return false;
-+ }
-+
-+ *address = tc.gpr[13];
-+
-+ return true;
-+}
-+
-+// Stubs for 32-bit functions not applicable on PPC64
-+bool GetFloatingPointRegisters32(pid_t tid,
-+ FloatContext* context,
-+ bool can_log) { return false; }
-+bool GetThreadArea32(pid_t tid,
-+ const ThreadContext &context,
-+ LinuxVMAddress *address,
-+ bool can_log) { return false; }
-+
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -494,6 +552,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) {
- if (is_64_bit_) {
- return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
- GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+ GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
-+#endif
- GetThreadArea64(tid,
- info->thread_context,
- &info->thread_specific_data_address,
-diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
-index 5b55c24a..dea0d1f3 100644
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -28,6 +28,10 @@
- #include <android/api-level.h>
- #endif
-
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+#include <sys/ucontext.h>
-+#endif
-+
- namespace crashpad {
-
- //! \brief The set of general purpose registers for an architecture family.
-@@ -79,6 +83,8 @@ union ThreadContext {
- uint32_t cp0_status;
- uint32_t cp0_cause;
- uint32_t padding1_;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // PPC64 is 64-bit
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -132,6 +138,21 @@ union ThreadContext {
- uint64_t cp0_badvaddr;
- uint64_t cp0_status;
- uint64_t cp0_cause;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Reflects struct pt_regs in asm/ptrace.h.
-+ uint64_t gpr[32];
-+ uint64_t nip;
-+ uint64_t msr;
-+ uint64_t orig_gpr3;
-+ uint64_t ctr;
-+ uint64_t lnk;
-+ uint64_t xer;
-+ uint64_t ccr;
-+ uint64_t softe;
-+ uint64_t trap;
-+ uint64_t dar;
-+ uint64_t dsisr;
-+ uint64_t result;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -143,6 +164,8 @@ union ThreadContext {
- using NativeThreadContext = user_regs;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // No appropriate NativeThreadsContext type available for MIPS
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ using NativeThreadContext = struct pt_regs;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
-@@ -218,6 +241,9 @@ union FloatContext {
- } fpregs[32];
- uint32_t fpcsr;
- uint32_t fpu_id;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Crashpad's PPC support is 64-bit only, so this
-+ // 32bit-only struct is declared as empty.
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -252,6 +278,10 @@ union FloatContext {
- double fpregs[32];
- uint32_t fpcsr;
- uint32_t fpu_id;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Reflects fpregset_t in sys/ucontext.h
-+ double fpregs[32];
-+ double fpscr;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -280,6 +310,8 @@ union FloatContext {
- static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // No appropriate floating point context native type for available MIPS.
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
- #else
- #error Port.
- #endif // ARCH_CPU_X86
-@@ -287,6 +319,26 @@ union FloatContext {
- static_assert(std::is_standard_layout<FloatContext>::value,
- "Not standard layout");
-
-+//! \brief The vector registers used for an architecture family
-+union VectorContext {
-+ struct v32_t {} v32;
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+ __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
-+#endif
-+ struct v64_t {
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+ // Reflects vrregset_t in sys/ucontext.h
-+ uint32_t vrregs[32][4];
-+ struct {
-+ uint32_t __pad[3];
-+ uint32_t vscr_word;
-+ } vscr;
-+ uint32_t vrsave;
-+ uint32_t __pad[3];
-+#endif
-+ } v64;
-+};
-+
- //! \brief A collection of `ptrace`-able information about a thread.
- struct ThreadInfo {
- ThreadInfo();
-@@ -298,6 +350,9 @@ struct ThreadInfo {
- //! \brief The floating point registers for the thread.
- FloatContext float_context;
-
-+ //! \brief (Optional) The vector registers used for the thread.
-+ VectorContext vector_context;
-+
- //! \brief The thread-local storage address for the thread.
- LinuxVMAddress thread_specific_data_address;
- };
-diff --git third_party/crashpad/crashpad/util/misc/capture_context.h third_party/crashpad/crashpad/util/misc/capture_context.h
-index 3ff71184..3e82f4b9 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context.h
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context.h
-@@ -68,6 +68,7 @@ using NativeCPUContext = ucontext_t;
- //! macOS/Linux/Fuchsia | x86_64 | `%%rdi`
- //! Linux | ARM/ARM64 | `r0`/`x0`
- //! Linux | MIPS/MIPS64 | `$a0`
-+//! Linux | PPC64 | `r3`
- //!
- //! Additionally, the value `LR` on ARM/ARM64 will be the return address of
- //! this function.
-diff --git third_party/crashpad/crashpad/util/misc/capture_context_linux.S third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-index 52215ee5..b3e4a3ec 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-@@ -32,7 +32,7 @@
- .balign 4, 0x0
- .type CAPTURECONTEXT_SYMBOL, %function
- .type CAPTURECONTEXT_SYMBOL2, %function
--#elif defined(__mips__)
-+#elif defined(__mips__) || defined(__powerpc64__)
- .balign 4, 0x0
- #endif
-
-@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
- jr $ra
-
- .set at
-+#elif defined(__powerpc64__)
-+ // Store r0-r31
-+ std 0, 0xe8(3) // context->uc_mcontext.gp_regs[0]
-+ std 1, 0xf0(3) // context->uc_mcontext.gp_regs[1]
-+ std 2, 0xf8(3) // context->uc_mcontext.gp_regs[2]
-+ // note that r3's original value was lost
-+ std 3, 0x100(3) // context->uc_mcontext.gp_regs[3]
-+ std 4, 0x108(3) // context->uc_mcontext.gp_regs[4]
-+ std 5, 0x110(3) // context->uc_mcontext.gp_regs[5]
-+ std 6, 0x118(3) // context->uc_mcontext.gp_regs[6]
-+ std 7, 0x120(3) // context->uc_mcontext.gp_regs[7]
-+ std 8, 0x128(3) // context->uc_mcontext.gp_regs[8]
-+ std 9, 0x130(3) // context->uc_mcontext.gp_regs[9]
-+ std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
-+ std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
-+ std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
-+ std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
-+ std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
-+ std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
-+ std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
-+ std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
-+ std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
-+ std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
-+ std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
-+ std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
-+ std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
-+ std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
-+ std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
-+ std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
-+ std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
-+ std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
-+ std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
-+ std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
-+ std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
-+ std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
-+
-+ // For NIP, we can use the value in the link register
-+ mflr 0
-+ std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
-+
-+ // CTR
-+ mfctr 0
-+ std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
-+
-+ // For LNK, we'll use the caller's LR save area (2 stack frames up).
-+ // r4 can be used as a scratch register since it has already been saved.
-+ ld 4, 0(1)
-+ ld 4, 16(4)
-+ std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
-+
-+ // XER
-+ mfxer 0
-+ std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
-+
-+ // CCR
-+ mfcr 0
-+ std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
-+
-+ // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
-+ // not used or not relevant, zero them out.
-+ li 4, 0
-+ std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
-+ std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
-+ std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
-+ std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
-+ std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
-+ std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
-+ std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
-+ std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
-+
-+ // Update context->uc_mcontext.regs to point to gp_regs
-+ addi 0, 3, 0xe8
-+ std 0, 0xe0(3)
-+
-+ // Save floating point registers 0-31
-+ stfd 0, 0x268(3) // context->uc_mcontext.fp_regs[0]
-+ stfd 1, 0x270(3) // context->uc_mcontext.fp_regs[1]
-+ stfd 2, 0x278(3) // context->uc_mcontext.fp_regs[2]
-+ stfd 3, 0x280(3) // context->uc_mcontext.fp_regs[3]
-+ stfd 4, 0x288(3) // context->uc_mcontext.fp_regs[4]
-+ stfd 5, 0x290(3) // context->uc_mcontext.fp_regs[5]
-+ stfd 6, 0x298(3) // context->uc_mcontext.fp_regs[6]
-+ stfd 7, 0x2a0(3) // context->uc_mcontext.fp_regs[7]
-+ stfd 8, 0x2a8(3) // context->uc_mcontext.fp_regs[8]
-+ stfd 9, 0x2b0(3) // context->uc_mcontext.fp_regs[9]
-+ stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
-+ stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
-+ stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
-+ stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
-+ stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
-+ stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
-+ stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
-+ stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
-+ stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
-+ stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
-+ stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
-+ stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
-+ stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
-+ stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
-+ stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
-+ stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
-+ stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
-+ stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
-+ stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
-+ stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
-+ stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
-+ stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
-+
-+ // FPSCR
-+ mffs 0
-+ stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
-+
-+ // Save VMX Vector registers
-+ // Update r4 to contain the base address of vmx_reserve
-+ addi 4, 3, 0x378
-+ // Ensure that it is quadword aligned
-+ andi. 5, 4, 0xF
-+ beq 1f // No alignment is necessary
-+ // Address is doubleword aligned and not quadword aligned, add 8
-+ addi 4, 4, 8
-+
-+1:
-+ // Store VMX registers 0-31
-+ // r4 will contain the base address
-+ // r5 will contain the index
-+ li 5, 0
-+ stvx 0, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 0]
-+ addi 5, 5, 16
-+ stvx 1, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 1]
-+ addi 5, 5, 16
-+ stvx 2, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 2]
-+ addi 5, 5, 16
-+ stvx 3, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 3]
-+ addi 5, 5, 16
-+ stvx 4, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 4]
-+ addi 5, 5, 16
-+ stvx 5, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 5]
-+ addi 5, 5, 16
-+ stvx 6, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 6]
-+ addi 5, 5, 16
-+ stvx 7, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 7]
-+ addi 5, 5, 16
-+ stvx 8, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 8]
-+ addi 5, 5, 16
-+ stvx 9, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 9]
-+ addi 5, 5, 16
-+ stvx 10, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 10]
-+ addi 5, 5, 16
-+ stvx 11, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 11]
-+ addi 5, 5, 16
-+ stvx 12, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 12]
-+ addi 5, 5, 16
-+ stvx 13, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 13]
-+ addi 5, 5, 16
-+ stvx 14, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 14]
-+ addi 5, 5, 16
-+ stvx 15, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 15]
-+ addi 5, 5, 16
-+ stvx 16, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 16]
-+ addi 5, 5, 16
-+ stvx 17, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 17]
-+ addi 5, 5, 16
-+ stvx 18, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 18]
-+ addi 5, 5, 16
-+ stvx 19, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 19]
-+ addi 5, 5, 16
-+ stvx 20, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 20]
-+ addi 5, 5, 16
-+ stvx 21, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 21]
-+ addi 5, 5, 16
-+ stvx 22, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 22]
-+ addi 5, 5, 16
-+ stvx 23, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 23]
-+ addi 5, 5, 16
-+ stvx 24, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 24]
-+ addi 5, 5, 16
-+ stvx 25, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 25]
-+ addi 5, 5, 16
-+ stvx 26, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 26]
-+ addi 5, 5, 16
-+ stvx 27, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 27]
-+ addi 5, 5, 16
-+ stvx 28, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 28]
-+ addi 5, 5, 16
-+ stvx 29, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 29]
-+ addi 5, 5, 16
-+ stvx 30, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 30]
-+ addi 5, 5, 16
-+ stvx 31, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 31]
-+ addi 5, 5, 16
-+
-+ // VSCR
-+ mfvscr 0
-+ stvx 0, 4, 5
-+ addi 5, 5, 16
-+
-+ // VRSAVE
-+ mfvrsave 0
-+ stwx 0, 4, 5
-+
-+ // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
-+ std 4, 0x370(3)
-+
-+ // Zero out all unused fields
-+ li 4, 0
-+ std 4, 0xc8(3) // context->uc_mcontext.signal
-+ std 4, 0xd0(3) // context->uc_mcontext.handler
-+ std 4, 0xd8(3) // context->uc_mcontext.oldmask
-+
-+ blr
- #endif // __i386__
-diff --git third_party/crashpad/crashpad/util/misc/capture_context_test.cc third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-index cf23c2de..5f264bc9 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-@@ -57,7 +57,7 @@ void TestCaptureContext() {
- uintptr_t pc = ProgramCounterFromContext(context_1);
-
- #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
-- !defined(MEMORY_SANITIZER)
-+ !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
- // Sanitizers can cause enough code bloat that the “nearby” check would
- // likely fail.
- const uintptr_t kReferencePC =
-diff --git third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-index 9fc5db28..5f69f8dc 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-@@ -36,6 +36,8 @@ void SanityCheckContext(const NativeCPUContext& context) {
- EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
- #endif
- }
-
-@@ -50,6 +52,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
- return context.uc_mcontext.pc;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- return context.uc_mcontext.pc;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ return context.uc_mcontext.gp_regs[PT_NIP];
- #endif
- }
-
-@@ -64,6 +68,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
- return context.uc_mcontext.sp;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- return context.uc_mcontext.gregs[29];
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ return context.uc_mcontext.gp_regs[1];
- #endif
- }
-
-diff --git third_party/crashpad/crashpad/util/posix/signals_test.cc third_party/crashpad/crashpad/util/posix/signals_test.cc
-index 58bfa8f8..8fc37c46 100644
---- a/third_party/crashpad/crashpad/util/posix/signals_test.cc
-+++ b/third_party/crashpad/crashpad/util/posix/signals_test.cc
-@@ -46,12 +46,12 @@ bool CanCauseSignal(int sig) {
- return sig == SIGABRT ||
- sig == SIGALRM ||
- sig == SIGBUS ||
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- sig == SIGFPE ||
--#endif // !defined(ARCH_CPU_ARM64)
-+#endif // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
- sig == SIGILL ||
--#endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL
-+#endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
- sig == SIGPIPE ||
- sig == SIGSEGV ||
- #if defined(OS_MACOSX)
-@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
- break;
- }
-
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- // ARM64 has hardware integer division instructions that don’t generate a
- // trap for divide-by-zero, so this doesn’t produce SIGFPE.
-+ //
-+ // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
- case SIGFPE: {
- // Optimization makes this tricky, so get zero from a system call likely
- // to succeed, and try to do something with the result.
-@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
- fstat(quotient, &stat_buf);
- break;
- }
--#endif // ARCH_CPU_ARM64
-+#endif // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
-
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
- case SIGILL: {
-diff --git third_party/dav1d/BUILD.gn third_party/dav1d/BUILD.gn
-index 788dc6cf..5fd7e8fd 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -182,6 +182,8 @@ static_library("dav1d_8bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -210,6 +212,8 @@ static_library("dav1d_10bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -256,6 +260,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
- ":dav1d_config",
- ]
-
-+ cflags = dav1d_copts
-+ }
-+} else if (current_cpu == "ppc64") {
-+ static_library("dav1d_ppc") {
-+ sources = [
-+ "libdav1d/src/ppc/cpu.c",
-+ "libdav1d/src/ppc/cpu.h",
-+ ]
-+
-+ configs -= [ "//build/config/compiler:chromium_code" ]
-+ configs += [
-+ "//build/config/compiler:no_chromium_code",
-+ ":dav1d_config",
-+ ]
-+
- cflags = dav1d_copts
- }
- }
-@@ -285,5 +304,7 @@ static_library("dav1d") {
- }
- } else if (current_cpu == "arm" || current_cpu == "arm64") {
- deps += [ ":dav1d_arm" ]
-+ } else if (current_cpu == "ppc64") {
-+ deps += [ ":dav1d_ppc" ]
- }
- }
-diff --git third_party/dav1d/config/linux/ppc64/config.h third_party/dav1d/config/linux/ppc64/config.h
-new file mode 100644
-index 00000000..f6ca57f7
---- /dev/null
-+++ b/third_party/dav1d/config/linux/ppc64/config.h
-@@ -0,0 +1,35 @@
-+/*
-+ * Autogenerated by the Meson build system.
-+ * Do not edit, your changes will be lost.
-+ */
-+
-+#pragma once
-+
-+#define ARCH_AARCH64 0
-+
-+#define ARCH_ARM 0
-+
-+#define ARCH_PPC64LE 1
-+
-+#define ARCH_X86 0
-+
-+#define ARCH_X86_32 0
-+
-+#define ARCH_X86_64 0
-+
-+#define CONFIG_16BPC 1
-+
-+#define CONFIG_8BPC 1
-+
-+#define CONFIG_LOG 1
-+
-+#define ENDIANNESS_BIG 0
-+
-+#define HAVE_ASM 1
-+
-+#define HAVE_GETAUXVAL 1
-+
-+#define HAVE_POSIX_MEMALIGN 1
-+
-+#define HAVE_UNISTD_H 1
-+
-diff --git third_party/dav1d/dav1d_generated.gni third_party/dav1d/dav1d_generated.gni
-index 8becac02..d5f4fcac 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -71,6 +71,11 @@ arm_template_sources = [
- "libdav1d/src/arm/mc_init_tmpl.c",
- ]
-
-+ppc64_template_sources = [
-+ "libdav1d/src/ppc/cdef_init_tmpl.c",
-+ "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
- "libdav1d/src/cdef_apply_tmpl.c",
- "libdav1d/src/cdef_tmpl.c",
-diff --git third_party/dav1d/generate_source.py third_party/dav1d/generate_source.py
-index 9ab5e00b..ad3feffe 100755
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -50,7 +50,8 @@ def WriteGn(fd):
- WriteArray(fd, "arm32_asm_sources", glob.glob("libdav1d/src/arm/32/*.S"))
- WriteArray(fd, "arm64_asm_sources", glob.glob("libdav1d/src/arm/64/*.S"))
- WriteArray(fd, "arm_template_sources", glob.glob("libdav1d/src/arm/*_tmpl.c"))
--
-+ WriteArray(fd, "ppc64_template_sources", glob.glob("libdav1d/src/ppc/*_tmpl.c"))
-+
- template_sources = glob.glob("libdav1d/src/*_tmpl.c")
- WriteArray(fd, "template_sources", template_sources)
-
-diff --git third_party/dav1d/libdav1d/src/ppc/types.h third_party/dav1d/libdav1d/src/ppc/types.h
-index 0b4bd72f..a0caa5e7 100644
---- a/third_party/dav1d/libdav1d/src/ppc/types.h
-+++ b/third_party/dav1d/libdav1d/src/ppc/types.h
-@@ -51,4 +51,19 @@
- #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
- #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
-
-+#if defined(__clang__)
-+#undef vec_splats
-+#define vec_splats(N) \
-+ _Generic((N), \
-+ unsigned char: ((u8x16)(N)), \
-+ signed char: ((i8x16)(N)), \
-+ unsigned short: ((u16x8)(N)), \
-+ signed short: ((i16x8)(N)), \
-+ unsigned int: ((u32x4)(N)), \
-+ signed int: ((i32x4)(N)), \
-+ unsigned long long: ((u64x2)(N)), \
-+ signed long long: ((i64x2)(N)) \
-+ )
-+#endif
-+
- #endif /* DAV1D_SRC_PPC_TYPES_H */
-diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
-index 31a26e5b44..84c15b61b8 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -38,6 +38,8 @@ if (current_cpu == "x86") {
-
- if (is_nacl) {
- platform_include_dir = "source/config/nacl"
-+} else if (current_cpu == "ppc64") {
-+ platform_include_dir = "source/config/linux/generic"
- } else {
- # The mac configurations are currently a relic. They were useful when
- # x86inc.asm did not work for MACH_O but now the build is identical to the
-@@ -336,6 +336,8 @@ static_library("libvpx") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_generic
- }
-
- configs -= [ "//build/config/compiler:chromium_code" ]
-@@ -401,6 +403,8 @@ static_library("libvp9rc") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_generic
- }
- sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.cc" ]
- sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.h" ]
-diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
-index d2baee9d..9955ce44 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -3922,7 +3922,7 @@ struct kernel_statfs {
- LSS_REG(2, buf);
- LSS_BODY(void*, mmap2, "0"(__r2));
- }
--#else
-+#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
- #define __NR__mmap2 __NR_mmap2
- LSS_INLINE _syscall6(void*, _mmap2, void*, s,
- size_t, l, int, p,
-@@ -4033,7 +4033,7 @@ struct kernel_statfs {
- #if defined(__i386__) || \
- defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
- (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \
-- defined(__PPC__) || \
-+ (defined(__PPC__) && !defined(__powerpc64__)) || \
- (defined(__s390__) && !defined(__s390x__))
- /* On these architectures, implement mmap() with mmap2(). */
- LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
-diff --git third_party/pffft/src/pffft.c third_party/pffft/src/pffft.c
-index bdac4d784..51e0f2cac 100644
---- a/third_party/pffft/src/pffft.c
-+++ b/third_party/pffft/src/pffft.c
-@@ -100,6 +100,7 @@
- Altivec support macros
- */
- #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
-+#include <altivec.h>
- typedef vector float v4sf;
- # define SIMD_SZ 4
- # define VZERO() ((vector float) vec_splat_u8(0))
-diff --git third_party/skia/src/sksl/SkSLString.cpp third_party/skia/src/sksl/SkSLString.cpp
-index 88eb1c7d..4be33fa5 100644
---- a/third_party/skia/src/sksl/SkSLString.cpp
-+++ b/third_party/skia/src/sksl/SkSLString.cpp
-@@ -240,7 +240,12 @@ String to_string(double value) {
- if (needsDotZero) {
- buffer << ".0";
- }
-- return String(buffer.str().c_str());
-+
-+ std::string ret(buffer.str());
-+ if (signbit(value) && ret[0] == '.') {
-+ ret[0] = '-';
-+ }
-+ return String(ret.c_str());
- }
-
- SKSL_INT stoi(const String& s) {
-diff --git third_party/sqlite/src/amalgamation/sqlite3.c third_party/sqlite/src/amalgamation/sqlite3.c
-index 1b2c2ec7..7593dba1 100644
---- a/third_party/sqlite/src/amalgamation/sqlite3.c
-+++ b/third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14400,7 +14400,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
-+ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
- # elif defined(sparc) || defined(__ppc__) || \
- defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git third_party/sqlite/src/amalgamation_dev/sqlite3.c third_party/sqlite/src/amalgamation_dev/sqlite3.c
-index 19c87689..c7ab039e 100644
---- a/third_party/sqlite/src/amalgamation_dev/sqlite3.c
-+++ b/third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14413,7 +14413,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
-+ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
- # elif defined(sparc) || defined(__ppc__) || \
- defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git third_party/sqlite/src/ext/rtree/rtree.c third_party/sqlite/src/ext/rtree/rtree.c
-index efaef813..4cd57d55 100644
---- a/third_party/sqlite/src/ext/rtree/rtree.c
-+++ b/third_party/sqlite/src/ext/rtree/rtree.c
-@@ -432,7 +432,7 @@ struct RtreeMatchArg {
- #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__arm__)
-+ defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
- #elif defined(sparc) || defined(__ppc__)
- # define SQLITE_BYTEORDER 4321
-diff --git third_party/sqlite/src/src/sqliteInt.h third_party/sqlite/src/src/sqliteInt.h
-index 122e26ad..ec21dcb5 100644
---- a/third_party/sqlite/src/src/sqliteInt.h
-+++ b/third_party/sqlite/src/src/sqliteInt.h
-@@ -868,7 +868,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
-+ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
- # elif defined(sparc) || defined(__ppc__) || \
- defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git third_party/webrtc/modules/desktop_capture/differ_block.cc third_party/webrtc/modules/desktop_capture/differ_block.cc
-index dd9ab457..c005d959 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
-
- if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
-- // For ARM and MIPS processors, always use C version.
-- // TODO(hclam): Implement a NEON version.
-- diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = WebRtc_GetCPUInfo(kSSE2) != 0;
- // For x86 processors, check if SSE2 is supported.
- if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- } else {
- diff_proc = &VectorDifference_C;
- }
-+#else
-+ // For other processors, always use C version.
-+ // TODO(hclam): Implement a NEON version.
-+ diff_proc = &VectorDifference_C;
- #endif
- }
-
-diff --git third_party/webrtc/rtc_base/system/arch.h third_party/webrtc/rtc_base/system/arch.h
-index ed216e66..25d36c07 100644
---- a/third_party/webrtc/rtc_base/system/arch.h
-+++ b/third_party/webrtc/rtc_base/system/arch.h
-@@ -50,6 +50,18 @@
- #elif defined(__EMSCRIPTEN__)
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__PPC__)
-+#define WEBRTC_ARCH_PPC_FAMILY
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#else
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#endif
-+#if defined(__LP64__)
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
- #else
- #error Please add support for your architecture in rtc_base/system/arch.h
- #endif
- diff --git v8/BUILD.gn v8/BUILD.gn
-index 167e63503..125c445ea 100644
---- a/v8/BUILD.gn
-+++ b/v8/BUILD.gn
-@@ -696,6 +696,12 @@ config("toolchain") {
- }
- if (host_byteorder == "little") {
- defines += [ "V8_TARGET_ARCH_PPC_LE" ]
-+ cflags += [
-+ # Enable usage of AltiVec, VSX, and other POWER8 and higher features
-+ "-mcpu=power8",
-+ "-maltivec",
-+ "-mvsx",
-+ ]
- } else if (host_byteorder == "big") {
- defines += [ "V8_TARGET_ARCH_PPC_BE" ]
- if (current_os == "aix") {
-diff --git ui/gl/features.gni ui/gl/features.gni
-index cb2c98649..5e09bc1f7 100644
---- a/ui/gl/features.gni
-+++ b/ui/gl/features.gni
-@@ -25,5 +25,6 @@ declare_args() {
- is_chromeos || is_fuchsia) &&
- (target_cpu == "x86" || target_cpu == "x64" ||
- target_cpu == "arm" || target_cpu == "arm64" ||
-- target_cpu == "mipsel" || target_cpu == "mips64el")
-+ target_cpu == "mipsel" || target_cpu == "mips64el" ||
-+ target_cpu == "ppc64")
- }
-diff --git v8/test/BUILD.gn v8/test/BUILD.gn
-index f6d30537a..287b27080 100644
---- a/v8/test/BUILD.gn
-+++ b/v8/test/BUILD.gn
-@@ -31,7 +31,7 @@ group("gn_all") {
- deps += [
- "cctest:cctest",
- "cctest:generate-bytecode-expectations",
-- "unittests:unittests",
-+ #"unittests:unittests",
- ]
- }
- }
-@@ -73,7 +73,7 @@ group("v8_bot_default") {
- "message:v8_message",
- "mjsunit:v8_mjsunit",
- "mkgrokdump:mkgrokdump",
-- "unittests:unittests",
-+ #"unittests:unittests",
- "wasm-api-tests:wasm_api_tests",
- "wasm-js:v8_wasm_js",
- "wasm-spec-tests:v8_wasm_spec_tests",
-@@ -93,7 +93,7 @@ group("v8_default") {
- "message:v8_message",
- "mjsunit:v8_mjsunit",
- "mkgrokdump:mkgrokdump",
-- "unittests:unittests",
-+ #"unittests:unittests",
- "wasm-api-tests:wasm_api_tests",
- "wasm-js:v8_wasm_js",
- "wasm-spec-tests:v8_wasm_spec_tests",
diff --git a/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-swiftshader.patch b/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-swiftshader.patch
deleted file mode 100644
index df453f491d8c..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-swiftshader.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
-+++ b/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
-@@ -574,6 +574,7 @@ swiftshader_llvm_source_set("swiftshader
- "llvm/lib/MC/MCAsmInfoCOFF.cpp",
- "llvm/lib/MC/MCAsmInfoDarwin.cpp",
- "llvm/lib/MC/MCAsmInfoELF.cpp",
-+ "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
- "llvm/lib/MC/MCAsmMacro.cpp",
- "llvm/lib/MC/MCAsmStreamer.cpp",
- "llvm/lib/MC/MCAssembler.cpp",
-@@ -629,6 +630,7 @@ swiftshader_llvm_source_set("swiftshader
- "llvm/lib/MC/MCWinCOFFStreamer.cpp",
- "llvm/lib/MC/MCWinEH.cpp",
- "llvm/lib/MC/MCXCOFFStreamer.cpp",
-+ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
- "llvm/lib/MC/MachObjectWriter.cpp",
- "llvm/lib/MC/StringTableBuilder.cpp",
- "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/electron10/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch b/srcpkgs/electron10/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
deleted file mode 100644
index 916dba9dc3bc..000000000000
--- a/srcpkgs/electron10/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ff4122f236b70c272c746d0c336cdbd588d78cd1 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 12 Dec 2019 16:12:18 -0500
-Subject: [PATCH] Add a script to list patch targets
-
----
- script/list_patch_targets.py | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100755 script/list_patch_targets.py
-
-diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py
-new file mode 100755
-index 000000000..55173bac9
---- /dev/null
-+++ b/script/list_patch_targets.py
-@@ -0,0 +1,23 @@
-+#!/usr/bin/env python
-+
-+import argparse
-+import json
-+
-+
-+def parse_args():
-+ parser = argparse.ArgumentParser(description='Apply Electron patches')
-+ parser.add_argument('config', nargs='+',
-+ type=argparse.FileType('r'),
-+ help='patches\' config(s) in the JSON format')
-+ return parser.parse_args()
-+
-+
-+def main():
-+ configs = parse_args().config
-+ for config_json in configs:
-+ for patch_dir, repo in json.load(config_json).iteritems():
-+ print(repo)
-+
-+
-+if __name__ == '__main__':
-+ main()
---
-2.23.0
-
diff --git a/srcpkgs/electron10/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron10/files/patches/electron-Build-fixes.patch.patch
deleted file mode 100644
index 298bfa9bcb2b..000000000000
--- a/srcpkgs/electron10/files/patches/electron-Build-fixes.patch.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/build/args/release.gn b/build/args/release.gn
-index e5017f6e1..59207b389 100644
---- a/build/args/release.gn
-+++ b/build/args/release.gn
-@@ -1,6 +1,4 @@
- import("all.gn")
--is_component_build = false
--is_official_build = true
-
- # This may be guarded behind is_chrome_branded alongside
- # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
-@@ -8,9 +6,3 @@ is_official_build = true
- # The initialization of the decoder depends on whether ffmpeg has
- # been built with H.264 support.
- rtc_use_h264 = proprietary_codecs
--
--# By default, Electron builds ffmpeg with proprietary codecs enabled. In order
--# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or
--# who have an LGPL requirement to ship ffmpeg as a dynamically linked library,
--# we build ffmpeg as a shared library.
--is_component_ffmpeg = true
-diff --git a/build/npm.gni b/build/npm.gni
-index a1987d095..fb33a14c3 100644
---- a/build/npm.gni
-+++ b/build/npm.gni
-@@ -35,7 +35,6 @@ template("npm_action") {
- if (!defined(deps)) {
- deps = []
- }
-- deps += [ ":npm_pre_flight_" + target_name ]
-
- script = "//electron/build/npm-run.py"
- args = [
-diff --git a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-index 0dc9916be..7eaa46bf5 100644
---- a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-+++ b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-@@ -30,7 +30,7 @@
- + # these values being accurate.
- + 'build_v8_with_gn': 'false',
- + 'enable_lto%': 'false',
--+
-++ 'openssl_fips': '',
- 'conditions': [
- ['target_arch=="arm64"', {
- # Disabled pending https://github.com/nodejs/node/issues/23913.
-
diff --git a/srcpkgs/electron10/files/patches/electron-dont-assume-python-is-python2.patch b/srcpkgs/electron10/files/patches/electron-dont-assume-python-is-python2.patch
deleted file mode 100644
index fb134748025b..000000000000
--- a/srcpkgs/electron10/files/patches/electron-dont-assume-python-is-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/build/zip.py.orig 2020-04-27 17:59:53.499281667 +0200
-+++ b/build/zip.py 2020-04-27 17:59:57.655839143 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from __future__ import print_function
- import os
- import subprocess
-
---- a/build/npm-run.py.orig 2020-04-27 17:59:50.829351807 +0200
-+++ b/build/npm-run.py 2020-04-27 18:00:02.702373256 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from __future__ import print_function
- import os
- import subprocess
diff --git a/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
deleted file mode 100644
index 456223644278..000000000000
--- a/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/script/apply_all_patches.py 2020-08-22 17:46:41.796707506 +0200
-+++ - 2020-08-22 17:47:05.887813512 +0200
-@@ -14,6 +14,7 @@
- for patch_dir, repo in dirs.items():
- git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
- threeway=threeway is not None,
-+ exclude=['test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**'],
- committer_name="Electron Scripts", committer_email="scripts@electron")
-
-
diff --git a/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc b/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc
deleted file mode 100644
index 2c7aa8efa66f..000000000000
--- a/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/metrics/histogram_macros.h"
-#include "base/memory/ptr_util.h"
-
-#include "media/audio/openbsd/audio_manager_openbsd.h"
-
-#include "media/audio/audio_device_description.h"
-#include "media/audio/audio_output_dispatcher.h"
-#include "media/audio/sndio/sndio_input.h"
-#include "media/audio/sndio/sndio_output.h"
-#include "media/base/limits.h"
-#include "media/base/media_switches.h"
-
-namespace media {
-
-// Maximum number of output streams that can be open simultaneously.
-static const int kMaxOutputStreams = 4;
-
-// Default sample rate for input and output streams.
-static const int kDefaultSampleRate = 48000;
-
-void AddDefaultDevice(AudioDeviceNames* device_names) {
- DCHECK(device_names->empty());
- device_names->push_front(AudioDeviceName::CreateDefault());
-}
-
-bool AudioManagerOpenBSD::HasAudioOutputDevices() {
- return true;
-}
-
-bool AudioManagerOpenBSD::HasAudioInputDevices() {
- return true;
-}
-
-void AudioManagerOpenBSD::GetAudioInputDeviceNames(
- AudioDeviceNames* device_names) {
- DCHECK(device_names->empty());
- AddDefaultDevice(device_names);
-}
-
-void AudioManagerOpenBSD::GetAudioOutputDeviceNames(
- AudioDeviceNames* device_names) {
- AddDefaultDevice(device_names);
-}
-
-const char* AudioManagerOpenBSD::GetName() {
- return "SNDIO";
-}
-
-AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
- const std::string& device_id) {
- static const int kDefaultInputBufferSize = 1024;
-
- int user_buffer_size = GetUserBufferSize();
- int buffer_size = user_buffer_size ?
- user_buffer_size : kDefaultInputBufferSize;
-
- return AudioParameters(
- AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
- kDefaultSampleRate, buffer_size);
-}
-
-AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
- AudioLogFactory* audio_log_factory)
- : AudioManagerBase(std::move(audio_thread),
- audio_log_factory) {
- DLOG(WARNING) << "AudioManagerOpenBSD";
- SetMaxOutputStreamsAllowed(kMaxOutputStreams);
-}
-
-AudioManagerOpenBSD::~AudioManagerOpenBSD() {
- Shutdown();
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
- const AudioParameters& params,
- const LogCallback& log_callback) {
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
- return MakeOutputStream(params);
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) {
- DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
- return MakeOutputStream(params);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) {
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
- return MakeInputStream(params);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) {
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
- return MakeInputStream(params);
-}
-
-AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
- const std::string& output_device_id,
- const AudioParameters& input_params) {
- // TODO(tommi): Support |output_device_id|.
- DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
- static const int kDefaultOutputBufferSize = 2048;
-
- ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
- int sample_rate = kDefaultSampleRate;
- int buffer_size = kDefaultOutputBufferSize;
- if (input_params.IsValid()) {
- sample_rate = input_params.sample_rate();
- channel_layout = input_params.channel_layout();
- buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
- }
-
- int user_buffer_size = GetUserBufferSize();
- if (user_buffer_size)
- buffer_size = user_buffer_size;
-
- return AudioParameters(
- AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
- sample_rate, buffer_size);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
- const AudioParameters& params) {
- DLOG(WARNING) << "MakeInputStream";
- return new SndioAudioInputStream(this,
- AudioDeviceDescription::kDefaultDeviceId, params);
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
- const AudioParameters& params) {
- DLOG(WARNING) << "MakeOutputStream";
- return new SndioAudioOutputStream(params, this);
-}
-
-} // namespace media
diff --git a/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.h b/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.h
deleted file mode 100644
index 8c99db966d65..000000000000
--- a/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
-#define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
-
-#include <set>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/threading/thread.h"
-#include "media/audio/audio_manager_base.h"
-
-namespace media {
-
-class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
- public:
- AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
- AudioLogFactory* audio_log_factory);
- ~AudioManagerOpenBSD() override;
-
- // Implementation of AudioManager.
- bool HasAudioOutputDevices() override;
- bool HasAudioInputDevices() override;
- void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
- void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
- AudioParameters GetInputStreamParameters(
- const std::string& device_id) override;
- const char* GetName() override;
-
- // Implementation of AudioManagerBase.
- AudioOutputStream* MakeLinearOutputStream(
- const AudioParameters& params,
- const LogCallback& log_callback) override;
- AudioOutputStream* MakeLowLatencyOutputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) override;
- AudioInputStream* MakeLinearInputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) override;
- AudioInputStream* MakeLowLatencyInputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) override;
-
- protected:
- AudioParameters GetPreferredOutputStreamParameters(
- const std::string& output_device_id,
- const AudioParameters& input_params) override;
-
- private:
- // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
- AudioOutputStream* MakeOutputStream(const AudioParameters& params);
- AudioInputStream* MakeInputStream(const AudioParameters& params);
-
- DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
-};
-
-} // namespace media
-
-#endif // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
diff --git a/srcpkgs/electron10/files/sndio-files/sndio_input.cc b/srcpkgs/electron10/files/sndio-files/sndio_input.cc
deleted file mode 100644
index ef5439b49a07..000000000000
--- a/srcpkgs/electron10/files/sndio-files/sndio_input.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/macros.h"
-#include "media/base/audio_timestamp_helper.h"
-#include "media/audio/openbsd/audio_manager_openbsd.h"
-#include "media/audio/audio_manager.h"
-#include "media/audio/sndio/sndio_input.h"
-
-namespace media {
-
-static const SampleFormat kSampleFormat = kSampleFormatS16;
-
-void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
-{
- SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
-
- self->hw_delay += delta;
-}
-
-void *SndioAudioInputStream::ThreadEntry(void *arg) {
- SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
-
- self->ThreadLoop();
- return NULL;
-}
-
-SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
- const std::string& device_name,
- const AudioParameters& params)
- : manager(manager),
- params(params),
- audio_bus(AudioBus::Create(params)),
- state(kClosed) {
-}
-
-SndioAudioInputStream::~SndioAudioInputStream() {
- if (state != kClosed)
- Close();
-}
-
-bool SndioAudioInputStream::Open() {
- struct sio_par par;
- int sig;
-
- if (state != kClosed)
- return false;
-
- if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
- params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
- LOG(WARNING) << "Unsupported audio format.";
- return false;
- }
-
- sio_initpar(&par);
- par.rate = params.sample_rate();
- par.rchan = params.channels();
- par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
- par.bps = par.bits / 8;
- par.sig = sig = par.bits != 8 ? 1 : 0;
- par.le = SIO_LE_NATIVE;
- par.appbufsz = params.frames_per_buffer();
-
- hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
-
- if (hdl == NULL) {
- LOG(ERROR) << "Couldn't open audio device.";
- return false;
- }
-
- if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
- LOG(ERROR) << "Couldn't set audio parameters.";
- goto bad_close;
- }
-
- if (par.rate != (unsigned int)params.sample_rate() ||
- par.rchan != (unsigned int)params.channels() ||
- par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
- par.sig != (unsigned int)sig ||
- (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
- (par.bits != par.bps * 8)) {
- LOG(ERROR) << "Unsupported audio parameters.";
- goto bad_close;
- }
- state = kStopped;
- buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
- sio_onmove(hdl, &OnMoveCallback, this);
- return true;
-bad_close:
- sio_close(hdl);
- return false;
-}
-
-void SndioAudioInputStream::Start(AudioInputCallback* cb) {
-
- StartAgc();
-
- state = kRunning;
- hw_delay = 0;
- callback = cb;
- sio_start(hdl);
- if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
- LOG(ERROR) << "Failed to create real-time thread for recording.";
- sio_stop(hdl);
- state = kStopped;
- }
-}
-
-void SndioAudioInputStream::Stop() {
-
- if (state == kStopped)
- return;
-
- state = kStopWait;
- pthread_join(thread, NULL);
- sio_stop(hdl);
- state = kStopped;
-
- StopAgc();
-}
-
-void SndioAudioInputStream::Close() {
-
- if (state == kClosed)
- return;
-
- if (state == kRunning)
- Stop();
-
- state = kClosed;
- delete [] buffer;
- sio_close(hdl);
-
- manager->ReleaseInputStream(this);
-}
-
-double SndioAudioInputStream::GetMaxVolume() {
- // Not supported
- return 0.0;
-}
-
-void SndioAudioInputStream::SetVolume(double volume) {
- // Not supported. Do nothing.
-}
-
-double SndioAudioInputStream::GetVolume() {
- // Not supported.
- return 0.0;
-}
-
-bool SndioAudioInputStream::IsMuted() {
- // Not supported.
- return false;
-}
-
-void SndioAudioInputStream::SetOutputDeviceForAec(
- const std::string& output_device_id) {
- // Not supported.
-}
-
-void SndioAudioInputStream::ThreadLoop(void) {
- size_t todo, n;
- char *data;
- unsigned int nframes;
- double normalized_volume = 0.0;
-
- nframes = audio_bus->frames();
-
- while (state == kRunning && !sio_eof(hdl)) {
-
- GetAgcVolume(&normalized_volume);
-
- // read one block
- todo = nframes * params.GetBytesPerFrame(kSampleFormat);
- data = buffer;
- while (todo > 0) {
- n = sio_read(hdl, data, todo);
- if (n == 0)
- return; // unrecoverable I/O error
- todo -= n;
- data += n;
- }
- hw_delay -= nframes;
-
- // convert frames count to TimeDelta
- const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
- params.sample_rate());
-
- // push into bus
- audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
-
- // invoke callback
- callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
- }
-}
-
-} // namespace media
diff --git a/srcpkgs/electron10/files/sndio-files/sndio_input.h b/srcpkgs/electron10/files/sndio-files/sndio_input.h
deleted file mode 100644
index d868e0469db5..000000000000
--- a/srcpkgs/electron10/files/sndio-files/sndio_input.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
-#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
-
-#include <stdint.h>
-#include <string>
-#include <sndio.h>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/time/time.h"
-#include "media/audio/agc_audio_stream.h"
-#include "media/audio/audio_io.h"
-#include "media/audio/audio_device_description.h"
-#include "media/base/audio_parameters.h"
-
-namespace media {
-
-class AudioManagerBase;
-
-// Implementation of AudioOutputStream using sndio(7)
-class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
- public:
- // Pass this to the constructor if you want to attempt auto-selection
- // of the audio recording device.
- static const char kAutoSelectDevice[];
-
- // Create a PCM Output stream for the SNDIO device identified by
- // |device_name|. If unsure of what to use for |device_name|, use
- // |kAutoSelectDevice|.
- SndioAudioInputStream(AudioManagerBase* audio_manager,
- const std::string& device_name,
- const AudioParameters& params);
-
- ~SndioAudioInputStream() override;
-
- // Implementation of AudioInputStream.
- bool Open() override;
- void Start(AudioInputCallback* callback) override;
- void Stop() override;
- void Close() override;
- double GetMaxVolume() override;
- void SetVolume(double volume) override;
- double GetVolume() override;
- bool IsMuted() override;
- void SetOutputDeviceForAec(const std::string& output_device_id) override;
-
- private:
-
- enum StreamState {
- kClosed, // Not opened yet
- kStopped, // Device opened, but not started yet
- kRunning, // Started, device playing
- kStopWait // Stopping, waiting for the real-time thread to exit
- };
-
- // C-style call-backs
- static void OnMoveCallback(void *arg, int delta);
- static void* ThreadEntry(void *arg);
-
- // Continuously moves data from the device to the consumer
- void ThreadLoop();
- // Our creator, the audio manager needs to be notified when we close.
- AudioManagerBase* manager;
- // Parameters of the source
- AudioParameters params;
- // We store data here for consumer
- std::unique_ptr<AudioBus> audio_bus;
- // Call-back that consumes recorded data
- AudioInputCallback* callback; // Valid during a recording session.
- // Handle of the audio device
- struct sio_hdl* hdl;
- // Current state of the stream
- enum StreamState state;
- // High priority thread running ThreadLoop()
- pthread_t thread;
- // Number of frames buffered in the hardware
- int hw_delay;
- // Temporary buffer where data is stored sndio-compatible format
- char* buffer;
-
- DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
-};
-
-} // namespace media
-
-#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
diff --git a/srcpkgs/electron10/files/sndio-files/sndio_output.cc b/srcpkgs/electron10/files/sndio-files/sndio_output.cc
deleted file mode 100644
index a6719f9aac8d..000000000000
--- a/srcpkgs/electron10/files/sndio-files/sndio_output.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/logging.h"
-#include "base/time/time.h"
-#include "base/time/default_tick_clock.h"
-#include "media/audio/audio_manager_base.h"
-#include "media/base/audio_timestamp_helper.h"
-#include "media/audio/sndio/sndio_output.h"
-
-namespace media {
-
-static const SampleFormat kSampleFormat = kSampleFormatS16;
-
-void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
- SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
- self->hw_delay -= delta;
-}
-
-void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
- SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
- self->vol = vol;
-}
-
-void *SndioAudioOutputStream::ThreadEntry(void *arg) {
- SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
- self->ThreadLoop();
- return NULL;
-}
-
-SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
- AudioManagerBase* manager)
- : manager(manager),
- params(params),
- audio_bus(AudioBus::Create(params)),
- state(kClosed),
- mutex(PTHREAD_MUTEX_INITIALIZER) {
-}
-
-SndioAudioOutputStream::~SndioAudioOutputStream() {
- if (state != kClosed)
- Close();
-}
-
-bool SndioAudioOutputStream::Open() {
- struct sio_par par;
- int sig;
-
- if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
- params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
- LOG(WARNING) << "Unsupported audio format.";
- return false;
- }
- sio_initpar(&par);
- par.rate = params.sample_rate();
- par.pchan = params.channels();
- par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
- par.bps = par.bits / 8;
- par.sig = sig = par.bits != 8 ? 1 : 0;
- par.le = SIO_LE_NATIVE;
- par.appbufsz = params.frames_per_buffer();
-
- hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
- if (hdl == NULL) {
- LOG(ERROR) << "Couldn't open audio device.";
- return false;
- }
- if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
- LOG(ERROR) << "Couldn't set audio parameters.";
- goto bad_close;
- }
- if (par.rate != (unsigned int)params.sample_rate() ||
- par.pchan != (unsigned int)params.channels() ||
- par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
- par.sig != (unsigned int)sig ||
- (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
- (par.bits != par.bps * 8)) {
- LOG(ERROR) << "Unsupported audio parameters.";
- goto bad_close;
- }
- state = kStopped;
- volpending = 0;
- vol = 0;
- buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
- sio_onmove(hdl, &OnMoveCallback, this);
- sio_onvol(hdl, &OnVolCallback, this);
- return true;
- bad_close:
- sio_close(hdl);
- return false;
-}
-
-void SndioAudioOutputStream::Close() {
- if (state == kClosed)
- return;
- if (state == kRunning)
- Stop();
- state = kClosed;
- delete [] buffer;
- sio_close(hdl);
- manager->ReleaseOutputStream(this); // Calls the destructor
-}
-
-void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
- state = kRunning;
- hw_delay = 0;
- source = callback;
- sio_start(hdl);
- if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
- LOG(ERROR) << "Failed to create real-time thread.";
- sio_stop(hdl);
- state = kStopped;
- }
-}
-
-void SndioAudioOutputStream::Stop() {
- if (state == kStopped)
- return;
- state = kStopWait;
- pthread_join(thread, NULL);
- sio_stop(hdl);
- state = kStopped;
-}
-
-void SndioAudioOutputStream::SetVolume(double v) {
- pthread_mutex_lock(&mutex);
- vol = v * SIO_MAXVOL;
- volpending = 1;
- pthread_mutex_unlock(&mutex);
-}
-
-void SndioAudioOutputStream::GetVolume(double* v) {
- pthread_mutex_lock(&mutex);
- *v = vol * (1. / SIO_MAXVOL);
- pthread_mutex_unlock(&mutex);
-}
-
-// This stream is always used with sub second buffer sizes, where it's
-// sufficient to simply always flush upon Start().
-void SndioAudioOutputStream::Flush() {}
-
-void SndioAudioOutputStream::ThreadLoop(void) {
- int avail, count, result;
-
- while (state == kRunning) {
- // Update volume if needed
- pthread_mutex_lock(&mutex);
- if (volpending) {
- volpending = 0;
- sio_setvol(hdl, vol);
- }
- pthread_mutex_unlock(&mutex);
-
- // Get data to play
- const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
- params.sample_rate());
- count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
- audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
- if (count == 0) {
- // We have to submit something to the device
- count = audio_bus->frames();
- memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
- LOG(WARNING) << "No data to play, running empty cycle.";
- }
-
- // Submit data to the device
- avail = count * params.GetBytesPerFrame(kSampleFormat);
- result = sio_write(hdl, buffer, avail);
- if (result == 0) {
- LOG(WARNING) << "Audio device disconnected.";
- break;
- }
-
- // Update hardware pointer
- hw_delay += count;
- }
-}
-
-} // namespace media
diff --git a/srcpkgs/electron10/files/sndio-files/sndio_output.h b/srcpkgs/electron10/files/sndio-files/sndio_output.h
deleted file mode 100644
index ead220ca96e7..000000000000
--- a/srcpkgs/electron10/files/sndio-files/sndio_output.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
-#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
-
-#include <pthread.h>
-#include <sndio.h>
-
-#include "base/time/tick_clock.h"
-#include "base/time/time.h"
-#include "media/audio/audio_io.h"
-
-namespace media {
-
-class AudioManagerBase;
-
-// Implementation of AudioOutputStream using sndio(7)
-class SndioAudioOutputStream : public AudioOutputStream {
- public:
- // The manager is creating this object
- SndioAudioOutputStream(const AudioParameters& params,
- AudioManagerBase* manager);
- virtual ~SndioAudioOutputStream();
-
- // Implementation of AudioOutputStream.
- bool Open() override;
- void Close() override;
- void Start(AudioSourceCallback* callback) override;
- void Stop() override;
- void SetVolume(double volume) override;
- void GetVolume(double* volume) override;
- void Flush() override;
-
- friend void sndio_onmove(void *arg, int delta);
- friend void sndio_onvol(void *arg, unsigned int vol);
- friend void *sndio_threadstart(void *arg);
-
- private:
- enum StreamState {
- kClosed, // Not opened yet
- kStopped, // Device opened, but not started yet
- kRunning, // Started, device playing
- kStopWait // Stopping, waiting for the real-time thread to exit
- };
-
- // C-style call-backs
- static void OnMoveCallback(void *arg, int delta);
- static void OnVolCallback(void *arg, unsigned int vol);
- static void* ThreadEntry(void *arg);
-
- // Continuously moves data from the producer to the device
- void ThreadLoop(void);
-
- // Our creator, the audio manager needs to be notified when we close.
- AudioManagerBase* manager;
- // Parameters of the source
- AudioParameters params;
- // Source stores data here
- std::unique_ptr<AudioBus> audio_bus;
- // Call-back that produces data to play
- AudioSourceCallback* source;
- // Handle of the audio device
- struct sio_hdl* hdl;
- // Current state of the stream
- enum StreamState state;
- // High priority thread running ThreadLoop()
- pthread_t thread;
- // Protects vol, volpending and hw_delay
- pthread_mutex_t mutex;
- // Current volume in the 0..SIO_MAXVOL range
- int vol;
- // Set to 1 if volumes must be refreshed in the realtime thread
- int volpending;
- // Number of frames buffered in the hardware
- int hw_delay;
- // Temporary buffer where data is stored sndio-compatible format
- char* buffer;
-
- DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
-};
-
-} // namespace media
-
-#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
diff --git a/srcpkgs/electron10/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch b/srcpkgs/electron10/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
deleted file mode 100644
index cf8e81b11d67..000000000000
--- a/srcpkgs/electron10/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/chromium/media/audio/linux/audio_manager_linux.cc b/chromium/media/audio/linux/audio_manager_linux.cc
-index 5d703549372..9e60b40c749 100644
---- media/audio/linux/audio_manager_linux.cc
-+++ media/audio/linux/audio_manager_linux.cc
-@@ -20,6 +20,10 @@
- #include "media/audio/pulse/audio_manager_pulse.h"
- #include "media/audio/pulse/pulse_util.h"
- #endif
-+#if defined(USE_SNDIO)
-+#include <sndio.h>
-+#include "media/audio/openbsd/audio_manager_openbsd.h"
-+#endif
-
- namespace media {
-
-@@ -27,7 +31,8 @@ enum LinuxAudioIO {
- kPulse,
- kAlsa,
- kCras,
-- kAudioIOMax = kCras // Must always be equal to largest logged entry.
-+ kSndio,
-+ kAudioIOMax = kSndio // Must always be equal to largest logged entry.
- };
-
- std::unique_ptr<media::AudioManager> CreateAudioManager(
-@@ -41,6 +46,17 @@ std::unique_ptr<media::AudioManager> CreateAudioManager(
- }
- #endif
-
-+#if defined(USE_SNDIO)
-+ struct sio_hdl * hdl = NULL;
-+ if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) {
-+ sio_close(hdl);
-+ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1);
-+ return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
-+ audio_log_factory);
-+ }
-+ DVLOG(1) << "Sndio is not available on the OS";
-+#endif
-+
- #if defined(USE_PULSEAUDIO)
- pa_threaded_mainloop* pa_mainloop = nullptr;
- pa_context* pa_context = nullptr;
diff --git a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch b/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
deleted file mode 100644
index ec6040026688..000000000000
--- a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/BUILD.gn 2020-03-24 10:16:30.000000000 +0100
-+++ - 2020-04-06 14:32:27.960817513 +0200
-@@ -65,6 +65,9 @@
- if (use_cras) {
- defines += [ "USE_CRAS" ]
- }
-+ if (use_sndio) {
-+ defines += [ "USE_SNDIO" ]
-+ }
- }
-
- # Internal grouping of the configs necessary to support sub-folders having their
diff --git a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch b/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
deleted file mode 100644
index c856de0bf2ec..000000000000
--- a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- media/audio/BUILD.gn 2020-03-24 10:16:30.000000000 +0100
-+++ - 2020-04-06 14:31:28.871450217 +0200
-@@ -232,9 +232,19 @@
- deps += [ "//media/base/android:media_jni_headers" ]
- }
-
-- if (is_linux) {
-+ if (is_linux) {
- sources += [ "linux/audio_manager_linux.cc" ]
- }
-+ if (use_sndio) {
-+ libs += [ "sndio" ]
-+ sources += [
-+ "openbsd/audio_manager_openbsd.cc",
-+ "sndio/sndio_input.cc",
-+ "sndio/sndio_input.h",
-+ "sndio/sndio_output.cc",
-+ "sndio/sndio_output.h"
-+ ]
-+ }
-
- if (use_alsa) {
- libs += [ "asound" ]
diff --git a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch b/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
deleted file mode 100644
index 14807d8e1d36..000000000000
--- a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/media_options.gni 2020-03-24 10:16:30.000000000 +0100
-+++ - 2020-04-06 14:29:22.958630783 +0200
-@@ -114,6 +114,9 @@
- # Enables runtime selection of ALSA library for audio.
- use_alsa = false
-
-+ # Enables runtime selection of sndio library for audio.
-+ use_sndio = false
-+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
- if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
deleted file mode 100644
index 05506dddcb37..000000000000
--- a/srcpkgs/electron10/template
+++ /dev/null
@@ -1,361 +0,0 @@
-# Template file for 'electron10'
-pkgname=electron10
-version=10.4.7
-_nodever=12.16.3
-_chromiumver=85.0.4183.121
-revision=2
-archs="x86_64* i686* aarch64*"
-build_wrksrc="src"
-create_wrksrc=yes
-hostmakedepends="$(vopt_if clang clang) python pkgconf perl gperf bison ninja nodejs hwids
- libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
- pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
- opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
- alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if sndio sndio-devel)"
-makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
- libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
- libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
- libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
- libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
- libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
- minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
- re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
- $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel"
-short_desc="Cross platform application development framework based on web technologies"
-maintainer="John <me@johnnynator.dev>"
-license="BSD-3-Clause"
-homepage="https://electronjs.org"
-distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
- https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
- https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="d75b78107656ef854cc99a967b225eeb1e5989c0a1307d9efad3f8039d387cd8
- e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
- dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
-
-case "$XBPS_TARGET_MACHINE" in
- ppc64*-musl) makedepends+=" libucontext-devel" ;;
-esac
-
-no_generic_pkgconfig_link=yes
-lib32disabled=yes
-nopie=yes # contains tools that are not PIE, enables PIE itself
-
-build_options="pulseaudio sndio clang"
-build_options_default="pulseaudio clang"
-
-if [ "$build_option_clang" ]; then
- nocross="No proper setup for using clang as cross compiler in void yet"
-elif [ "${XBPS_TARGET_MACHINE%%-musl}" = "aarch64" ]; then
- broken="Falls apart at runtime when compiled with gcc"
-fi
-
-_buildtype=Release
-_is_debug=false
-
-CFLAGS="-Wno-unknown-warning-option -fPIC"
-CXXFLAGS="-Wno-unknown-warning-option -fPIC"
-
-_apply_patch() {
- local args="$1" pname="$(basename $2)"
-
- if [ ! -f ".${pname}_done" ]; then
- msg_normal "$pkgver: patching: ${pname}.\n"
- patch -N $args -i $2
- touch .${pname}_done
- fi
-}
-
-_get_chromium_arch() {
- case "$1" in
- x86_64*) echo x64 ;;
- i686*) echo x86 ;;
- arm*) echo arm ;;
- aarch64*) echo arm64 ;;
- ppc64*) echo ppc64 ;;
- ppc*) echo ppc ;;
- mipsel*) echo mipsel ;;
- mips*) echo mips ;;
- *) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
- esac
-}
-
-post_extract() {
- ln -s chromium-$_chromiumver src
- mkdir -p src/third_party/
- ln -s ../../node-$_nodever src/third_party/electron_node
- ln -s ../electron-${version} src/electron
-
-}
-post_patch() {
- cd $wrksrc
- for x in $FILESDIR/patches/*; do
- case "${x##*/}" in
- electron*.patch)
- cd src/electron
- _apply_patch -p1 "$x"
- cd "$wrksrc";;
- esac
- done
-
- # Sigh, electron uses git am...
- if [ ! -f ".electron_patches_done" ]; then
- python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do
- cd "$wrksrc"/"$repopath"
- git init -q
- git config "gc.auto" 0
- if [ "$repopath" != "src" ]; then
- echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore"
- fi
- git add .
- git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \
- commit -q -m "." || true
- done
- cd $wrksrc
- python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json
- touch .electron_patches_done
- fi
-
- for x in $FILESDIR/patches/*; do
- case "${x##*/}" in
- chromium*.patch)
- cd src
- _apply_patch -p1 "$x"
- cd "$wrksrc";;
- esac
- done
-
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- for x in $FILESDIR/musl-patches/*; do
- case "${x##*/}" in
- chromium*.patch)
- cd src
- _apply_patch -p1 "$x"
- cd "$wrksrc";;
- electron*.patch)
- cd src/electron
- _apply_patch -p1 "$x"
- cd "$wrksrc";;
- esac
- done
- fi
- if [ "$build_option_sndio" ]; then
- mkdir -p ${wrksrc}/${build_wrksrc}/media/audio/{sndio,openbsd}
- cp ${FILESDIR}/sndio-files/sndio_*put.* \
- ${wrksrc}/${build_wrksrc}/media/audio/sndio
- cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \
- ${wrksrc}/${build_wrksrc}/media/audio/openbsd
- for f in "${FILESDIR}"/sndio-patches/*.patch; do
- cd src
- _apply_patch -p0 "$f"
- cd "$wrksrc"
- done
- fi
-}
-
-pre_configure() {
- cd "$wrksrc/$build_wrksrc"
-
- # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
- touch chrome/test/data/webui/i18n_process_css_test.html
- # Use the file at run time instead of effectively compiling it in
- sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
- -i services/device/public/cpp/usb/BUILD.gn
-
- mkdir -p third_party/node/linux/node-linux-x64/bin
- ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
-
- # reusable system library settings
- local use_system="
- ffmpeg
- flac
- fontconfig
- freetype
- harfbuzz-ng
- libdrm
- libevent
- libjpeg
- libpng
- libwebp
- libxml
- libxslt
- opus
- re2
- snappy
- "
- for _lib in $use_system libjpeg_turbo; do
- msg_normal "Removing buildscripts for system provided $_lib\n"
- find -type f -path "*third_party/$_lib/*" \
- \! -path "*third_party/$_lib/chromium/*" \
- \! -path "*third_party/$_lib/google/*" \
- \! -path './base/third_party/icu/*' \
- \! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
- \! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
- \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
- -delete
- done
-
-
- msg_normal "Replacing gn files\n"
- python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
- $use_system
- third_party/libaddressinput/chromium/tools/update-strings.py
-}
-
-do_configure() {
- local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})"
- local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})"
- # the build system will set march for use, adding it to cflags will break builds
- export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
- export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
- export CFLAGS=${CFLAGS/-g/}
- export CXXFLAGS=${CXXFLAGS/-g/}
- local conf=()
- cd third_party/electron_node
- if [ "$CROSS_BUILD" ]; then
- conf_args=" --dest-cpu=${target_arch} --cross-compiling"
- fi
- ./configure --prefix=/usr \
- --shared-zlib \
- --shared-libuv \
- --shared-openssl \
- --shared-cares \
- --openssl-use-def-ca-store \
- --without-npm \
- --without-dtrace \
- --without-bundled-v8 \
- ${conf_args}
-
- cd "$wrksrc/$build_wrksrc"/electron
- yarn install
- cd "$wrksrc/$build_wrksrc"
-
- if [ "$build_option_clang" ]; then
- export CC=clang
- export CXX=clang++
- export HOST_CC=clang
- export HOST_CXX=clang++
- else
- export CXXFLAGS="$CXXFLAGS -fpermissive"
- export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
- export BUILD_AR="$AR_host"
- export BUILD_NM="$NM_host"
- fi
-
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Void Linux use ONLY.
- conf+=(
- 'google_api_key="AIzaSyA9gWazKaHaNIPPg2hrMj6_ZSG8AFmq738"'
- 'google_default_client_id="126659149423-hoo6ickbk3p1u2qjsdsp0ddciurfvb4t.apps.googleusercontent.com"'
- 'google_default_client_secret="_ozIx2D-DKm_se_2NPwV4l5b"'
- )
-
- conf+=(
- 'blink_symbol_level=0'
- 'clang_use_chrome_plugins=false'
- 'custom_toolchain="//build/toolchain/linux/unbundle:default"'
- )
- if [ "$CROSS_BUILD" ]; then
- conf+=(
- 'host_toolchain="//build/toolchain/linux/unbundle:host"'
- 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'
- "host_pkg_config=\"$PKG_CONFIG_FOR_BUILD\""
- "pkg_config=\"$PKG_CONFIG\""
- )
- else
- conf+=(
- 'host_toolchain="//build/toolchain/linux/unbundle:default"'
- 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'
- )
- fi
- if [ "$build_option_sndio" ]; then
- conf+=(
- 'use_sndio=true'
- )
- fi
- if [ -n "$XBPS_DEBUG_PKGS" ]; then
- conf+=('symbol_level=1')
- else
- conf+=('symbol_level=0')
- fi
- conf+=(
- 'enable_hangout_services_extension=true'
- 'enable_nacl_nonsfi=false'
- 'enable_nacl=false'
- 'enable_precompiled_headers=false'
- 'fatal_linker_warnings=false'
- 'ffmpeg_branding="Chrome"'
- 'fieldtrial_testing_like_official_build=true'
- 'gold_path="/usr/bin/ld.gold"'
- 'icu_use_data_file=true'
- "is_clang=$(vopt_if clang true false)"
- 'is_component_build=false'
- "is_debug=$_is_debug"
- 'is_desktop_linux=true'
- 'proprietary_codecs=true'
- 'treat_warnings_as_errors=false'
- 'use_allocator_shim=false'
- 'use_allocator="none"'
- 'use_cups=true'
- 'use_custom_libcxx=false'
- 'use_gnome_keyring=false'
- 'use_gold=false'
- 'use_lld=false'
- "use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')"
- 'use_sysroot=false'
- 'use_system_harfbuzz=true'
- "target_cpu=\"$target_arch\""
- "host_cpu=\"$host_arch\""
- 'import("//electron/build/args/release.gn")'
- )
-
- msg_normal "Bootstrapping GN\n"
- CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
- CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
- LDFLAGS="${XBPS_LDFLAGS}" \
- python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
-
- msg_normal "Configuring build\n"
- out/Release/gn gen out/$_buildtype --args="${conf[*]}"
-}
-
-do_build() {
- export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
- export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
- export CFLAGS=${CFLAGS/-g/}
- export CXXFLAGS=${CXXFLAGS/-g/}
- if [ "$build_option_clang" ]; then
- export CC=clang
- export CXX=clang++
- export HOST_CC=clang
- export HOST_CXX=clang++
- else
- export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
- export CXXFLAGS="$CXXFLAGS -fpermissive"
- export BUILD_AR="$AR_host"
- export BUILD_NM="$NM_host"
- fi
- msg_normal "Ninja turtles GO!\n"
- ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers
- # finish rest of the build
- strip -s out/$_buildtype/electron
- ninja ${makejobs} -C out/$_buildtype electron_dist_zip
-}
-
-do_install() {
- vmkdir /usr/lib/$pkgname
- vmkdir /usr/include/$pkgname
- bsdtar -xf out/$_buildtype/dist.zip -C "$DESTDIR/usr/lib/$pkgname"
-
- chmod u+s "$DESTDIR/usr/lib/$pkgname/chrome-sandbox"
-
- cp out/$_buildtype/gen/node_headers.tar.gz "$DESTDIR"/usr/include/$pkgname
-
- vlicense ${wrksrc}/src/LICENSE chromium.LICENSE
- vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE
- vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE
-
- vmkdir /usr/bin
- ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname
-}
diff --git a/srcpkgs/electron10/update b/srcpkgs/electron10/update
deleted file mode 100644
index 3af8e58b5358..000000000000
--- a/srcpkgs/electron10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://www.electronjs.org/releases/stable?version=${version%%.*}
-pattern='tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0ccc276d6820..8456cb959d35 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -72,6 +72,7 @@ replaces="
elasticsearch<=5.1.2_2
electron7<=7.3.3_1
electron9<=9.4.1_1
+ electron10<=10.4.7_2
emacs-gtk2<=27.2_1
enventor<=1.0.0_2
epstopdf<=2.27_3
From 4941e0da1430f00a6809e73621bb490bb0c5aaa0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 3 Mar 2022 22:31:05 +0100
Subject: [PATCH 417/609] routinator: update to 0.11.2
in addition:
- upstream has removed doc/misc.md
- add changelog
---
srcpkgs/routinator/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index 6d776a5ffb60..ce1f0b16e6c8 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -1,6 +1,6 @@
# Template file for 'routinator'
pkgname=routinator
-version=0.10.2
+version=0.11.2
revision=1
build_style=cargo
depends="rsync"
@@ -8,9 +8,10 @@ short_desc="Resource Public Key Infrastructure (RPKI) validator"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="BSD-3-Clause"
homepage="https://rpki.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/NLnetLabs/routinator/main/Changelog.md"
distfiles="https://github.com/NLnetLabs/routinator/archive/v${version}.tar.gz"
conf_files="/etc/routinator/routinator.conf"
-checksum=b85e03447eaffc3ec0df78eeeb5ad87aaaeabc0974d87ea5d516e04c3e1bbbb3
+checksum=00f825c53168592da0285e8dbd228018e77248d458214a2c0f86cd0ca45438f5
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*) ;;
@@ -19,7 +20,6 @@ esac
post_install() {
vdoc README.md
- vdoc doc/misc.md
vman doc/routinator.1
vinstall etc/routinator.conf.system-service 0644 etc/routinator routinator.conf
vlicense LICENSE
From 721a52c49b8fb9b4b06312d06680150f27adea9c Mon Sep 17 00:00:00 2001
From: J Farkas <chexum+git@gmail.com>
Date: Sun, 3 Jul 2022 18:20:49 +0000
Subject: [PATCH 418/609] gperftools: fix patch whitespace
---
srcpkgs/gperftools/patches/ppc-musl.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gperftools/patches/ppc-musl.patch b/srcpkgs/gperftools/patches/ppc-musl.patch
index bbeb4cd39312..d192ea612797 100644
--- a/srcpkgs/gperftools/patches/ppc-musl.patch
+++ b/srcpkgs/gperftools/patches/ppc-musl.patch
@@ -14,7 +14,7 @@ Compatibility fixes for musl.
pc_field_found=true)
elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then
AC_TRY_COMPILE([#define _GNU_SOURCE 1
-- #include <sys/ucontext.h>],
+- #include <sys/ucontext.h>],
+ #include <sys/ucontext.h>
+ #include <asm/ptrace.h>],
[ucontext_t u; return u.$pc_field == 0;],
From 30fd791967e741259116a30330e8aa12d3b1647b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Jul 2022 23:47:24 +0200
Subject: [PATCH 419/609] python3-userpath: update to 1.8.0.
---
srcpkgs/python3-userpath/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index 8fc30c9a52f5..41390afabaad 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -1,10 +1,10 @@
# Template file for 'python3-userpath'
pkgname=python3-userpath
-version=1.7.0
-revision=2
+version=1.8.0
+revision=1
wrksrc="userpath-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="hatchling python3-wheel"
depends="python3-click"
checkdepends="$depends python3-pytest"
short_desc="Cross-platform tool for adding locations to the user PATH"
@@ -12,8 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT, Apache-2.0"
homepage="https://github.com/ofek/userpath"
distfiles="${PYPI_SITE}/u/userpath/userpath-${version}.tar.gz"
-checksum=dcd66c5fa9b1a3c12362f309bbb5bc7992bac8af86d17b4e6b1a4b166a11c43f
+checksum=04233d2fcfe5cff911c1e4fb7189755640e1524ff87a4b82ab9d6b875fee5787
post_install() {
- vlicense LICENSE-MIT
+ vlicense LICENSE.txt LICENSE
}
From f54cb912c3da38ab4d54a0cb413f8a84759dd76d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Jul 2022 23:44:02 +0200
Subject: [PATCH 420/609] xbps: import HTTP/1.1 default to keep alive patch
---
...4c80db5d7fba2b0635e758126c4d949edbb3.patch | 55 +++++++++++++++++++
srcpkgs/xbps/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/xbps/patches/b5954c80db5d7fba2b0635e758126c4d949edbb3.patch
diff --git a/srcpkgs/xbps/patches/b5954c80db5d7fba2b0635e758126c4d949edbb3.patch b/srcpkgs/xbps/patches/b5954c80db5d7fba2b0635e758126c4d949edbb3.patch
new file mode 100644
index 000000000000..77a21c9bc143
--- /dev/null
+++ b/srcpkgs/xbps/patches/b5954c80db5d7fba2b0635e758126c4d949edbb3.patch
@@ -0,0 +1,55 @@
+From b5954c80db5d7fba2b0635e758126c4d949edbb3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Sat, 2 Jul 2022 22:37:08 +0200
+Subject: [PATCH] lib/fetch: reuse http connection
+
+With HTTP 1.1 persistent connection is default and Connection
+header is not sent.
+Before patch, for every file, including 512b signature, there was
+done dns query, tls handshake etc.
+---
+ lib/fetch/http.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/lib/fetch/http.c b/lib/fetch/http.c
+index 395e7d8f..02b97a51 100644
+--- a/lib/fetch/http.c
++++ b/lib/fetch/http.c
+@@ -424,7 +424,7 @@ http_cmd(conn_t *conn, const char *fmt, ...)
+ * Get and parse status line
+ */
+ static int
+-http_get_reply(conn_t *conn)
++http_get_reply(conn_t *conn, int *keep_alive)
+ {
+ char *p;
+
+@@ -445,6 +445,10 @@ http_get_reply(conn_t *conn)
+ if (*p == '/') {
+ if (p[1] != '1' || p[2] != '.' || (p[3] != '0' && p[3] != '1'))
+ return (HTTP_PROTOCOL_ERROR);
++ /* HTTP/1.1 defaults to the use of "persistent connections" */
++ if (keep_alive && p[3] == '1') {
++ *keep_alive = 1;
++ }
+ p += 4;
+ }
+ if (*p != ' ' ||
+@@ -760,7 +764,7 @@ http_connect(struct url *URL, struct url *purl, const char *flags, int *cached)
+
+ http_cmd(conn, "\r\n");
+
+- if (http_get_reply(conn) != HTTP_OK) {
++ if (http_get_reply(conn, NULL) != HTTP_OK) {
+ http_seterr(conn->err);
+ fetch_close(conn);
+ return (NULL);
+@@ -1011,7 +1015,7 @@ http_request(struct url *URL, const char *op, struct url_stat *us,
+ sizeof(val));
+
+ /* get reply */
+- switch (http_get_reply(conn)) {
++ switch (http_get_reply(conn, &keep_alive)) {
+ case HTTP_OK:
+ case HTTP_PARTIAL:
+ case HTTP_NOT_MODIFIED:
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index ba7f8c7068e3..d5867b1387c2 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=6
+revision=7
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From b8289657a9db669f4bba45d4577fd0c011fdf71e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Jul 2022 23:45:04 +0200
Subject: [PATCH 421/609] xbps-statc: rebuild with latest patches
---
srcpkgs/xbps-static/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index 7956fdae4d64..8ca411f2372b 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -2,7 +2,7 @@
# NOTE: keep this package synchronized with "srcpkgs/xbps"
pkgname=xbps-static
version=0.59.1
-revision=5
+revision=6
# only musl
archs="*-musl"
wrksrc="xbps-${version}"
From 32a2c56abdca50dd0e45461f4c9edc461ea6659e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:18:21 +1100
Subject: [PATCH 422/609] python3-h2: update to 4.1.0.
---
srcpkgs/python3-h2/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-h2/template b/srcpkgs/python3-h2/template
index 29668e4cec4f..1fae4bd23fa1 100644
--- a/srcpkgs/python3-h2/template
+++ b/srcpkgs/python3-h2/template
@@ -1,17 +1,19 @@
# Template file for 'python3-h2'
pkgname=python3-h2
-version=4.0.0
-revision=2
+version=4.1.0
+revision=1
wrksrc="h2-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 python3-hpack python3-hyperframe"
+depends="python3-hpack python3-hyperframe"
+checkdepends="${depends} python3-hypothesis python3-pytest"
short_desc="HTTP/2 State-Machine based protocol implementation (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/python-hyper/h2"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=78753b52cebb63f87097c9a5f969004a61ec4a41f967e41dcc287e26dd9b4143
+changelog="https://raw.githubusercontent.com/python-hyper/h2/master/CHANGELOG.rst"
+distfiles="https://github.com/python-hyper/h2/archive/v${version}.tar.gz"
+checksum=4a17b1ec23152bd94ab6260ea61f6cc02de92bd7c36762f13e34fdecea454b41
post_install() {
vlicense LICENSE
From 2567a23c1697039e750ecb69de85f86e8cdd071a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:25:29 +1100
Subject: [PATCH 423/609] python3-passlib: update to 1.7.4.
---
srcpkgs/python3-passlib/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-passlib/template b/srcpkgs/python3-passlib/template
index 86a22fd6f01d..78a24bbc0a8b 100644
--- a/srcpkgs/python3-passlib/template
+++ b/srcpkgs/python3-passlib/template
@@ -1,17 +1,18 @@
# Template file for 'python3-passlib'
pkgname=python3-passlib
-version=1.7.1
-revision=6
+version=1.7.4
+revision=1
wrksrc="passlib-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
+checkdepends="python3-bcrypt python3-nose"
short_desc="Comprehensive password hashing framework for Python3"
maintainer="Alin Dobre <alin.dobre@outlook.com>"
license="BSD-3-Clause"
-homepage="https://bitbucket.org/ecollins/passlib"
+homepage="https://passlib.readthedocs.io"
distfiles="${PYPI_SITE}/p/passlib/passlib-${version}.tar.gz"
-checksum=3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0
+checksum=defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04
post_install() {
vlicense LICENSE
From 4ef9266e18e878f7ab021dac108a695e4d379326 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:44:00 +1100
Subject: [PATCH 424/609] New package: python3-asgiref-3.5.2
---
srcpkgs/python3-asgiref/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-asgiref/template
diff --git a/srcpkgs/python3-asgiref/template b/srcpkgs/python3-asgiref/template
new file mode 100644
index 000000000000..7e020e44c216
--- /dev/null
+++ b/srcpkgs/python3-asgiref/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-asgiref'
+pkgname=python3-asgiref
+version=3.5.2
+revision=1
+wrksrc="asgiref-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-pytest-asyncio"
+short_desc="ASGI base libraries"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/django/asgiref"
+changelog="https://raw.githubusercontent.com/django/asgiref/main/CHANGELOG.txt"
+distfiles="https://github.com/django/asgiref/archive/${version}.tar.gz"
+checksum=62f04f81110898e471a7d5b37f88c923c2864d43fa6abb66a95980becb1a2ba4
+
+post_install() {
+ vlicense LICENSE
+}
From 6d90d9572f0c4ebbb29750a4b70b277eb51609e5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:47:28 +1100
Subject: [PATCH 425/609] New package: python3-kaitaistruct-0.9
---
srcpkgs/python3-kaitaistruct/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-kaitaistruct/template
diff --git a/srcpkgs/python3-kaitaistruct/template b/srcpkgs/python3-kaitaistruct/template
new file mode 100644
index 000000000000..4988b9877805
--- /dev/null
+++ b/srcpkgs/python3-kaitaistruct/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-kaitaistruct'
+pkgname=python3-kaitaistruct
+version=0.9
+revision=1
+wrksrc="kaitai_struct_python_runtime-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Kaitai Struct API for Python"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT"
+homepage="https://kaitai.io"
+distfiles="https://github.com/kaitai-io/kaitai_struct_python_runtime/archive/${version}.tar.gz"
+checksum=d21207d17603d87f263c8adcd45235ce22d154ba6faba0945e4f1a9d8d95e7e9
+
+post_install() {
+ vlicense LICENSE
+}
From f7994472d2bde2a29be21d06f037d13c7f348650 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:29:13 +1100
Subject: [PATCH 426/609] New package: python3-Arpeggio-2.0.0
---
srcpkgs/python3-Arpeggio/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/python3-Arpeggio/template
diff --git a/srcpkgs/python3-Arpeggio/template b/srcpkgs/python3-Arpeggio/template
new file mode 100644
index 000000000000..941fe2b4fdf1
--- /dev/null
+++ b/srcpkgs/python3-Arpeggio/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-Arpeggio'
+pkgname=python3-Arpeggio
+version=2.0.0
+revision=1
+wrksrc="Arpeggio-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Recursive descent parser with memoization based on PEG grammars"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT"
+homepage="https://github.com/textX/Arpeggio"
+changelog="https://raw.githubusercontent.com/textX/Arpeggio/master/CHANGELOG.md"
+distfiles="https://github.com/textX/Arpeggio/archive/${version}.tar.gz"
+checksum=70eb3d33948b9d69320c919d2e1820381220e6960ed46f805fbe6f1a09f03a66
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e '/pytest-runner/d' -i setup.cfg
+}
+
+post_install() {
+ vlicense LICENSE
+}
From af11e093f3876a07e16f865fc164fe0e7fa24a7c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:55:22 +1100
Subject: [PATCH 427/609] New package: python3-publicsuffix2-2019.12.21
---
srcpkgs/python3-publicsuffix2/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-publicsuffix2/template
diff --git a/srcpkgs/python3-publicsuffix2/template b/srcpkgs/python3-publicsuffix2/template
new file mode 100644
index 000000000000..1b5f2368a138
--- /dev/null
+++ b/srcpkgs/python3-publicsuffix2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-publicsuffix2'
+pkgname=python3-publicsuffix2
+version=2019.12.21
+revision=1
+wrksrc="python-publicsuffix2-release-2.${version//./-}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-requests python3-wheel"
+depends="python3"
+short_desc="Get a public suffix for a domain name using the Public Suffix List"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT, MPL-2.0"
+homepage="https://github.com/nexB/python-publicsuffix2"
+changelog="https://raw.githubusercontent.com/nexB/python-publicsuffix2/develop/CHANGELOG.rst"
+distfiles="https://github.com/nexB/python-publicsuffix2/archive/release-2.${version//./-}.tar.gz"
+checksum=b4ef022fccd7b4968151af208b0f890e55c00b24892a1a826b2b7a381215bafa
+
+post_install() {
+ vlicense publicsuffix2.LICENSE
+}
From a7a057e5fbb66f92cdde06cb40e1eaac1e4ce87c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 11:01:00 +1100
Subject: [PATCH 428/609] New package: python3-zstandard-0.18.0
---
srcpkgs/python3-zstandard/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/python3-zstandard/template
diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
new file mode 100644
index 000000000000..523a7ee72b60
--- /dev/null
+++ b/srcpkgs/python3-zstandard/template
@@ -0,0 +1,29 @@
+# Template file for 'python3-zstandard'
+pkgname=python3-zstandard
+version=0.18.0
+revision=1
+wrksrc="python-zstandard-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-hypothesis"
+short_desc="Python bindings to the Zstandard (zstd) compression library"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/indygreg/python-zstandard"
+changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
+distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
+checksum=a6c7e2b8d4ec262269ccbc7ce66073370a06d6a0fc866946b7ce429b97e0c4ac
+
+pre_check() {
+ # The skipped test ignored due to failure, see:
+ # https://github.com/indygreg/python-zstandard/issues/147#issuecomment-874278901
+ if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+ vsed -i -e '/def test_estimated_compression_context_size/s/test//' tests/test_data_structures*.py
+ fi
+}
+
+post_install() {
+ vlicense LICENSE
+}
From d5089ce15e8ef6dda4e928300ae2a0a0d3fab8b0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 11:01:30 +1100
Subject: [PATCH 429/609] New package: python3-parver-0.3.1
---
srcpkgs/python3-parver/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-parver/template
diff --git a/srcpkgs/python3-parver/template b/srcpkgs/python3-parver/template
new file mode 100644
index 000000000000..de58f5ee03f2
--- /dev/null
+++ b/srcpkgs/python3-parver/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-parver'
+pkgname=python3-parver
+version=0.3.1
+revision=1
+wrksrc="parver-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Arpeggio python3-attrs python3-six"
+checkdepends="${depends} python3-hypothesis python3-pretend python3-pytest"
+short_desc="Allows parsing and manipulation of PEP 440 version numbers"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT"
+homepage="https://github.com/RazerM/parver"
+changelog="https://raw.githubusercontent.com/RazerM/parver/master/CHANGELOG.md"
+distfiles="https://github.com/RazerM/parver/archive/${version}.tar.gz"
+checksum=db9cb60d6fa8fa5fe88af7016c26846a297dec8ce30f4966f29edf1351e4a544
+
+post_install() {
+ vlicense LICENSE
+}
From e6368d7dbfbcedd0f4eeaf903d1533c6e4fbde66 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 11:01:44 +1100
Subject: [PATCH 430/609] New package: mitmproxy-8.1.1
---
srcpkgs/mitmproxy/template | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/mitmproxy/template
diff --git a/srcpkgs/mitmproxy/template b/srcpkgs/mitmproxy/template
new file mode 100644
index 000000000000..b662359d5c7c
--- /dev/null
+++ b/srcpkgs/mitmproxy/template
@@ -0,0 +1,32 @@
+# Template file for 'mitmproxy'
+pkgname=mitmproxy
+version=8.1.1
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Brotli python3-Flask python3-asgiref python3-blinker python3-certifi
+ python3-click python3-cryptography python3-h11 python3-h2 python3-hyperframe python3-kaitaistruct
+ python3-ldap3 python3-msgpack python3-openssl python3-parsing python3-passlib python3-protobuf
+ python3-publicsuffix2 python3-pyperclip python3-pyzstd python3-ruamel.yaml python3-sortedcontainers
+ python3-tornado python3-urwid python3-wsproto python3-zstandard"
+checkdepends="${depends} python3-hypothesis python3-parver
+ python3-pytest-asyncio python3-pytest-cov python3-pytest-timeout python3-requests"
+short_desc="Interactive TLS-capable intercepting HTTP proxy"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT"
+homepage="https://mitmproxy.org"
+changelog="https://raw.githubusercontent.com/mitmproxy/mitmproxy/main/CHANGELOG.md"
+distfiles="https://github.com/mitmproxy/mitmproxy/archive/v${version}.tar.gz"
+checksum=212e81bec40e1d2a894d73a337f076a3010d981249e513565e9246f29822d06c
+
+_skip="(test_get_version)" # This test fails without a git repository
+
+if [ ${XBPS_TARGET_MACHINE%-musl} = "i686" ]; then
+ _skip+="or(test_refresh)"
+fi
+
+make_check_args="-k not($_skip)"
+
+post_install() {
+ vlicense LICENSE
+}
From b026e63d8afd89b332479347cbce894c6b8531cc Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Mon, 4 Jul 2022 09:42:37 +0700
Subject: [PATCH 431/609] Converseen: update 0.9.9.6
---
srcpkgs/Converseen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
index bb8790332271..b6c457aeaebe 100644
--- a/srcpkgs/Converseen/template
+++ b/srcpkgs/Converseen/template
@@ -1,6 +1,6 @@
# Template file for 'Converseen'
pkgname=Converseen
-version=0.9.9.5
+version=0.9.9.6
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/Faster3ck/Converseen"
distfiles="https://github.com/Faster3ck/Converseen/archive/refs/tags/v${version}.tar.gz"
-checksum=30d731968e61ab3fb701976f05b2f5b372e9760c05665d6183921fb94f8cfa44
+checksum=c2bf0ce9e2f2f95426e83d6ecd6115946179118915f2a620f586f9c072e1cf17
From 8c783ef262a818b2abeb655714d479b296e1cff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?=
=?UTF-8?q?=EF=BD=94=EF=BD=89?= <hiljusti@so.dang.cool>
Date: Sun, 3 Jul 2022 00:39:06 -0700
Subject: [PATCH 432/609] sigi: update to 3.4.2
---
srcpkgs/sigi/template | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
index fd42f7fa00d5..518dbf3a25aa 100644
--- a/srcpkgs/sigi/template
+++ b/srcpkgs/sigi/template
@@ -1,6 +1,6 @@
# Template file for 'sigi'
pkgname=sigi
-version=3.4.1
+version=3.4.2
revision=1
build_style=cargo
short_desc="Organization tool for people who hate organization"
@@ -8,12 +8,7 @@ maintainer="J.R. Hill <hiljusti@so.dang.cool>"
license="GPL-2.0-only"
homepage="https://github.com/hiljusti/sigi"
distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
-checksum=81f1171495ca53246df1f271e7bc631454e94c8294b95e277f29136572bef6ad
-
-case "$XBPS_TARGET_MACHINE" in
- ppc64le*) ;;
- ppc64*) broken="some rustix junk";;
-esac
+checksum=8bb60ca0fa0fd66aaeef0efb3b34b171dbe0a6e0f69672dafc9cc72fb30a4036
post_install() {
vman sigi.1
From 3cb9fd1c5bfc6fe52e22cccbe77c9244b30e8c3a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 4 Jul 2022 12:28:02 +1000
Subject: [PATCH 433/609] upmpdcli: update to 1.5.19
---
srcpkgs/upmpdcli/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 8c6719114ce3..abd66d3d0047 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
# Template file for 'upmpdcli'
pkgname=upmpdcli
-version=1.5.17
+version=1.5.19
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config tar"
@@ -9,8 +9,9 @@ short_desc="UPnP Media Renderer front-end for MPD"
maintainer="amak <amak.git@outlook.com>"
license="LGPL-2.1-or-later"
homepage="https://www.lesbonscomptes.com/upmpdcli"
+changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html"
distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=a60b508d20064783f40ac8d2d260b92bd0b2367c6a0ca67c69019f3890bc642d
+checksum=67fa1f5c06fecd404f3414b25a070c9deabe917241ed6881b7a8e41e8379ed09
python_version=3
system_accounts="_upmpdcli"
From 20610ae1594913beb0d23b89944e1932880df70f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Jul 2022 14:59:50 +0200
Subject: [PATCH 434/609] efl: add missing libgomp-devel build dep
---
srcpkgs/efl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 714080ade250..e5fbd1c66315 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -28,7 +28,7 @@ makedepends="
gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
- avahi-libs-devel eudev-libudev-devel
+ avahi-libs-devel eudev-libudev-devel libgomp-devel
libsndfile-devel libmount-devel LuaJIT-devel poppler-cpp-devel
librsvg-devel libspectre-devel libraw-devel libopenjpeg2-devel
libheif-devel libavif-devel
From e459d59b8313543207791a9930bf084b4263f300 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Jul 2022 15:00:52 +0200
Subject: [PATCH 435/609] mozjs91: remove invalid awk dependency
---
srcpkgs/mozjs91/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 1e42f14b59aa..e2a5efee8735 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -12,7 +12,7 @@ configure_args="--disable-jemalloc --disable-strip --disable-tests \
--enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \
--with-system-nspr --with-system-zlib --enable-hardening --enable-release"
hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
- awk rust cargo llvm12 clang"
+ rust cargo llvm12 clang"
makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
zlib-devel rust-std"
checkdepends=python3
From 6e20c43e1dd7fddc695480917a788080d4970130 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Jul 2022 15:01:25 +0200
Subject: [PATCH 436/609] openocd: loosen jimtcl dep version restriction
---
srcpkgs/openocd/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template
index 856977b045ec..d6370930edc1 100644
--- a/srcpkgs/openocd/template
+++ b/srcpkgs/openocd/template
@@ -4,6 +4,7 @@ version=0.11.0+1
revision=1
# update to a commit that has a compatible jimtcl version
_commit=830d70bfc66ada2a68c73283b9e4fa4770d408ee
+_jimtcl_version=0.81
wrksrc="${pkgname}-${_commit}"
build_style=gnu-configure
configure_args="
@@ -41,7 +42,8 @@ configure_args="
--enable-cmsis-dap-v2
--disable-internal-libjaylink"
hostmakedepends="automake pkg-config libtool which"
-makedepends="hidapi-devel jimtcl-devel-0.81_1 libftdi1-devel
+makedepends="hidapi-devel libftdi1-devel
+ jimtcl-devel>=${_jimtcl_version}_1<=${_jimtcl_version}_9999
libusb-devel libjaylink-devel capstone-devel"
short_desc="Open On-Chip Debugger"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From e9abb395d7685015fefa0f4b2286486ef84672ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Jul 2022 15:04:00 +0200
Subject: [PATCH 437/609] jimtcl: mention version restriction in openocd
openocd depends on a specific version of jimtcl, so when jimtcl is
updated, openocd needs to be updated as well
---
srcpkgs/jimtcl/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/jimtcl/template b/srcpkgs/jimtcl/template
index 25d32bb5c5ae..0cf62f5657b6 100644
--- a/srcpkgs/jimtcl/template
+++ b/srcpkgs/jimtcl/template
@@ -1,5 +1,6 @@
# Template file for 'jimtcl'
pkgname=jimtcl
+# keep in sync with _jimtcl_version in openocd
version=0.81
revision=1
build_style=gnu-configure
From 9d7dff86922489d4f4436483803499b4a20ece65 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Mon, 4 Jul 2022 15:49:00 +0000
Subject: [PATCH 438/609] got: update to 0.73.
---
srcpkgs/got/patches/cast-printf-time_t.patch | 24 ++++++++++++++++++++
srcpkgs/got/template | 4 ++--
2 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/got/patches/cast-printf-time_t.patch
diff --git a/srcpkgs/got/patches/cast-printf-time_t.patch b/srcpkgs/got/patches/cast-printf-time_t.patch
new file mode 100644
index 000000000000..a369ddff9278
--- /dev/null
+++ b/srcpkgs/got/patches/cast-printf-time_t.patch
@@ -0,0 +1,24 @@
+From: Christian Weisgerber <naddy@mips.inka.de>
+Date: Mon, 4 Jul 2022 15:13:11 +0000 (+0000)
+Subject: fix potential type mismatch between format specifier and argument
+X-Git-Url: https://git.gameoftrees.org/gitweb/?p=got.git;a=commitdiff_plain;h=b9a36ae5
+
+fix potential type mismatch between format specifier and argument
+
+Cast printf argument of type time_t to long long to match the %lld
+format specifier on platforms where this might not be the case.
+---
+
+diff --git a/lib/sigs.c b/lib/sigs.c
+index 693a3a27..ac1b2637 100644
+--- a/lib/sigs.c
++++ b/lib/sigs.c
+@@ -204,7 +204,7 @@ got_tag_write_signed_data(BUF *buf, struct got_tag_object *tag,
+ got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
+ got_object_tag_get_tagger_gmtoff(tag));
+ if (asprintf(&tagger, "%s %lld %s", got_object_tag_get_tagger(tag),
+- got_object_tag_get_tagger_time(tag), gmtoff) == -1) {
++ (long long)got_object_tag_get_tagger_time(tag), gmtoff) == -1) {
+ err = got_error_from_errno("asprintf");
+ goto done;
+ }
diff --git a/srcpkgs/got/template b/srcpkgs/got/template
index 1113cca08d9b..6a991e32a027 100644
--- a/srcpkgs/got/template
+++ b/srcpkgs/got/template
@@ -1,6 +1,6 @@
# Template file for 'got'
pkgname=got
-version=0.71
+version=0.73
revision=1
wrksrc=got-portable-${version}
build_style=gnu-configure
@@ -12,7 +12,7 @@ license="ISC"
homepage="https://gameoftrees.org"
changelog="https://gameoftrees.org/releases/CHANGES"
distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
-checksum="16a61f49e52e189606d8f4236423f912b5cae71b1d505ef1313b4fc3173108f0"
+checksum="f0753a7e745bb3975cdd915424827d76bdec6bd0832c443c77d84ae3121ca874"
post_install() {
sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE
From 91928bc45b1a49fa7d65611e6febe0ef6374ef2b Mon Sep 17 00:00:00 2001
From: "Ivan '.ztx/lyghters' Sivkov" <lyghters@gmail.com>
Date: Mon, 4 Jul 2022 15:48:52 +0500
Subject: [PATCH 439/609] xonotic: update to 0.8.5
deleted musl-moncontrol.patch since it isn't needed anymore and won't
build
---
srcpkgs/xonotic/patches/musl-moncontrol.patch | 13 -------------
srcpkgs/xonotic/template | 6 +++---
2 files changed, 3 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/xonotic/patches/musl-moncontrol.patch
diff --git a/srcpkgs/xonotic/patches/musl-moncontrol.patch b/srcpkgs/xonotic/patches/musl-moncontrol.patch
deleted file mode 100644
index 41b11d74b8fb..000000000000
--- a/srcpkgs/xonotic/patches/musl-moncontrol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-There is no moncontrol() in musl libc.
-
---- a/source/darkplaces/sys_shared.c 2015-01-13 19:56:16.000000000 +0100
-+++ b/source/darkplaces/sys_shared.c 2015-08-30 09:24:54.839064473 +0200
-@@ -69,7 +69,7 @@
- else
- moncleanup();
- #endif
--#elif defined(__linux__) || defined(__FreeBSD__)
-+#elif (defined(__linux__) && defined(__GLIBC__)) || defined(__FreeBSD__)
- extern int moncontrol(int);
- moncontrol(enable);
- #endif
diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template
index 576f19979de9..b492d0d5f63d 100644
--- a/srcpkgs/xonotic/template
+++ b/srcpkgs/xonotic/template
@@ -1,7 +1,7 @@
# Template file for 'xonotic'
pkgname=xonotic
-version=0.8.2
-revision=2
+version=0.8.5
+revision=1
wrksrc="Xonotic"
hostmakedepends="unzip automake libtool"
makedepends="gmp-devel MesaLib-devel SDL2-devel libcurl-devel alsa-lib-devel
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, BSD-3-Clause"
homepage="http://xonotic.org"
distfiles="https://dl.xonotic.org/xonotic-${version}-source.zip"
-checksum=5e6916f1e6e9e22285bb71ddd075189102857383e74ed0b0a3d27cef08e0bd2b
+checksum=a1a81ba55ab151bf09758e7f59614b2e5150e84224753e77950bcd07a282ea5d
nocross=yes
do_build() {
From 51b8757b94b62045c1f327851717cc04bd95c945 Mon Sep 17 00:00:00 2001
From: "Ivan '.ztx/lyghters' Sivkov" <lyghters@gmail.com>
Date: Mon, 4 Jul 2022 15:50:05 +0500
Subject: [PATCH 440/609] xonotic-data: update to 0.8.5
---
srcpkgs/xonotic-data/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template
index 6870e1cae1ea..419c4ca4fd2e 100644
--- a/srcpkgs/xonotic-data/template
+++ b/srcpkgs/xonotic-data/template
@@ -1,15 +1,15 @@
# Template file for 'xonotic-data'
pkgname=xonotic-data
-version=0.8.2
-revision=3
+version=0.8.5
+revision=1
wrksrc=Xonotic
hostmakedepends="unzip"
short_desc="Xonotic's data files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://xonotic.org"
-distfiles="http://dl.xonotic.org/xonotic-${version}.zip"
-checksum=a22f7230f486c5825b55cfdadd73399c9b0fae98c9e081dd8ac76eca08359ad5
+distfiles="https://dl.xonotic.org/xonotic-${version}.zip"
+checksum=0f92aa238362aeb059b9d9026a9bd38d6217423a35c19f126fb39e38736e37e5
do_install() {
vmkdir usr/share/xonotic
From 7f91d7dc914d8a65586b8d4b1c0fba22d647e40c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 4 Jul 2022 03:37:29 +0300
Subject: [PATCH 441/609] file: update to 5.42.
---
srcpkgs/file/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index a7e080f143ba..97426c4741b1 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,6 +1,6 @@
# Template file for 'file'
pkgname=file
-version=5.41
+version=5.42
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.darwinsys.com/file/"
distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
-checksum=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
+checksum=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4
build_options="libseccomp"
From 42ceaab3ade73cbfcd24b3864d7fe526b2f9a1ce Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 4 Jul 2022 13:18:27 -0400
Subject: [PATCH 442/609] git-absorb: update to 0.6.7.
---
srcpkgs/git-absorb/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index fa73d41afbae..c428d4657e77 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -1,18 +1,23 @@
# Template file for 'git-absorb'
pkgname=git-absorb
-version=0.6.6
+version=0.6.7
revision=1
build_style=cargo
+build_helper=qemu
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
short_desc="Like git commit --fixup, but automatic"
maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="BSD-3-Clause"
homepage="https://github.com/tummychow/git-absorb"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=955069cc70a34816e6f4b6a6bd1892cfc0ae3d83d053232293366eb65599af2f
+distfiles="https://github.com/tummychow/git-absorb/archive/${version}.tar.gz"
+checksum=f562dbcf68c5f687197e8a594cb58cf102cc17a2e9fcf66dbacb83b49e053bd7
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
+ for sh in bash fish zsh; do
+ vtargetrun ${DESTDIR}/usr/bin/git-absorb --gen-completions $sh > git-absorb.$sh
+ vcompletion git-absorb.$sh $sh
+ done
}
From 69b55db4b060b756bccdc41865f021a86093ade9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 12 Feb 2022 00:14:20 +0100
Subject: [PATCH 443/609] postgresql13: update to 13.7.
---
srcpkgs/postgresql13/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 0f7b79fd6710..08e67ba226bd 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql13'
pkgname=postgresql13
-version=13.5
-revision=2
+version=13.7
+revision=1
wrksrc="postgresql-${version}"
build_style=gnu-configure
make_build_target=world
@@ -21,7 +21,8 @@ license="PostgreSQL"
homepage="https://www.postgresql.org"
changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
+checksum=1b905bf4f3d83614a393b3c51fd345910fd261e4f5124a68d9a1fdd3a2a46399
+make_check=ci-skip # Postgres server can't be run as root
conf_files="
/${_prefix}/etc/default/postgresql
@@ -223,5 +224,6 @@ postgresql13-contrib_package() {
short_desc="PostgreSQL contributed programs and extensions"
pkg_install() {
make -C contrib install DESTDIR=${PKGDESTDIR}
+ mv ${PKGDESTDIR}/usr/include ${PKGDESTDIR}/${_prefix}
}
}
From 48fe4a16b212e8c574d86c0404db3bd7eaf0ef08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 12 Feb 2022 00:14:20 +0100
Subject: [PATCH 444/609] postgresql14: update to 14.4.
---
srcpkgs/postgresql14/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/postgresql14/template b/srcpkgs/postgresql14/template
index 94ba16bffbc6..2aa65e684a1d 100644
--- a/srcpkgs/postgresql14/template
+++ b/srcpkgs/postgresql14/template
@@ -1,6 +1,6 @@
# Template file for 'postgresql14'
pkgname=postgresql14
-version=14.1
+version=14.4
revision=1
wrksrc="postgresql-${version}"
build_style=gnu-configure
@@ -22,7 +22,8 @@ license="PostgreSQL"
homepage="https://www.postgresql.org"
changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f
+checksum=c23b6237c5231c791511bdc79098617d6852e9e3bdf360efd8b5d15a1a3d8f6a
+make_check=ci-skip # Postgres server can't be run as root
conf_files="
/${_sysconfdir}/default/postgresql
@@ -224,5 +225,6 @@ postgresql14-contrib_package() {
short_desc="PostgreSQL contributed programs and extensions"
pkg_install() {
make -C contrib install DESTDIR=${PKGDESTDIR}
+ mv ${PKGDESTDIR}/usr/include ${PKGDESTDIR}/${_prefix}
}
}
From 4fb781a25efd7f7839159594b3b1ef987e25f519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 12 Feb 2022 00:14:20 +0100
Subject: [PATCH 445/609] postgresql: turn into meta package
9.6 is EOL
---
srcpkgs/postgresql-full | 1 +
srcpkgs/postgresql/files/pg_config.sh.in | 143 -------------
srcpkgs/postgresql/files/postgresql.confd | 17 --
srcpkgs/postgresql/files/postgresql.pam | 3 -
srcpkgs/postgresql/files/postgresql/control/t | 2 -
srcpkgs/postgresql/files/postgresql/log/run | 2 -
srcpkgs/postgresql/files/postgresql/run | 30 ---
.../patches/pg_config-cross-value.patch | 46 -----
srcpkgs/postgresql/template | 189 +++---------------
9 files changed, 30 insertions(+), 403 deletions(-)
create mode 120000 srcpkgs/postgresql-full
delete mode 100644 srcpkgs/postgresql/files/pg_config.sh.in
delete mode 100644 srcpkgs/postgresql/files/postgresql.confd
delete mode 100644 srcpkgs/postgresql/files/postgresql.pam
delete mode 100755 srcpkgs/postgresql/files/postgresql/control/t
delete mode 100755 srcpkgs/postgresql/files/postgresql/log/run
delete mode 100755 srcpkgs/postgresql/files/postgresql/run
delete mode 100644 srcpkgs/postgresql/patches/pg_config-cross-value.patch
diff --git a/srcpkgs/postgresql-full b/srcpkgs/postgresql-full
new file mode 120000
index 000000000000..360e6d1a1f45
--- /dev/null
+++ b/srcpkgs/postgresql-full
@@ -0,0 +1 @@
+postgresql
\ No newline at end of file
diff --git a/srcpkgs/postgresql/files/pg_config.sh.in b/srcpkgs/postgresql/files/pg_config.sh.in
deleted file mode 100644
index 4598753f6931..000000000000
--- a/srcpkgs/postgresql/files/pg_config.sh.in
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-# Released to Public Domain by Doan Tran Cong Danh
-
-print() {
- printf '%s\n' "$@"
-}
-
-sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
-
-BINDIR="$sysroot/usr/bin"
-DOCDIR="$sysroot/usr/share/doc/postgresql"
-HTMLDIR="$sysroot/usr/share/doc/postgresql"
-INCLUDEDIR="$sysroot/usr/include"
-PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
-INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
-LIBDIR="$sysroot/usr/lib"
-PKGLIBDIR="$sysroot/usr/lib/postgresql"
-LOCALEDIR="$sysroot/usr/share/locale"
-MANDIR="$sysroot/usr/share/man"
-SHAREDIR="$sysroot/usr/share/postgresql"
-SYSCONFDIR="$sysroot/etc/postgresql"
-PGXS="$sysroot/usr/lib/postgresql/pgxs/src/makefiles/pgxs.mk"
-
-CONFIGURE="@configure_args@"
-CC="@CC@"
-CPPFLAGS="@CPPFLAGS@"
-CFLAGS="@CFLAGS@"
-CFLAGS_SL="@CFLAGS_SL@"
-LDFLAGS="@LDFLAGS@"
-LDFLAGS_EX="@LDFLAGS_EX@"
-LDFLAGS_SL="@LDFLAGS_SL@"
-LIBS="@LIBS@"
-VERSION="PostgreSQL @VERSION@"
-
-if [ "$sysroot" != "/" ]; then
- CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/usr/include\\),-I$sysroot\\1,g")"
- CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/usr/include\\),-I$sysroot\\1,g")"
- LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/usr/lib\\),-L$sysroot\\1,g")"
-fi
-
-usage() {
- cat <<-EOF
- $0 provides information about the installed version of PostgreSQL.
-
- Usage:
- $0 [OPTION]...
-
- Options:
- --bindir show location of user executables
- --docdir show location of documentation files
- --htmldir show location of HTML documentation files
- --includedir show location of C header files of the client interfaces
- --pkgincludedir show location of other C header files
- --includedir-server show location of C header files for the server
- --libdir show location of object code libraries
- --pkglibdir show location of dynamically loadable modules
- --localedir show location of locale support files
- --mandir show location of manual pages
- --sharedir show location of architecture-independent support files
- --sysconfdir show location of system-wide configuration files
- --pgxs show location of extension makefile
- --configure show options given to PostgreSQL was built
- --cc show CC value used when PostgreSQL was built
- --cppflags show CPPFLAGS value used when PostgreSQL was built
- --cflags show CFLAGS value used when PostgreSQL was built
- --cflags_sl show CFLAGS_SL value used when PostgreSQL was built
- --ldflags show LDFLAGS value used when PostgreSQL was built
- --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built
- --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built
- --libs show LIBS value used when PostgreSQL was built
- --version show the PostgreSQL version
- -?, --help show this help, then exit
-
- With no arguments, all known items are shown.
-
- Report bugs to <pgsql-bugs@postgresql.org>.
- EOF
-}
-
-if test $# -eq 0; then
- cat <<-EOF
- BINDIR = $BINDIR
- DOCDIR = $DOCDIR
- HTMLDIR = $HTMLDIR
- INCLUDEDIR = $INCLUDEDIR
- PKGINCLUDEDIR = $PKGINCLUDEDIR
- INCLUDEDIR-SERVER = $INCLUDEDIR_SERVER
- LIBDIR = $LIBDIR
- PKGLIBDIR = $PKGLIBDIR
- LOCALEDIR = $LOCALEDIR
- MANDIR = $MANDIR
- SHAREDIR = $SHAREDIR
- SYSCONFDIR = $SYSCONFDIR
- PGXS = $PGXS
- CONFIGURE = $CONFIGURE
- CC = $CC
- CPPFLAGS = $CPPFLAGS
- CFLAGS = $CFLAGS
- CFLAGS_SL = $CFLAGS_SL
- LDFLAGS = $LDFLAGS
- LDFLAGS_EX = $LDFLAGS_EX
- LDFLAGS_SL = $LDFLAGS_SL
- LIBS = $LIBS
- VERSION = $VERSION
- EOF
-fi
-
-for arg
-do
- if test "x$arg" = "x--help" || test "x$arg" = "x-?"; then
- usage
- exit 0
- fi
-done
-
-for arg
-do
- case "$arg" in
- --bindir) print "$BINDIR" ;;
- --docdir) print "$DOCDIR" ;;
- --htmldir) print "$HTMLDIR" ;;
- --includedir) print "$INCLUDEDIR" ;;
- --pkgincludedir) print "$PKGINCLUDEDIR" ;;
- --includedir-server) print "$INCLUDEDIR_SERVER" ;;
- --libdir) print "$LIBDIR" ;;
- --pkglibdir) print "$PKGLIBDIR" ;;
- --localedir) print "$LOCALEDIR" ;;
- --mandir) print "$MANDIR" ;;
- --sharedir) print "$SHAREDIR" ;;
- --sysconfdir) print "$SYSCONFDIR" ;;
- --pgxs) print "$PGXS" ;;
- --configure) print "$CONFIGURE" ;;
- --cc) print "$CC" ;;
- --cppflags) print "$CPPFLAGS" ;;
- --cflags) print "$CFLAGS" ;;
- --cflags_sl) print "$CFLAGS_SL" ;;
- --ldflags) print "$LDFLAGS" ;;
- --ldflags_ex) print "$LDFLAGS_EX" ;;
- --ldflags_sl) print "$LDFLAGS_SL" ;;
- --libs) print "$LIBS" ;;
- --version) print "$VERSION" ;;
- esac
-done
diff --git a/srcpkgs/postgresql/files/postgresql.confd b/srcpkgs/postgresql/files/postgresql.confd
deleted file mode 100644
index 2a3cd1469b05..000000000000
--- a/srcpkgs/postgresql/files/postgresql.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration file for the PostgreSQL server.
-
-# PostgreSQL's database directory
-PGROOT="/var/lib/postgresql"
-
-# PostgreSQL's log file.
-PGLOG="/var/log/postgresql.log"
-
-# Passed to initdb if necessary
-INITOPTS="-A peer --auth-host=md5 --auth-local=peer --locale en_US.UTF-8"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these options
-# can be set directly in the configuration-file.
-#PGOPTS="-N 512 -B 1024"
diff --git a/srcpkgs/postgresql/files/postgresql.pam b/srcpkgs/postgresql/files/postgresql.pam
deleted file mode 100644
index 53724d1f86a7..000000000000
--- a/srcpkgs/postgresql/files/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/srcpkgs/postgresql/files/postgresql/control/t b/srcpkgs/postgresql/files/postgresql/control/t
deleted file mode 100755
index b0026e5661b4..000000000000
--- a/srcpkgs/postgresql/files/postgresql/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/kill -INT `/usr/bin/head -1 /run/runit/supervise.postgresql/pid`
diff --git a/srcpkgs/postgresql/files/postgresql/log/run b/srcpkgs/postgresql/files/postgresql/log/run
deleted file mode 100755
index e564447b60db..000000000000
--- a/srcpkgs/postgresql/files/postgresql/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres
diff --git a/srcpkgs/postgresql/files/postgresql/run b/srcpkgs/postgresql/files/postgresql/run
deleted file mode 100755
index 3982873cde69..000000000000
--- a/srcpkgs/postgresql/files/postgresql/run
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-. /etc/default/postgresql
-: ${PGDATA:="$PGROOT/data"}
-
-if [ "$PGROOT" != "/var/lib/postgresql" ]; then
- echo "Creating symlink /var/lib/postgresql -> $PGROOT"
-
- # Remove /var/lib/postgres if empty dir, but not if symlink
- if [ ! -L /var/lib/postgres ] && [ -d /var/lib/postgres ]; then
- rmdir /var/lib/postgres
- fi
-
- ln -sf "$PGROOT" /var/lib/postgresql
-fi
-
-
-if [ ! -d "$PGDATA" ]; then
- echo "Initializing database in $PGDATA"
-
- mkdir -p "$PGDATA"
- chown -R postgres:postgres "$PGDATA"
- chmod 0700 "$PGDATA"
- su - postgres -m -c "/usr/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null
-
- if [ -f /etc/postgresql/postgresql.conf ]; then
- ln -sf /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
- fi
-fi
-
-exec chpst -u postgres:postgres postgres -D "$PGDATA" $PGOPTS 2>&1
diff --git a/srcpkgs/postgresql/patches/pg_config-cross-value.patch b/srcpkgs/postgresql/patches/pg_config-cross-value.patch
deleted file mode 100644
index 214344520d7f..000000000000
--- a/srcpkgs/postgresql/patches/pg_config-cross-value.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Sources: Doan Tran Cong Danh
-Upstream: No
- - First part needs to be rework in configure script to be usable
- upstream
- - Second part would un-usable for Windows
-diff --git src/common/Makefile src/common/Makefile
-index ec04710..2af845f 100644
---- a/src/common/Makefile
-+++ b/src/common/Makefile
-@@ -22,11 +22,14 @@ include $(top_builddir)/src/Makefile.global
-
- # don't include subdirectory-path-dependent -I and -L switches
- STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
-+STD_CPPFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_CPPFLAGS))
-+STD_CFLAGS := $(subst @XBPS_SYSROOT@,,$(CFLAGS))
- STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
-+STD_LDFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_LDFLAGS))
- override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
- override CPPFLAGS += -DVAL_CC="\"$(CC)\""
- override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
--override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
-+override CPPFLAGS += -DVAL_CFLAGS="\"$(STD_CFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
- override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
-@@ -44,7 +47,19 @@ OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
-
- OBJS_SRV = $(OBJS_COMMON:%.o=%_srv.o)
-
--all: libpgcommon.a libpgcommon_srv.a
-+all: libpgcommon.a libpgcommon_srv.a pg_config.sh
-+
-+pg_config.sh: pg_config.sh.in
-+ sed -e "s/@configure_args@/$(subst /,\\/,$(configure_args))/" \
-+ -e "s/@CC@/$(subst /,\\/,$(CC))/" \
-+ -e "s/@CPPFLAGS@/$(subst /,\\/,$(STD_CPPFLAGS))/" \
-+ -e "s/@CFLAGS@/$(subst /,\\/,$(STD_CFLAGS))/" \
-+ -e "s/@CFLAGS_SL@/$(subst /,\\/,$(CFLAGS_SL))/" \
-+ -e "s/@LDFLAGS@/$(subst /,\\/,$(STD_LDFLAGS))/" \
-+ -e "s/@LDFLAGS_EX@/$(subst /,\\/,$(LDFLAGS_EX))/" \
-+ -e "s/@LDFLAGS_SL@/$(subst /,\\/,$(LDFLAGS_SL))/" \
-+ -e "s/@LIBS@/$(subst /,\\/,$(LIBS))/" \
-+ $< >$@
-
- # libpgcommon is needed by some contrib
- install: all installdirs
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index d9fcad13bbf8..4f539b0df9ff 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,191 +1,60 @@
# Template file for 'postgresql'
pkgname=postgresql
-version=9.6.24
+version=14
revision=1
-build_style=gnu-configure
-make_build_target=world
-configure_args="--with-openssl --with-python
- --with-pam --datadir=/usr/share/postgresql --enable-thread-safety
- --with-perl --with-tcl --without-ldap --without-gssapi --without-krb5
- --without-bonjour --with-libxml --with-libxslt --disable-rpath
- --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
-hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
- python-devel readline-devel tcl-devel"
-short_desc="Sophisticated open-source Object-Relational DBMS"
+build_style=meta
+depends="postgresql${version}"
+short_desc="PostgreSQL server meta package"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="PostgreSQL"
homepage="https://www.postgresql.org"
-changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
-distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=aeb7a196be3ebed1a7476ef565f39722187c108dd47da7489be9c4fcae982ace
-# initdb fails on github actions, works locally with xbps-uunshare
-make_check=ci-skip
-conf_files="
- /etc/default/${pkgname}
- /etc/pam.d/${pkgname}
- /etc/${pkgname}/${pkgname}.conf"
-
-# Create 'postgres' user for the server.
-system_accounts="postgres"
-postgres_homedir="/var/lib/${pkgname}"
-postgres_shell="/bin/sh"
-postgres_descr="PostgreSQL database server user"
-make_dirs="/var/lib/postgresql 0750 postgres postgres"
-
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" --without-perl --without-python --without-tcl"
+build_options="languages"
+desc_option_languages="Include procedural languages as dependency"
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="languages"
fi
-post_patch() {
- sed -e "s/@VERSION@/$version/" \
- "$FILESDIR"/pg_config.sh.in >src/common/pg_config.sh.in
- vsed -i -e "s,@XBPS_SYSROOT@,${XBPS_CROSS_BASE%/}," src/common/Makefile
-}
-
-pre_build() {
- # http://www.postgresql.org/docs/9.3/static/docguide-toolsets.html
- export SGML_CATALOG_FILES="/usr/share/sgml/openjade/catalog:/usr/share/sgml/iso8879/catalog:/usr/share/sgml/docbook/dsssl/modular/catalog:/usr/share/sgml/docbook/4.2/catalog"
-}
-
-post_build() {
- make -C contrib ${makejobs}
-}
-
-post_install() {
- make -C contrib install
-
- vmkdir usr/share/man
- cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
- vmkdir usr/share/doc/postgresql
- cp -r doc/src/sgml/html ${DESTDIR}/usr/share/doc/postgresql
- vsv postgresql
- vlicense COPYRIGHT
-
- vinstall ${FILESDIR}/${pkgname}.confd 644 etc/default ${pkgname}
- vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
- vinstall ${DESTDIR}/usr/share/${pkgname}/${pkgname}.conf.sample \
- 644 etc/${pkgname} ${pkgname}.conf
- vbin src/common/pg_config.sh
-
- sed -i 's/install_bin = .*/install_bin = install/g' \
- ${DESTDIR}/usr/lib/postgresql/pgxs/src/Makefile.global
-}
-
postgresql-doc_package() {
- short_desc="PostgreSQL documentation"
- pkg_install() {
- vmove usr/share/doc
- }
-}
-
-postgresql9.6-libs_package() {
- short_desc="PostgreSQL shared libraries"
- pkg_install() {
- vmove "usr/lib/*.so*"
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name libpq5\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-postgresql9.6-libs-devel_package() {
- depends="postgresql-libs>=$version"
- short_desc="PostgreSQL shared libraries (development files)"
- pkg_install() {
- for f in pg_config ecpg; do
- vmove usr/bin/${f}
- vmove "usr/share/man/man1/$(basename ${f})*"
- done
- vmove usr/bin/pg_config.sh
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/pkgconfig/*"
- vmove usr/share/man/man3
- vmove usr/lib/postgresql/pgxs
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name pg_config\* -o -name ecpg\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
+ depends="postgresql${version}-doc"
+ short_desc="PostgreSQL documentation meta package"
}
# XXX disabled for now in cross builds.
-if [ -z "$CROSS_BUILD" ]; then
+if [ "$build_option_languages" ]; then
postgresql-plperl_package() {
- depends="postgresql>=$version"
- short_desc="PL/Perl procedural language for PostgreSQL"
- pkg_install() {
- vmove "usr/lib/postgresql/plperl*"
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name plperl\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
+ depends="postgresql${version}-plperl"
+ short_desc="PL/Perl language meta package"
}
postgresql-plpython_package() {
- depends="postgresql>=$version"
- short_desc="PL/Python procedural language for PostgreSQL"
- pkg_install() {
- vmove "usr/lib/postgresql/plpython*"
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name plpython\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
+ depends="postgresql${version}-plpython"
+ short_desc="PL/Python language meta package"
}
postgresql-pltcl_package() {
- depends="postgresql>=$version"
- short_desc="PL/Tcl procedural language for PostgreSQL"
- pkg_install() {
- vmove "usr/bin/pltcl*"
- vmove "usr/lib/postgresql/pltcl*"
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name pltcl\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- vmove "usr/share/postgresql/*.pltcl"
- }
+ depends="postgresql${version}-pltcl"
+ short_desc="PL/Tcl language meta package"
}
-fi # !CROSS_BUILD
+fi # build_option_languages
postgresql-client_package() {
+ depends="postgresql${version}-client"
short_desc="Client frontends programs for PostgreSQL"
- pkg_install() {
- for f in clusterdb createdb createlang createuser dropdb droplang \
- dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \
- vacuumdb; do
- vmove usr/bin/${f}
- vmove usr/share/man/man1/$(basename ${f}).1
- done
- vmove usr/share/man/man7
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name pgscripts\* -o \
- -name psql\* -o \
- -name pg_dump\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- vmkdir usr/share/postgresql
- mv ${DESTDIR}/usr/share/postgresql/psqlrc.* \
- ${PKGDESTDIR}/usr/share/postgresql
- }
}
postgresql-contrib_package() {
+ depends="postgresql${version}-contrib"
short_desc="PostgreSQL contributed programs and extensions"
- pkg_install() {
- make -C contrib install DESTDIR=${PKGDESTDIR}
- }
+}
+
+postgresql-full() {
+ depends="postgresql postgresql-client postgresql-doc postgresql-contrib postgresql-libs"
+ short_desc="PostgreSQL all packages meta package"
+
+ if [ "$build_option_languages" ]; then
+ depends+=" postgresql-plpython postgresql-plperl postgresql-pltcl"
+ fi
}
From 821a82398ab12ca8fc124acbf33ed56e5fbbe8a8 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 4 Jul 2022 23:13:45 +0400
Subject: [PATCH 446/609] caja: update to 1.26.1.
---
srcpkgs/caja/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index 95167200cdb6..16d4ead32547 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -1,6 +1,6 @@
# Template file for 'caja'
pkgname=caja
-version=1.26.0
+version=1.26.1
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
changelog="https://raw.githubusercontent.com/mate-desktop/caja/master/NEWS"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a200a6fad3a5fbc70d10f8626788e2f4f31bde363649bc50a6bb8a85b2880ad4
+checksum=30fd6e6f00a38200f6e2e898ad7fa797876bb060f1d0341dd2f7393279e14c07
build_options="gir"
build_options_default="gir"
From 6baaa4d9299c3fdfed99c9f6e0c2e41c7980885a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 4 Jul 2022 22:11:56 +0200
Subject: [PATCH 447/609] spice-protocol: update to 0.14.4.
---
srcpkgs/spice-protocol/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/spice-protocol/template b/srcpkgs/spice-protocol/template
index 1ff8a7a0c25d..b80848814ec9 100644
--- a/srcpkgs/spice-protocol/template
+++ b/srcpkgs/spice-protocol/template
@@ -1,6 +1,6 @@
# Template file for 'spice-protocol'
pkgname=spice-protocol
-version=0.14.3
+version=0.14.4
revision=1
wrksrc="spice-protocol-v${version}"
build_style=meson
@@ -8,8 +8,9 @@ short_desc="SPICE protocol headers"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.spice-space.org/"
+changelog="https://gitlab.freedesktop.org/spice/spice-protocol/-/raw/master/CHANGELOG.md"
distfiles="https://gitlab.freedesktop.org/spice/spice-protocol/-/archive/v${version}/spice-protocol-v${version}.tar.gz"
-checksum=80ae89643e253dc5ddc5b2120cd3cf9d9565d00026ff261dd140d4b8c5deaa64
+checksum=9c31fa533ad531d1b816ffd0c24b4785d133e7bb397f72d35f7a6d59bcd7d53a
post_install() {
vlicense COPYING
From 1ccfbc2abdf9e3d34a7a8a3d5f76d095fc392d90 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 29 Jun 2022 18:18:06 +0200
Subject: [PATCH 448/609] terraform: update to 1.2.3.
---
srcpkgs/terraform/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index d5d886a99ec1..9ddd622d31a2 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
# Template file for 'terraform'
pkgname=terraform
-version=1.2.1
+version=1.2.3
revision=1
build_style=go
go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MPL-2.0"
homepage="https://www.terraform.io/"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=d244277c3b8d10afa8d130cfd9db3570995a03a34052952de1ab2368fc25ab1c
+checksum=0bc726b85e0ef7325f9cc525f6e57cba46ed24e23f7d7d3d0ed3df91811a4ac6
From 564fbe6455a04f2dc06095dad0eb0fbabb1fde06 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 29 Jun 2022 18:19:19 +0200
Subject: [PATCH 449/609] terragrunt: update to 0.38.2.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 6e18fd4d8be3..321c6033279a 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.38.1
+version=0.38.2
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=7c8b187a5a516e3e90467960c161c7ef20b105ac9c391ddde27b0cbf98b0ea4c
+checksum=8362c0e23f9547c3ff95454e8b4c7176b6d2d4273e5def8f50e6cab4604abe02
post_install() {
vlicense LICENSE.txt
From 34b532bd072fad35dd085aaf54404b037b247c48 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 4 Jul 2022 23:12:26 +0200
Subject: [PATCH 450/609] terraform: update to 1.2.4.
---
srcpkgs/terraform/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 9ddd622d31a2..aceae9264505 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
# Template file for 'terraform'
pkgname=terraform
-version=1.2.3
+version=1.2.4
revision=1
build_style=go
go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MPL-2.0"
homepage="https://www.terraform.io/"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0bc726b85e0ef7325f9cc525f6e57cba46ed24e23f7d7d3d0ed3df91811a4ac6
+checksum=7d2f50449ddf87b6207b435a661ff3d6e3a9342f64d747211da7a558f8483997
From 5c55e19e80050a7945e5366333dd6f7a7f8992e9 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Mon, 4 Jul 2022 23:53:29 +0530
Subject: [PATCH 451/609] variety: update to 0.8.9
---
srcpkgs/variety/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/variety/template b/srcpkgs/variety/template
index df2ef21744d0..c5c8fe0d109f 100644
--- a/srcpkgs/variety/template
+++ b/srcpkgs/variety/template
@@ -1,7 +1,7 @@
# Template file for 'variety'
pkgname=variety
-version=0.8.5
-revision=2
+version=0.8.9
+revision=1
build_style=python3-module
pycompile_dirs="usr/share/variety/plugins"
hostmakedepends="python3-distutils-extra intltool"
@@ -9,9 +9,9 @@ depends="ImageMagick gtk+3 libgexiv2 libnotify python3-BeautifulSoup4
python3-Pillow python3-configobj python3-curl python3-dbus python3-gobject
python3-httplib2 python3-lxml python3-requests"
short_desc="Changes the wallpaper on a regular interval"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Ishaan Bhimwal <ishaanbhimwal@protonmail.com>"
license="GPL-3.0-only"
homepage="https://peterlevi.com/variety/"
changelog="https://raw.githubusercontent.com/varietywalls/variety/master/data/ui/changes.txt"
distfiles="https://github.com/varietywalls/variety/archive/${version}.tar.gz"
-checksum=2298af592cdd5cc0c183582f74f39af74b07499074ea164a3a327d55c9338248
+checksum=bcb5d41e0903734c0ac1015b0e599bf99eb1975bcbdcbce623eb42d230532595
From 819f5ac9851c32c0b2f9f6ba4b2e130f6dee6465 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 3 Jul 2022 20:25:26 +0200
Subject: [PATCH 452/609] bird: update to 2.0.10
- change to a better mirror for source (this eliminates the need to
run autoreconf as it's done by upstream and a custom worksrc is not
needed either)
- remove patch for babel as it already is upstream
- add changelog
---
...bel-Fix-bug-in-iface-reconfiguration.patch | 29 -------------------
srcpkgs/bird/template | 16 ++++------
2 files changed, 6 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
diff --git a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch b/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
deleted file mode 100644
index bc809171e493..000000000000
--- a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fcb4dd0c831339c4374ace17d8f2ae6ebfeed279 Mon Sep 17 00:00:00 2001
-From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
-Date: Sun, 27 Feb 2022 03:10:38 +0100
-Subject: [PATCH] Babel: Fix bug in iface reconfiguration
-
-A recent change in Babel causes ifaces to disappear after
-reconfiguration. The patch fixes that.
-
-Thanks to Johannes Kimmel for an insightful bugreport.
----
- proto/babel/babel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proto/babel/babel.c b/proto/babel/babel.c
-index e43818f5..174fc9e2 100644
---- a/proto/babel/babel.c
-+++ b/proto/babel/babel.c
-@@ -1899,7 +1899,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
- struct babel_iface *ifa = babel_find_iface(p, iface);
- struct babel_iface_config *ic = (void *) iface_patt_find(&cf->iface_list, iface, NULL);
-
-- if (ic && iface_is_valid(p, iface))
-+ if (ic && !iface_is_valid(p, iface))
- ic = NULL;
-
- if (ifa && ic)
---
-2.35.1
-
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index f2351acd7286..e10b66e72742 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,27 +1,23 @@
# Template file for 'bird'
pkgname=bird
-version=2.0.9
-revision=2
-wrksrc=bird-v$version
+version=2.0.10
+revision=1
build_style=gnu-configure
-hostmakedepends="flex autoconf"
+hostmakedepends="flex"
makedepends="ncurses-devel readline-devel libssh-devel"
short_desc="BIRD Internet Routing Daemon"
maintainer="Philipp Hirsch <itself@hanspolo.net>"
license="GPL-2.0-or-later"
homepage="https://bird.network.cz"
-distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/v${version}/bird-v${version}.tar.gz"
-checksum=912d5c1bbefffd6198b10688ef6e16d0b9dfb2886944f481fc38b4d869ffd2c4
+changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
+distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
+checksum=7ed341ddd8dc87fa9736586b3515447a8436fec442d65f4022155ab9de1ffd5a
conf_files="/etc/bird.conf"
system_accounts="_bird"
CFLAGS="-fcommon"
-pre_configure() {
- autoreconf
-}
-
post_install() {
vsv bird
}
From c2fcf328eaf23020852d994ec3b868416a87fffd Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 5 Jul 2022 02:24:46 -0400
Subject: [PATCH 453/609] New package: wander-0.3.0
---
srcpkgs/wander/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/wander/template
diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
new file mode 100644
index 000000000000..c80c78c143f1
--- /dev/null
+++ b/srcpkgs/wander/template
@@ -0,0 +1,16 @@
+# Template file for 'wander'
+pkgname=wander
+version=0.3.0
+revision=1
+build_style=go
+go_import_path="github.com/robinovitch61/wander"
+short_desc="Terminal application for HashiCorp Nomad"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/robinovitch61/wander"
+distfiles="https://github.com/robinovitch61/wander/archive/refs/tags/v${version}.tar.gz"
+checksum=456a74eeebb25a39f9b8c57ccb186e6fc4ea8fbea6fb9623a7eb7180fff346fa
+
+post_install() {
+ vlicense LICENSE
+}
From 4543e5fbfac6560a5621d773a19353142629cfa9 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloi.torrentsj@gmail.com>
Date: Fri, 29 Apr 2022 12:55:53 +0200
Subject: [PATCH 454/609] New package: wvkbd-0.8.2
---
srcpkgs/wvkbd/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/wvkbd/template
diff --git a/srcpkgs/wvkbd/template b/srcpkgs/wvkbd/template
new file mode 100644
index 000000000000..a8f250b50487
--- /dev/null
+++ b/srcpkgs/wvkbd/template
@@ -0,0 +1,14 @@
+# Template file for 'wvkbd'
+pkgname=wvkbd
+version=0.8.2
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+hostmakedepends="wayland-devel pkg-config"
+makedepends="wayland-devel pango-devel libxkbcommon-devel"
+short_desc="On-screen keyboard for wlroots"
+maintainer="Eloi Torrents <eloi.torrentsj@gmail.com>"
+license=GPL-3.0-only
+homepage=https://github.com/jjsullivan5196/wvkbd
+distfiles=https://github.com/jjsullivan5196/wvkbd/archive/refs/tags/v${version}.tar.gz
+checksum=f9c689fce7e0b119b078d370385c868c5b579a4ec1e1b5610befa4b19c062e28
From 732355fe412e7b93ac5ef30e270f29c76a4f9b24 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Thu, 17 Mar 2022 17:12:58 +0100
Subject: [PATCH 455/609] lazygit: update to 0.34
---
srcpkgs/lazygit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 49001a5bbf1c..1f079bac8086 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
# Template file for 'lazygit'
pkgname=lazygit
-version=0.33
+version=0.34
revision=1
build_style=go
go_import_path=github.com/jesseduffield/lazygit
@@ -11,7 +11,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="MIT"
homepage="https://github.com/jesseduffield/lazygit"
distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=ff7ab429ecd54f6e2aedcfd4835eb8ca17c1990aac2534f8c2a19ce4267ade24
+checksum=f715ab86b219fd42462399459bfa1e04a5925268bff4839c4d96bd01264d6847
post_install() {
vlicense LICENSE
From 6f010a2f619f4954fb31c3093959866035aa9666 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 5 Jul 2022 06:25:04 +0200
Subject: [PATCH 456/609] lilypond: update to 2.23.10
---
srcpkgs/lilypond/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 150268070412..9a2acfcb0c88 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,7 +1,7 @@
# Template file for 'lilypond'
pkgname=lilypond
# should be kept in sync with 'lilypond-doc'
-version=2.23.9
+version=2.23.10
revision=1
build_wrksrc="build"
build_style="gnu-configure"
@@ -18,7 +18,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="https://lilypond.org/"
distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
-checksum=11204fab661a5324f55c607dc8f9363a47afc741563f8dc867cdd60c173b27db
+checksum=06ac963df1699598c62f4390b8fc95344a723a88af440c00f5201c4aa8958f68
python_version=3
make_check=ci-skip # ci fails, but all checks pass locally
From edb6a45463c7916dd41b908842f03bd898622062 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 5 Jul 2022 06:25:25 +0200
Subject: [PATCH 457/609] lilypond-doc: update to 2.23.10
---
srcpkgs/lilypond-doc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index 5d57ab78035f..ae03279b9230 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,7 +1,7 @@
# Template file for 'lilypond-doc'
pkgname=lilypond-doc
# should be kept in sync with 'lilypond'
-version=2.23.9
+version=2.23.10
revision=1
create_wrksrc=yes
short_desc="Documentation for the lilypond music engraving program"
@@ -9,7 +9,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="https://lilypond.org/"
distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz"
-checksum=519bdd88e0f347049db3b1d6ed71458c3b4781dc20bdd3c5be00c0fabb6160ba
+checksum=8927270ec2c2dff2e0984727543a467b49ff7cb3adfd98b81a15b51277bfba75
do_install() {
vmkdir usr
From cc60175a52cb6874a3fbbe1f733696b0f82c4dff Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 5 Jul 2022 10:54:16 +0200
Subject: [PATCH 458/609] google-chrome: update to 103.0.5060.114
---
srcpkgs/google-chrome/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ca37a425cffb..5ee9cf0017aa 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
# Template file for 'google-chrome'
pkgname=google-chrome
-version=103.0.5060.53
+version=103.0.5060.114
revision=1
_channel=stable
archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
_licenseUrl="https://www.google.com/intl/en/chrome/terms/"
distfiles="$_chromeUrl"
-checksum=d6bb13aad7c0a2b026b8b36d2e8a74f9bf66fe64610ce12fbbd23b4325699da7
+checksum=693a00987843bdba97d77a1d9f5a4b5ca9b77bdfd6f37cbffa315680adb5abe3
do_extract() {
mkdir -p ${DESTDIR}
From e771748b54ab3fb8e10c47af3b028209a9f92e57 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:20 +0200
Subject: [PATCH 459/609] python3-charset-normalizer: update to 2.1.0.
---
srcpkgs/python3-charset-normalizer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index 7c8809724b1b..da68e4107bac 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,6 +1,6 @@
# Template file for 'python3-charset-normalizer'
pkgname=python3-charset-normalizer
-version=2.0.12
+version=2.1.0
revision=1
wrksrc="charset_normalizer-$version"
build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://charset-normalizer.readthedocs.io/"
changelog="https://raw.githubusercontent.com/Ousret/charset_normalizer/master/CHANGELOG.md"
distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
-checksum=8dd3a1a5444741208d627993344516cb62909c8c3f5c55deaa5bee6a305ead7a
+checksum=0bfd977140480c2ee8905183d764a848f86e6d9aae8977692f1ecd609bb887bd
pre_check() {
vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg
From 2ad750d1557d45ff1203d82864bb77dbad4b6930 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:12 +0200
Subject: [PATCH 460/609] lagrange: update to 1.13.7.
---
srcpkgs/lagrange/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 67a38bc13d18..d2d16a3cb0ed 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
# Template file for 'lagrange'
pkgname=lagrange
-version=1.13.6
+version=1.13.7
revision=1
build_style=cmake
configure_args="-DTFDN_ENABLE_SSE41=NO"
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
homepage="https://gmi.skyjake.fi/lagrange/"
changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7a89e4e950d14cfebd2806de07c49eeeb79368091a68ca439795d0aba9e1aaa7
+checksum=7fe70d06cfa80fcf7122f1a537a2205d844dd6e9efcc4d6dd712861faa3f2e14
post_install() {
vlicense LICENSE.md
From 5f92c63c92a2e506deb9e91b4d972e9bec6fa142 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:14 +0200
Subject: [PATCH 461/609] pylint: update to 2.14.4.
---
srcpkgs/pylint/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e97c84202740..d4330581a009 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
# Template file for 'pylint'
pkgname=pylint
-version=2.14.2
+version=2.14.4
revision=1
build_style=python3-module
make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://www.pylint.org/"
changelog="https://raw.githubusercontent.com/PyCQA/pylint/main/doc/whatsnew/${version%.*.*}/${version%.*}/summary.rst"
distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=f7420e582f5852599f866e727071542801adbad59b5e93e61a0147e056e94bc7
+checksum=fdd513198ccdf96f8b9a70aca3eb80050edf87b433595c67784c0f9ddac80bb5
make_check=no # FIXME
post_install() {
From 1f2a033afb68c36fc353d01d51d18cff1a6e6025 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:30 +0200
Subject: [PATCH 462/609] xorg-server-xwayland: update to 22.1.2.
---
srcpkgs/xorg-server-xwayland/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index 9cb01b318ddb..5d5d8d5d1fbc 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
# Template file for 'xorg-server-xwayland'
pkgname=xorg-server-xwayland
-version=22.1.1
+version=22.1.2
revision=1
wrksrc="xserver-xwayland-$version"
build_style=meson
@@ -17,7 +17,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
homepage="https://xorg.freedesktop.org"
distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=42837e7b90e0d92aff4d7846f0609f8d3c0c6641bdd6add6e4e0c5c214371149
+checksum=410ad00442ca335c0e7ee587cecd4b8fde50ca9e08bd1a640c6d521dba42dc4a
make_check=no # needs xtest repository
post_install() {
From c975421d8c33418d4cf4f2379ec153c8a8cdf6ec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:29:32 -0700
Subject: [PATCH 463/609] gnome-recipes: update to 2.0.4
---
srcpkgs/gnome-recipes/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template
index 30f81ab265b6..5b87bb4ff935 100644
--- a/srcpkgs/gnome-recipes/template
+++ b/srcpkgs/gnome-recipes/template
@@ -1,8 +1,7 @@
# Template file for 'gnome-recipes'
pkgname=gnome-recipes
-version=2.0.2
-revision=3
-_libgd_hash=97a852cdf3d37776f9c98f730d7dcbbe995bdeb7
+version=2.0.4
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config git"
makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel
@@ -12,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Recipes"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1be9d2fcb7404a97aa029d2409880643f15071c37039247a6a4320e7478cd5fb
+checksum=b30e96985f66fe138a17189c77af44d34d0b4c859b304ebdb52033bc2cd3ffed
From 48945e7282c1593432c41c2ddf30e547e7b3d273 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 22 Jun 2022 15:12:12 -0700
Subject: [PATCH 464/609] musl: update realpath/readlink and add gettid
In some cases packages like bubblewrap call realpath() without /proc being
availiable, however musl's realpath used to require /proc. This was changed
in later versions of musl so we import those changes here.
This also adds gettid(). This function was added to later versions of musl and
removes the need to patch out calls to gettid() in various packages including,
for example, mutter.
---
srcpkgs/musl/patches/gettid.patch | 49 ++++
...tly_instead_of_using_procfs_readlink.patch | 219 ++++++++++++++++++
...in_readlink_syscall_with_zero_buffer.patch | 59 +++++
srcpkgs/musl/template | 2 +-
4 files changed, 328 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/patches/gettid.patch
create mode 100644 srcpkgs/musl/patches/implement_realpath_directly_instead_of_using_procfs_readlink.patch
create mode 100644 srcpkgs/musl/patches/work_around_linux_bug_in_readlink_syscall_with_zero_buffer.patch
diff --git a/srcpkgs/musl/patches/gettid.patch b/srcpkgs/musl/patches/gettid.patch
new file mode 100644
index 000000000000..bb8bf5905b88
--- /dev/null
+++ b/srcpkgs/musl/patches/gettid.patch
@@ -0,0 +1,49 @@
+From d49cf07541bb54a5ac7aec1feec8514db33db8ea Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 17 Aug 2020 20:12:53 -0400
+Subject: [PATCH] add gettid function
+
+this is a prerequisite for addition of other interfaces that use
+kernel tids, including futex and SIGEV_THREAD_ID.
+
+there is some ambiguity as to whether the semantic return type should
+be int or pid_t. either way, futex API imposes a contract that the
+values fit in int (excluding some upper reserved bits). glibc used
+pid_t, so in the interest of not having gratuitous mismatch (the
+underlying types are the same anyway), pid_t is used here as well.
+
+while conceptually this is a syscall, the copy stored in the thread
+structure is always valid in all contexts where it's valid to call
+libc functions, so it's used to avoid the syscall.
+---
+ include/unistd.h | 1 +
+ src/linux/gettid.c | 8 ++++++++
+ 2 files changed, 9 insertions(+)
+ create mode 100644 src/linux/gettid.c
+
+diff --git a/include/unistd.h b/include/unistd.h
+index 7bcbff943..07584a23e 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -190,6 +190,7 @@ int syncfs(int);
+ int euidaccess(const char *, int);
+ int eaccess(const char *, int);
+ ssize_t copy_file_range(int, off_t *, int, off_t *, size_t, unsigned);
++pid_t gettid(void);
+ #endif
+
+ #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+diff --git a/src/linux/gettid.c b/src/linux/gettid.c
+new file mode 100644
+index 000000000..70767137e
+--- /dev/null
++++ b/src/linux/gettid.c
+@@ -0,0 +1,8 @@
++#define _GNU_SOURCE
++#include <unistd.h>
++#include "pthread_impl.h"
++
++pid_t gettid(void)
++{
++ return __pthread_self()->tid;
++}
diff --git a/srcpkgs/musl/patches/implement_realpath_directly_instead_of_using_procfs_readlink.patch b/srcpkgs/musl/patches/implement_realpath_directly_instead_of_using_procfs_readlink.patch
new file mode 100644
index 000000000000..569a1f52c7cd
--- /dev/null
+++ b/srcpkgs/musl/patches/implement_realpath_directly_instead_of_using_procfs_readlink.patch
@@ -0,0 +1,219 @@
+From 29ff7599a448232f2527841c2362643d246cee36 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 30 Nov 2020 12:14:47 -0500
+Subject: [PATCH] implement realpath directly instead of using procfs readlink
+
+inability to use realpath in chroot/container without procfs access
+and at early boot prior to mount of /proc has been an ongoing issue,
+and it turns out realpath was one of the last remaining interfaces
+that needed procfs for its core functionality. during investigation
+while reimplementing, it was determined that there were also serious
+problems with the procfs-based implementation. most seriously it was
+unsafe on pre-O_PATH kernels, and unlike other places where O_PATH was
+used, the unsafety was hard or impossible to fix because O_NOFOLLOW
+can't be used (since the whole purpose was to follow symlinks).
+
+the new implementation is a direct one, performing readlink on each
+path component to resolve it. an explicit stack, as opposed to
+recursion, is used to represent the remaining components to be
+processed. the stack starts out holding just the input string, and
+reading a link pushes the link contents onto the stack.
+
+unlike many other implementations, this one does not call getcwd
+initially for relative pathnames. instead it accumulates initial ..
+components to be applied to the working directory if the result is
+still a relative path. this avoids calling getcwd (which may fail) at
+all when symlink traversal will eventually yield an absolute path. it
+also doesn't use any form of stat operation; instead it arranges for
+readlink to tell it when a non-directory is used in a context where a
+directory is needed. this minimizes the number of syscalls needed,
+avoids accessing inodes when the directory table suffices, and reduces
+the amount of code pulled in for static linking.
+---
+ src/misc/realpath.c | 159 +++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 136 insertions(+), 23 deletions(-)
+
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59d..db8b74dc8 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++ const char *s0 = s;
++ while (*s == '/') s++;
++ return s-s0;
++}
+
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+- int fd;
+- ssize_t r;
+- struct stat st1, st2;
+- char buf[15+3*sizeof(int)];
+- char tmp[PATH_MAX];
++ char stack[PATH_MAX+1];
++ char output[PATH_MAX];
++ size_t p, q, l, l0, cnt=0, nup=0;
++ int check_dir=0;
+
+ if (!filename) {
+ errno = EINVAL;
+ return 0;
+ }
++ l = strnlen(filename, sizeof stack);
++ if (!l) {
++ errno = ENOENT;
++ return 0;
++ }
++ if (l >= PATH_MAX) goto toolong;
++ p = sizeof stack - l - 1;
++ q = 0;
++ memcpy(stack+p, filename, l+1);
++
++ /* Main loop. Each iteration pops the next part from stack of
++ * remaining path components and consumes any slashes that follow.
++ * If not a link, it's moved to output; if a link, contents are
++ * pushed to the stack. */
++restart:
++ for (; ; p+=slash_len(stack+p)) {
++ /* If stack starts with /, the whole component is / or //
++ * and the output state must be reset. */
++ if (stack[p] == '/') {
++ check_dir=0;
++ nup=0;
++ q=0;
++ output[q++] = '/';
++ p++;
++ /* Initial // is special. */
++ if (stack[p] == '/' && stack[p+1] != '/')
++ output[q++] = '/';
++ continue;
++ }
++
++ char *z = __strchrnul(stack+p, '/');
++ l0 = l = z-(stack+p);
+
+- fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+- if (fd < 0) return 0;
+- __procfdname(buf, fd);
++ if (!l && !check_dir) break;
+
+- r = readlink(buf, tmp, sizeof tmp - 1);
+- if (r < 0) goto err;
+- tmp[r] = 0;
++ /* Skip any . component but preserve check_dir status. */
++ if (l==1 && stack[p]=='.') {
++ p += l;
++ continue;
++ }
+
+- fstat(fd, &st1);
+- r = stat(tmp, &st2);
+- if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+- if (!r) errno = ELOOP;
+- goto err;
++ /* Copy next component onto output at least temporarily, to
++ * call readlink, but wait to advance output position until
++ * determining it's not a link. */
++ if (q && output[q-1] != '/') {
++ if (!p) goto toolong;
++ stack[--p] = '/';
++ l++;
++ }
++ if (q+l >= PATH_MAX) goto toolong;
++ memcpy(output+q, stack+p, l);
++ output[q+l] = 0;
++ p += l;
++
++ int up = 0;
++ if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++ up = 1;
++ /* Any non-.. path components we could cancel start
++ * after nup repetitions of the 3-byte string "../";
++ * if there are none, accumulate .. components to
++ * later apply to cwd, if needed. */
++ if (q <= 3*nup) {
++ nup++;
++ q += l;
++ continue;
++ }
++ /* When previous components are already known to be
++ * directories, processing .. can skip readlink. */
++ if (!check_dir) goto skip_readlink;
++ }
++ ssize_t k = readlink(output, stack, p);
++ if (k==p) goto toolong;
++ if (!k) {
++ errno = ENOENT;
++ return 0;
++ }
++ if (k<0) {
++ if (errno != EINVAL) return 0;
++skip_readlink:
++ check_dir = 0;
++ if (up) {
++ while(q && output[q-1]!='/') q--;
++ if (q>1 && (q>2 || output[0]!='/')) q--;
++ continue;
++ }
++ if (l0) q += l;
++ check_dir = stack[p];
++ continue;
++ }
++ if (++cnt == SYMLOOP_MAX) {
++ errno = ELOOP;
++ return 0;
++ }
++
++ /* If link contents end in /, strip any slashes already on
++ * stack to avoid /->// or //->/// or spurious toolong. */
++ if (stack[k-1]=='/') while (stack[p]=='/') p++;
++ p -= k;
++ memmove(stack+p, stack, k);
++
++ /* Skip the stack advancement in case we have a new
++ * absolute base path. */
++ goto restart;
+ }
+
+- __syscall(SYS_close, fd);
+- return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+- __syscall(SYS_close, fd);
++ output[q] = 0;
++
++ if (output[0] != '/') {
++ if (!getcwd(stack, sizeof stack)) return 0;
++ l = strlen(stack);
++ /* Cancel any initial .. components. */
++ p = 0;
++ while (nup--) {
++ while(l>1 && stack[l-1]!='/') l--;
++ if (l>1) l--;
++ p += 2;
++ if (p<q) p++;
++ }
++ if (q-p && stack[l-1]!='/') stack[l++] = '/';
++ if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++ memmove(output + l, output + p, q - p + 1);
++ memcpy(output, stack, l);
++ q = l + q-p;
++ }
++
++ if (resolved) return memcpy(resolved, output, q+1);
++ else return strdup(output);
++
++toolong:
++ errno = ENAMETOOLONG;
+ return 0;
+ }
diff --git a/srcpkgs/musl/patches/work_around_linux_bug_in_readlink_syscall_with_zero_buffer.patch b/srcpkgs/musl/patches/work_around_linux_bug_in_readlink_syscall_with_zero_buffer.patch
new file mode 100644
index 000000000000..3286432ebea2
--- /dev/null
+++ b/srcpkgs/musl/patches/work_around_linux_bug_in_readlink_syscall_with_zero_buffer.patch
@@ -0,0 +1,59 @@
+From e2fa720be7024cce4fc489f3877476d35da48ee2 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 23 Nov 2020 19:44:19 -0500
+Subject: [PATCH] work around linux bug in readlink syscall with zero buffer
+ size
+
+linux fails with EINVAL when a zero buffer size is passed to the
+syscall. this is non-conforming because POSIX already defines EINVAL
+with a significantly different meaning: the target is not a symlink.
+
+since the request is semantically valid, patch it up by using a dummy
+buffer of length one, and truncating the return value to zero if it
+succeeds.
+---
+ src/unistd/readlink.c | 11 +++++++++--
+ src/unistd/readlinkat.c | 9 ++++++++-
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d5249..32f4537f9 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++ char dummy[1];
++ if (!bufsize) {
++ buf = dummy;
++ bufsize = 1;
++ }
+ #ifdef SYS_readlink
+- return syscall(SYS_readlink, path, buf, bufsize);
++ int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+- return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++ int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++ if (buf == dummy && r > 0) r = 0;
++ return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5a..f79d3d142 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+- return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++ char dummy[1];
++ if (!bufsize) {
++ buf = dummy;
++ bufsize = 1;
++ }
++ int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++ if (buf == dummy && r > 0) r = 0;
++ return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..5bdc5c48e623 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=9
+revision=10
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
From 0792a4c47139a96e0cefa43c533c6212a1f3181e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 20 Jun 2022 15:49:33 -0700
Subject: [PATCH 465/609] bubblewrap: update to 0.6.2
realpath patch is not necessary, the fix was backported to the musl
package in 4be91660ff6a61529677f08bc1abd1479c674c07
---
.../patches/realpath-workaround.patch | 249 ------------------
srcpkgs/bubblewrap/template | 14 +-
2 files changed, 4 insertions(+), 259 deletions(-)
delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null 2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath 2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+ The Regents of the University of California. All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+ notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+ notice, this list of conditions and the following disclaimer in the
-+ documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+ may be used to endorse or promote products derived from this software
-+ without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c 2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c 2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
-
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+ struct stat sb;
-+ int idx = 0, nlnk = 0;
-+ const char *q;
-+ char *p, wbuf[2][MAXPATHLEN], *fres;
-+ size_t len;
-+ ssize_t n;
-+
-+ /* POSIX sez we must test for this */
-+ if (path == NULL) {
-+ errno = EINVAL;
-+ return NULL;
-+ }
-+
-+ if (resolved == NULL) {
-+ fres = resolved = malloc(MAXPATHLEN);
-+ if (resolved == NULL)
-+ return NULL;
-+ } else
-+ fres = NULL;
-+
-+
-+ /*
-+ * Build real path one by one with paying an attention to .,
-+ * .. and symbolic link.
-+ */
-+
-+ /*
-+ * `p' is where we'll put a new component with prepending
-+ * a delimiter.
-+ */
-+ p = resolved;
-+
-+ if (*path == '\0') {
-+ *p = '\0';
-+ errno = ENOENT;
-+ goto out;
-+ }
-+
-+ /* If relative path, start from current working directory. */
-+ if (*path != '/') {
-+ /* check for resolved pointer to appease coverity */
-+ if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+ p[0] = '.';
-+ p[1] = '\0';
-+ goto out;
-+ }
-+ len = strlen(resolved);
-+ if (len > 1)
-+ p += len;
-+ }
-+
-+loop:
-+ /* Skip any slash. */
-+ while (*path == '/')
-+ path++;
-+
-+ if (*path == '\0') {
-+ if (p == resolved)
-+ *p++ = '/';
-+ *p = '\0';
-+ return resolved;
-+ }
-+
-+ /* Find the end of this component. */
-+ q = path;
-+ do
-+ q++;
-+ while (*q != '/' && *q != '\0');
-+
-+ /* Test . or .. */
-+ if (path[0] == '.') {
-+ if (q - path == 1) {
-+ path = q;
-+ goto loop;
-+ }
-+ if (path[1] == '.' && q - path == 2) {
-+ /* Trim the last component. */
-+ if (p != resolved)
-+ while (*--p != '/')
-+ continue;
-+ path = q;
-+ goto loop;
-+ }
-+ }
-+
-+ /* Append this component. */
-+ if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+ errno = ENAMETOOLONG;
-+ if (p == resolved)
-+ *p++ = '/';
-+ *p = '\0';
-+ goto out;
-+ }
-+ p[0] = '/';
-+ memcpy(&p[1], path,
-+ /* LINTED We know q > path. */
-+ q - path);
-+ p[1 + q - path] = '\0';
-+
-+ /*
-+ * If this component is a symlink, toss it and prepend link
-+ * target to unresolved path.
-+ */
-+ if (lstat(resolved, &sb) == -1)
-+ goto out;
-+
-+ if (S_ISLNK(sb.st_mode)) {
-+ if (nlnk++ >= MAXSYMLINKS) {
-+ errno = ELOOP;
-+ goto out;
-+ }
-+ n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+ if (n < 0)
-+ goto out;
-+ if (n == 0) {
-+ errno = ENOENT;
-+ goto out;
-+ }
-+
-+ /* Append unresolved path to link target and switch to it. */
-+ if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+ errno = ENAMETOOLONG;
-+ goto out;
-+ }
-+ memcpy(&wbuf[idx][n], q, len + 1);
-+ path = wbuf[idx];
-+ idx ^= 1;
-+
-+ /* If absolute symlink, start from root. */
-+ if (*path == '/')
-+ p = resolved;
-+ goto loop;
-+ }
-+ if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+ errno = ENOTDIR;
-+ goto out;
-+ }
-+
-+ /* Advance both resolved and unresolved path. */
-+ p += 1 + q - path;
-+ path = q;
-+ goto loop;
-+out:
-+ free(fres);
-+ return NULL;
-+}
-+#endif
-
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
-
- /* The mount operation will resolve any symlinks in the destination
- path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
- resolved_dest = realpath (dest, NULL);
-- if (resolved_dest == NULL)
-+#else
-+ resolved_dest = realpath_int (dest, NULL);
-+#endif
-+ if (resolved_dest == NULL) {
- return 2;
-+ }
-
- mount_tab = parse_mountinfo (proc_fd, resolved_dest);
- if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..85e07d0e4d8a 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,8 +1,8 @@
# Template file for 'bubblewrap'
pkgname=bubblewrap
-version=0.4.1
-revision=2
-build_style=gnu-configure
+version=0.6.2
+revision=1
+build_style=meson
hostmakedepends="libxslt docbook-xsl pkg-config"
makedepends="libcap-devel"
short_desc="Unprivileged sandboxing tool"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/containers/bubblewrap"
distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- vlicense LICENSE.realpath
- fi
-}
+checksum=8a0ec802d1b3e956c5bb0a40a81c9ce0b055a31bf30a8efa547433603b8af20b
From 3609fbd9802d97633cab9039deff9baac000fbb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 22:15:18 -0700
Subject: [PATCH 466/609] gspell: update to 1.11.1.
---
srcpkgs/gspell/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index 00b40406ffc5..ac19b14b08da 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,7 +1,7 @@
# Template file for 'gspell'
pkgname=gspell
-version=1.9.1
-revision=2
+version=1.11.1
+revision=1
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static $(vopt_enable gir introspection)
@@ -14,19 +14,18 @@ short_desc="Flexible API to add spell checking to a GTK+ application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gspell"
+changelog="https://gitlab.gnome.org/GNOME/gspell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd
+checksum=ef6aa4e3f711775158a7e241a5f809cf2426bc0e02c23a7d2b5c71fc3de00292
+make_check_pre="xvfb-run"
# Package build options
build_options="gir vala"
build_options_default="gir vala"
-pre_check() {
- make_cmd='xvfb-run make check'
-}
-
gspell-devel_package() {
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ depends="libglib-devel enchant2-devel gtk+3-devel icu-devel
+ ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 08492c9589a78f7e4e8b221bfa8c03fa24451548 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 12:47:39 -0700
Subject: [PATCH 467/609] ghex: update to 42.3
---
common/shlibs | 2 +-
srcpkgs/ghex/template | 29 +++++++++++++++++++++--------
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7e4bcbef47f7..a5f385f719b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1566,7 +1566,7 @@ libmediaart-2.0.so.0 libmediaart-1.9.1_1
libinput.so.10 libinput-1.2.0_1
libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
-libgtkhex-3.so.0 libgtkhex-3.10.0_1
+libgtkhex-4.so.0 libgtkhex-42.1_1
libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
libdmraid.so.1 dmraid-1.0.0.rc16.3_5
libdovecot.so.0 dovecot-2.3.13_3
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index e11080c647fd..8e8387f9e090 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -1,17 +1,25 @@
# Template file for 'ghex'
pkgname=ghex
-version=3.18.4
+version=42.3
revision=1
build_style=meson
-hostmakedepends="pkg-config gtk-update-icon-cache intltool itstool glib-devel"
-makedepends="gtk+3-devel iso-codes glib-devel"
+build_helper=gir
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="pkg-config iso-codes gettext itstool glib-devel
+ desktop-file-utils $(vopt_if gtk_doc gi-docgen)"
+makedepends="gtk4-devel"
depends="hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Simple binary editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, GFDL-1.1-only"
-homepage="http://www.gnome.org"
+homepage="https://gitlab.gnome.org/GNOME/ghex"
+changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-42/NEWS"
distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-$version.tar.xz"
-checksum=c2d9c191ff5bce836618779865bee4059db81a3a0dff38bda3cc7a9e729637c0
+checksum=add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
libgtkhex_package() {
short_desc+=" - runtime library"
@@ -19,14 +27,19 @@ libgtkhex_package() {
vmove usr/lib/*.so.*
}
}
+
ghex-devel_package() {
- depends="gtk+3-devel libgtkhex>=${version}_${revision}"
+ depends="gtk4-devel libgtkhex>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.so
- #vmove usr/share/gtk-doc
- #vmove usr/share/ghex/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/doc
+ fi
}
}
From 5a5d9e6833959531073b6cdd8df0ba49d5a5c11f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 12:49:03 -0700
Subject: [PATCH 468/609] nemiver: remove ghex dependency
doesn't work with libgtkhex-4
---
srcpkgs/nemiver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template
index 947ef8352a17..67ada9d02dc7 100644
--- a/srcpkgs/nemiver/template
+++ b/srcpkgs/nemiver/template
@@ -1,12 +1,12 @@
# Template file for 'nemiver'
pkgname=nemiver
version=0.9.6
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --enable-gsettings=yes
--disable-schemas-install --disable-schemas-compile"
hostmakedepends="pkg-config gdb intltool itstool glib-devel"
-makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel ghex-devel
+makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel
gtksourceviewmm-devel vte3-devel gsettings-desktop-schemas-devel
libgdlmm-devel"
depends="gdb gsettings-desktop-schemas"
@@ -14,7 +14,7 @@ short_desc="Graphical front-end for gdb"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://wiki.gnome.org/Apps/Nemiver"
-distfiles="https://download.gnome.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2
lib32disabled=yes
From 2a587f7266da3d0022a3faff6af44ed4cb4635aa Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 22 Apr 2022 01:36:09 -0700
Subject: [PATCH 469/609] New package: gnome-connections-42.1.2
---
srcpkgs/gnome-connections/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/gnome-connections/template
diff --git a/srcpkgs/gnome-connections/template b/srcpkgs/gnome-connections/template
new file mode 100644
index 000000000000..69ea64b19d1f
--- /dev/null
+++ b/srcpkgs/gnome-connections/template
@@ -0,0 +1,16 @@
+# Template file for 'gnome-connections'
+pkgname=gnome-connections
+version=42.1.2
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="pkg-config gettext itstool vala desktop-file-utils glib-devel"
+makedepends="gtk+3-devel libhandy1-devel gtk-vnc-devel libgcrypt-devel
+ gnutls-devel libsasl-devel libsecret-devel freerdp-devel"
+short_desc="Remote desktop client for the GNOME desktop environment"
+maintainer="oreo6391 <oreo6391@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/connections/"
+changelog="https://gitlab.gnome.org/GNOME/connections/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/gnome-connections/${version%.*.*}/gnome-connections-${version}.tar.xz"
+checksum=d8e6e72741091d892dfc84281f625551d0568cd482d48db58a4edb8afa1377b6
From e44d6c8f97678e98bc70fe45857602eac3d71fb4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 14:06:01 +0200
Subject: [PATCH 470/609] ghex: fix cross
---
srcpkgs/ghex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index 8e8387f9e090..ac3080f2baf1 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -7,7 +7,7 @@ build_helper=gir
configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="pkg-config iso-codes gettext itstool glib-devel
- desktop-file-utils $(vopt_if gtk_doc gi-docgen)"
+ desktop-file-utils gtk-update-icon-cache $(vopt_if gtk_doc gi-docgen)"
makedepends="gtk4-devel"
depends="hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Simple binary editor for GNOME"
From cd7b17469e678a541cfdfb99e1a70f8210ddbce9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 14:15:15 +0200
Subject: [PATCH 471/609] ghex: fix docs cross
---
srcpkgs/ghex/template | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index ac3080f2baf1..6d9b98d886ab 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -21,6 +21,13 @@ checksum=add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
+pre_build() {
+ # help gi-docgen find gi files on cross
+ if [ -n "$CROSS_BUILD" ]; then
+ export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+ fi
+}
+
libgtkhex_package() {
short_desc+=" - runtime library"
pkg_install() {
From b254518800fb34f7bbc23d8869c7eb6d8d74d8ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 14:44:53 +0200
Subject: [PATCH 472/609] gtk4: update to 4.6.6.
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 5e2837806d37..a0c39ac378ed 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
# Template file for 'gtk4'
pkgname=gtk4
-version=4.6.5
+version=4.6.6
revision=1
wrksrc="gtk-${version}"
build_style=meson
@@ -29,7 +29,7 @@ license="LGPL-2.1-or-later"
homepage="https://www.gtk.org/"
changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS"
distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=fa42c371f49c90916711e15591d87d4bee4438c27bf0692715581807628be9c2
+checksum=7bbfe4d13569f7c297ed49834ac7263e318b7bf102d3271cb466d5971f59ae70
# Package build options
build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
From 07c663d2d1739a512a208d2529e8c6e0bb6a2b2a Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Tue, 5 Jul 2022 20:01:03 +0530
Subject: [PATCH 473/609] ltris: update to 1.2.5
---
srcpkgs/ltris/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index 80d9f0a9f455..b9e449fc5051 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -1,6 +1,6 @@
# Template file for 'ltris'
pkgname=ltris
-version=1.2.4
+version=1.2.5
revision=1
build_style=gnu-configure
configure_args="--localstatedir=/var/games/ltris"
@@ -11,6 +11,6 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
license="GPL-2.0-or-later"
homepage="http://lgames.sourceforge.net/index.php?project=LTris"
distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
-checksum=d6eb7b301023278604d9292a92f2fd2f5103ee412a75a126d2550e2ec2368f83
+checksum=2ac6f94dd40c4c4cda25f8c756182adbb75216f67152735443a3a9014fb1c333
nocheckperms=yes # uses a world-writable .hscr file for global leaderboard
CFLAGS+=" -fgnu89-inline"
From 00c1f7c3eb62839dac2e6d4595b6cd871bb6fb9e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 5 Jul 2022 20:01:14 +0530
Subject: [PATCH 474/609] xarchiver: update to 0.5.4.18.
---
srcpkgs/xarchiver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index 052082720174..56c781bea0dd 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,6 +1,6 @@
# Template file for 'xarchiver'
pkgname=xarchiver
-version=0.5.4.17
+version=0.5.4.18
revision=1
build_style=gnu-configure
configure_args="--disable-doc --enable-gtk2=no"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/ib/xarchiver"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=fec755ffbd50e3575bd2497c755e9fe93265c5735f20de03328485f57d1123e2
+checksum=639889e052aad60c4a4ecacd607de3128ab765686570e93d954171ffdc22333e
From 4c172023c4308cfcbce9fc9e2fc4569f79a5c5c5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 5 Jul 2022 02:51:30 +0300
Subject: [PATCH 475/609] zimg: update to 3.0.4.
---
srcpkgs/zimg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zimg/template b/srcpkgs/zimg/template
index 3f2f7291d0aa..63f693b06954 100644
--- a/srcpkgs/zimg/template
+++ b/srcpkgs/zimg/template
@@ -1,6 +1,6 @@
# Template file for 'zimg'
pkgname=zimg
-version=3.0.3
+version=3.0.4
revision=1
wrksrc=zimg-release-${version}
build_style=gnu-configure
@@ -11,7 +11,7 @@ license="WTFPL"
homepage="https://github.com/sekrit-twc/zimg"
changelog="https://raw.githubusercontent.com/sekrit-twc/zimg/master/ChangeLog"
distfiles="https://github.com/sekrit-twc/zimg/archive/release-${version}.tar.gz"
-checksum=5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7
+checksum=219d1bc6b7fde1355d72c9b406ebd730a4aed9c21da779660f0a4c851243e32f
case "$XBPS_TARGET_MACHINE" in
armv7*) configure_args+=" --disable-simd";;
From aaaf3067974a7ddae4e6dfca698b02a7be29bd98 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Tue, 5 Jul 2022 19:52:33 +0530
Subject: [PATCH 476/609] cloc: update to 1.94
---
srcpkgs/cloc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index e5a24140afc5..91bf040e3b9f 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,6 +1,6 @@
# Template file for 'cloc'
pkgname=cloc
-version=1.92
+version=1.94
revision=1
hostmakedepends="perl"
depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/AlDanial/cloc"
distfiles="https://github.com/AlDanial/cloc/archive/v${version}.tar.gz"
-checksum=b5f18f4dbc05eff08ada215b6c2a8cbdab397e9b4b4e25c7427d4ed86fb6e248
+checksum=c835fe343e1c25194a61eb74d7a36e98413682ed0c3b4d6b8e35a327077bf926
do_build() {
make -C Unix man
From 63e5178acf31be17cbcd9140396406eb877e5288 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 4 Jul 2022 23:54:19 -0400
Subject: [PATCH 477/609] texlab: update to 4.2.0
---
srcpkgs/texlab/patches/no-rustfmt.patch | 13 -------------
srcpkgs/texlab/template | 4 ++--
2 files changed, 2 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/texlab/patches/no-rustfmt.patch
diff --git a/srcpkgs/texlab/patches/no-rustfmt.patch b/srcpkgs/texlab/patches/no-rustfmt.patch
deleted file mode 100644
index 7b82bc0f5e9d..000000000000
--- a/srcpkgs/texlab/patches/no-rustfmt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Ignore rustfmt check because we don't have it packaged
-diff --git a/tests/integration/dev.rs b/tests/integration/dev.rs
-index 7ba1e93d0c..92807b3124 100644
---- a/tests/integration/dev.rs
-+++ b/tests/integration/dev.rs
-@@ -2,6 +2,7 @@ use std::process::{Command, Stdio};
-
- use anyhow::Result;
-
-+#[ignore]
- #[test]
- fn rustfmt() -> Result<()> {
- let success = Command::new("cargo")
diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 732e846cefc4..b2c001be5331 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
# Template file for 'texlab'
pkgname=texlab
-version=4.1.0
+version=4.2.0
revision=1
build_style=cargo
short_desc="Implementation of the Language Server Protocol for LaTeX"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
homepage="https://texlab.netlify.app/"
changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz"
-checksum=f7b5300c6fc93d7c339c755c67ea84f9c5daced2fb2735545d01a67ccf2ff770
+checksum=fd7cc35c63e041b7947d31eb321669736edc900a71c31c53f5d5b7841273d494
if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
broken="smartstring fails to compile"
From b10470360bc3fb9a0a5390911ba4bed35fff3a9e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 4 Jul 2022 19:03:52 -0700
Subject: [PATCH 478/609] bemenu: update to 0.6.9
---
srcpkgs/bemenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 976318e83361..a0515da000a9 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,6 +1,6 @@
# Template file for 'bemenu'
pkgname=bemenu
-version=0.6.8
+version=0.6.9
revision=1
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -13,7 +13,7 @@ maintainer="Issam Maghni <me@concati.me>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/Cloudef/bemenu"
distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
-checksum=d68c0c35c63c1dc26e3f2e67be1008f1f66a1ecdf7d3c9ccb261523175f22156
+checksum=9cca8674ac719104333691a6298838d934bf26c5bf8624e89985c9ba6bec30a4
bemenu-devel_package() {
depends="bemenu-${version}_${revision}"
From 7f48835abd4ec5574560c84c35fc2a888adc88e6 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 5 Jul 2022 02:57:14 +0300
Subject: [PATCH 479/609] python3-xdg: update to 0.28.
---
srcpkgs/python3-xdg/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-xdg/template b/srcpkgs/python3-xdg/template
index a206480fd45d..fe13e8feae09 100644
--- a/srcpkgs/python3-xdg/template
+++ b/srcpkgs/python3-xdg/template
@@ -1,7 +1,7 @@
# Template file for 'python3-xdg'
pkgname=python3-xdg
-version=0.27
-revision=2
+version=0.28
+revision=1
wrksrc="pyxdg-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-only"
homepage="https://freedesktop.org/Software/pyxdg"
distfiles="${PYPI_SITE}/p/pyxdg/pyxdg-${version}.tar.gz"
-checksum=80bd93aae5ed82435f20462ea0208fb198d8eec262e831ee06ce9ddb6b91c5a5
+checksum=3267bb3074e934df202af2ee0868575484108581e6f3cb006af1da35395e88b4
+
+# Both provide Python module xdg.
+conflicts="python3-xdg-variables"
From c3c1527052dba83df7b2948cb63f7c7391e89936 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 5 Jul 2022 19:26:26 +0530
Subject: [PATCH 480/609] hg-git: update to 1.0.0.
---
srcpkgs/hg-git/patches/fix-encoding-test.patch | 15 +++++++++++++++
srcpkgs/hg-git/template | 17 +++++------------
2 files changed, 20 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/hg-git/patches/fix-encoding-test.patch
diff --git a/srcpkgs/hg-git/patches/fix-encoding-test.patch b/srcpkgs/hg-git/patches/fix-encoding-test.patch
new file mode 100644
index 000000000000..944d4f2d96b3
--- /dev/null
+++ b/srcpkgs/hg-git/patches/fix-encoding-test.patch
@@ -0,0 +1,15 @@
+--- a/tests/test-encoding.t
++++ b/tests/test-encoding.t
+@@ -33,10 +33,10 @@
+ $ . $TESTDIR/latin-1-encoding
+ Warning: commit message (did|does) not conform to UTF-8. (re)
+ You may want to amend it after fixing the message, or set the config
+- variable i18n.commitencoding to the encoding your project uses.
++ variable i18n.commitEncoding to the encoding your project uses.
+ Warning: commit message (did|does) not conform to UTF-8. (re)
+ You may want to amend it after fixing the message, or set the config
+- variable i18n.commitencoding to the encoding your project uses.
++ variable i18n.commitEncoding to the encoding your project uses.
+
+ $ cd ..
+ $ git init -q --bare repo.git
diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index 37ef7e6b91ee..89db4e79fffc 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,9 +1,9 @@
# Template file for 'hg-git'
pkgname=hg-git
-version=0.9.0
-revision=3
+version=1.0.0
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-setuptools_scm"
depends="python3-dulwich mercurial"
checkdepends="$depends git unzip openssh"
short_desc="Mercurial plugin adding the ability to push and pull to/from Git"
@@ -11,18 +11,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
# https://www.mercurial-scm.org/wiki/HgGit
homepage="https://foss.heptapod.net/mercurial/hg-git"
+changelog="https://foss.heptapod.net/mercurial/hg-git/-/raw/branch/default/NEWS.rst"
distfiles="$PYPI_SITE/h/hg-git/hg-git-$version.tar.gz"
-checksum=77acbd8c322847ec109046d931e0731a91fcf13e10cfe9c183812706ec867671
+checksum=3911833962eb9c899c6bea8fb49666c82f211b124d0840beb6ad95e23a4621b6
do_check() {
cd tests
- rm -f test-branch-bookmark-suffix.t
- # Git 2.28 appends merge into master, Git 2.29 reverts that change
- rm -f test-merge.t test-octopus.t test-pull.t
- # test hg serve, bind to localhost instead *
- rm -f test-http.t
- # Differ in warning, which is new in Git 2.28
- rm -f test-subrepos.t
-
python3 run-tests.py --with-hg=/usr/bin/hg
}
From 9e0b48eebf4d8cf8d8b8e19289bfbc133aefabf1 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Tue, 5 Jul 2022 03:26:41 +0530
Subject: [PATCH 481/609] xwallpaper: update to 0.7.4
---
srcpkgs/xwallpaper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xwallpaper/template b/srcpkgs/xwallpaper/template
index 05c6ecaf8f9a..2e6c7de64d15 100644
--- a/srcpkgs/xwallpaper/template
+++ b/srcpkgs/xwallpaper/template
@@ -1,6 +1,6 @@
# Template file for 'xwallpaper'
pkgname=xwallpaper
-version=0.6.6
+version=0.7.4
revision=1
build_style=gnu-configure
hostmakedepends="automake pkg-config"
@@ -11,7 +11,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="ISC"
homepage="https://github.com/stoeckmann/xwallpaper"
distfiles="https://github.com/stoeckmann/xwallpaper/archive/v${version}.tar.gz"
-checksum=8d56f573b5af8f04ec9260b0b2cc676a12489c0420820b868de187bdd11b6a16
+checksum=1f7b0b2162221065b63f2498bc9a8d7a53d59ac893ab32e527bb02f031015084
pre_configure() {
autoreconf -fiv
From e733b4abb03203b6d9715cfad85fa5e8326ec6bc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:16:40 -0700
Subject: [PATCH 482/609] gnome-boxes: update to 42.2.
---
srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 --------------------
srcpkgs/gnome-boxes/template | 14 ++++----
2 files changed, 7 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch
deleted file mode 100644
index 3d9c56f5841c..000000000000
--- a/srcpkgs/gnome-boxes/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sat, 15 Jan 2022 00:07:31 +0100
-Subject: [PATCH] build: remove positional i18n.merge_file arguments
-
-otherwise building with meson 0.61+ fails:
-
- ERROR: Function does not take positional arguments.
----
- data/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index d32638a8..2dc1798b 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
- desktop_conf = configuration_data ()
- desktop_conf.set ('icon', application_id)
- desktop = i18n.merge_file (
-- 'desktop',
- input: configure_file (
- input: files ('org.gnome.Boxes.desktop.in'),
- output: 'org.gnome.Boxes.desktop.in',
-@@ -65,7 +64,7 @@ configure_file (
-
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
- input: configure_file (
- input: files ('org.gnome.Boxes.appdata.xml.in'),
- output: 'org.gnome.Boxes.appdata.xml.in',
---
-2.34.1
-
diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index ca7bd0ca61a2..11c787708f5c 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-boxes'
pkgname=gnome-boxes
-version=41.3
+version=42.2
revision=1
build_helper="gir"
build_style=meson
@@ -9,12 +9,12 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
- tracker3-devel libgcrypt-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
-short_desc="GNOME 3 application to access remote or virtual systems"
+ tracker-devel libgcrypt-devel"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+short_desc="GNOME application to access remote or virtual systems"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Boxes"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9b840680d1e7386fddfd6a15ad4dd0f2cda58efe818cf547837b46ae8bf0e189
+changelog="https://gitlab.gnome.org/GNOME/gnome-boxes/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+checksum=f7c2bca14dcae2838db11fa2c80e23408e3548178af861a0d4d0dcc6a9780015
From 4da9846b8b1279b41fb3692cb0f451529bc3ab14 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Jul 2022 17:13:37 +0200
Subject: [PATCH 483/609] common: correctly unset build_option_* variables
We can use the bash feature ${!prefix@}/${!prefix*} which expands to
all variables with the prefix.
This avoids leaking build_options between sourced templates.
---
common/environment/setup/sourcepkg.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index 1191993c9abc..5b31f6c1f81d 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -21,6 +21,9 @@ unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF PKG_CONFIG
unset -v CMAKE_GENERATOR
+# unset all $build_option_ variables
+unset -v "${!build_option_@}"
+
# hooks/do-extract/00-distfiles
unset -v skip_extraction
From 9e95bbf0022e8ac4f11c92284d0588230989858d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:32:10 -0700
Subject: [PATCH 484/609] gnome-photos: update to 42.0
---
srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 -------------------
srcpkgs/gnome-photos/template | 11 ++++---
2 files changed, 6 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
deleted file mode 100644
index f406b1c494c0..000000000000
--- a/srcpkgs/gnome-photos/patches/meson-0.61.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Fri, 21 Jan 2022 12:36:02 +0000
-Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
-
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 6e7192e0..94271de2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -3,7 +3,6 @@ subdir('icons')
- appdata = photos_namespace + '.appdata.xml'
-
- i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
-@@ -23,7 +22,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
---
-GitLab
-
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 5f03503be8c7..dbdbf6850a6f 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,22 +1,23 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
-version=40.0
-revision=3
+version=42.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- gfbgraph-devel tracker3-devel libexif-devel librsvg-devel grilo-devel
+ gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 tracker3-miners"
+depends="desktop-file-utils tracker tracker-miners"
short_desc="Access, organize, and share your photos on GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Photos"
+changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af
+checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551
build_options="gir"
build_options_default="gir"
From e804fcbe8912bc1652d6a22a61fc5bd72974f4ea Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:28:37 -0700
Subject: [PATCH 485/609] gnote: update to 42.0
---
srcpkgs/gnote/patches/meson-0.61.patch | 36 --------------------------
srcpkgs/gnote/template | 8 +++---
2 files changed, 5 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/gnote/patches/meson-0.61.patch
diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
deleted file mode 100644
index e5575c0fa3f7..000000000000
--- a/srcpkgs/gnote/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:53:17 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:4:0: ERROR: Function does not take positional arguments.
-data/meson.build:41:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index a6138165..8d16368a 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -2,7 +2,6 @@ install_man('gnote.1')
-
- desktop_file = 'org.gnome.Gnote.desktop'
- gnote_desktop_file = i18n.merge_file(
-- desktop_file,
- type: 'desktop',
- input: desktop_file + '.in',
- output: desktop_file,
-@@ -39,7 +38,6 @@ configure_file(
-
- gnote_appdata = 'org.gnome.Gnote.appdata.xml'
- appdata_file = i18n.merge_file(
-- gnote_appdata,
- input: gnote_appdata + '.in',
- output: gnote_appdata,
- po_dir: '../po',
---
-GitLab
-
diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index e25af9532c7e..75efcfdb48a5 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,16 +1,18 @@
# Template file for 'gnote'
pkgname=gnote
-version=41.2
+version=42.0
revision=1
build_style=meson
-hostmakedepends="pkg-config intltool itstool desktop-file-utils"
+hostmakedepends="pkg-config gettext itstool desktop-file-utils"
makedepends="libsecret-devel libxslt-devel libuuid-devel gtkmm-devel
libxml2-devel gtkspell3-devel"
depends="desktop-file-utils"
+checkdepends="glib-devel"
short_desc="GNOME note taking application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gnote"
+changelog="https://gitlab.gnome.org/GNOME/gnote/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=21b0ef43514e6b68a08ed8573130185be36dbb9fb463b426ebd9f18c5092423f
+checksum=319269f3ad6101bbd75d9d905916113dea22bc65c1fb579ac255cb9fae0a6499
lib32disabled=yes
From f71f2f0c03fdd4984e987f5f7148d24b58e28ef6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 20:13:41 -0700
Subject: [PATCH 486/609] zenity: update to 3.42.1
---
srcpkgs/zenity/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index b452a7a61a57..e5513bcbedf8 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.41.0
+version=3.42.1
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -10,8 +10,9 @@ short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
+changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b676c3510e22badfcc3204062d432ba537402f5e0ae26128c0d90c954037e1
+checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
build_options="webkit"
build_options_default="webkit"
From f967edd1d605c16853cd45ed39dfaa0ec4cb8b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 5 Jul 2022 18:33:05 +0200
Subject: [PATCH 487/609] python3-PyPDF2: update to 2.4.1.
---
srcpkgs/python3-PyPDF2/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-PyPDF2/template b/srcpkgs/python3-PyPDF2/template
index 8f09921ac3f2..be976304ea93 100644
--- a/srcpkgs/python3-PyPDF2/template
+++ b/srcpkgs/python3-PyPDF2/template
@@ -1,25 +1,26 @@
# Template file for 'python3-PyPDF2'
pkgname=python3-PyPDF2
-version=1.27.12
+version=2.4.1
revision=1
-_sample_files_gitrev=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+_sample_files_gitrev=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
create_wrksrc=yes
build_wrksrc="PyPDF2-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-Pillow"
-checkdepends="python3-pytest ${depends}"
+checkdepends="python3-pytest python3-pycryptodome ${depends}"
short_desc="PDF library for splitting, merging, cropping, and transforming pages"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="BSD-3-Clause"
homepage="https://pypdf2.readthedocs.io/en/latest/"
changelog="https://raw.githubusercontent.com/py-pdf/PyPDF2/main/CHANGELOG"
-distfiles="${PYPI_SITE}/P/PyPDF2/PyPDF2-${version}.tar.gz
+distfiles="https://github.com/py-pdf/PyPDF2/archive/refs/tags/${version}.tar.gz
https://github.com/py-pdf/sample-files/archive/${_sample_files_gitrev}.tar.gz"
-checksum="20929fad10a3b4890862f65f3a46f563cfdf53132faae5193b54e18658467a60
- dc2fb112e800400c7891bcff9d48dc8cae5e8ecf6c5058a2ecea2de09d241e78"
+checksum="ec3b2792744c2bac3a51e1e3646b491e3b9374575e0e9361fcb4ec6756fb2061
+ 04257ac9185da140a3463e1efd049ffe1ad2a9a8224375c13f2b5aec02f4f672"
post_extract() {
+ rmdir ${build_wrksrc}/sample-files
mv sample-files-${_sample_files_gitrev} ${build_wrksrc}/sample-files
}
From 9daeb7aa9f842a782bde67a239d42aa0c5f2b847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 5 Jul 2022 18:33:06 +0200
Subject: [PATCH 488/609] diffoscope: update to 217.
---
srcpkgs/diffoscope/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index e4eb386165e0..e2dca38a1355 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
# Template file for 'diffoscope'
pkgname=diffoscope
-version=211
+version=217
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://diffoscope.org/"
changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=8e75f3acb181096632e43935ba7a85304703ac54739810b4523919188367ec03
+checksum=1e9791e3f718ca809d98fb319b150ce6222a682b4009ea00838b9d8705003950
From 9a12a7e3a54f3d58e05b6f22a4f5f5d2e46a3886 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 18 Apr 2022 10:50:26 -0700
Subject: [PATCH 489/609] gvfs: update to 1.50.2
---
srcpkgs/gvfs/patches/meson-0.61.patch | 10 ----------
srcpkgs/gvfs/template | 12 ++++++------
2 files changed, 6 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch
diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
deleted file mode 100644
index 38f04b2e894c..000000000000
--- a/srcpkgs/gvfs/patches/meson-0.61.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -366,7 +366,6 @@ if enable_admin
- )
-
- i18n.merge_file(
-- policy,
- input: policy_in,
- output: '@BASENAME@',
- po_dir: po_dir,
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 6adb51e279bd..fc90e400d928 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,26 +1,26 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.48.1
-revision=2
+version=1.50.2
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
-Dman=true"
-hostmakedepends="docbook-xsl glib-devel intltool libxslt openssh pkg-config
+hostmakedepends="docbook-xsl glib-devel gettext libxslt openssh pkg-config
polkit-devel"
makedepends="avahi-glib-libs-devel dbus-glib-devel fuse3-devel gcr-devel
libarchive-devel libbluetooth-devel libbluray-devel libcap-devel
libcdio-paranoia-devel libgcrypt-devel libgdata-devel libglib-devel
libgphoto2-devel libgudev-devel libimobiledevice-devel libmtp-devel
- libnfs-devel libsecret-devel libsoup-gnome-devel libxml2-devel polkit-devel
+ libnfs-devel libsecret-devel libsoup3-devel libxml2-devel polkit-devel
samba-devel udisks2-devel gsettings-desktop-schemas-devel
gnome-online-accounts-devel"
short_desc="Userspace virtual filesystem"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
-changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2
+checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From a6d2381e20602f75e98ca627a0924d33a974d232 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 00:55:27 -0700
Subject: [PATCH 490/609] gedit-plugins: update to 42.1
---
srcpkgs/gedit-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 6ee3057a462b..939d068e074e 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
# Template file for 'gedit-plugins'
pkgname=gedit-plugins
-version=41.0
+version=42.1
revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
@@ -15,5 +15,5 @@ license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gedit-plugins"
changelog="https://gitlab.gnome.org/GNOME/gedit-plugins/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a38f949460914f054063671bf0bb8e8a5184e6210be89f64bb304652d4520e87
+checksum=c6b741de7d2610b0e474ef1b72a2a587e236998573403d527fe18e9e3de2623d
python_version=3
From de81977974689ba050ca2631f192cfeac3a8e2e1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 00:55:08 -0700
Subject: [PATCH 491/609] gedit: update to 42.1
---
srcpkgs/gedit/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index c6f401487ca0..822d3e282cd8 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
# Template file for 'gedit'
pkgname=gedit
-version=41.0
+version=42.1
revision=1
build_helper="gir"
build_style=meson
@@ -13,8 +13,9 @@ short_desc="Text editor for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
+changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5
+checksum=7f1fd43df5110d4c37de6541993f41f0fbc3efc790900e92053479ba069920e9
shlib_provides="libgedit-41.so"
python_version=3
From 8fa4ac91329e83fa9b0be7320334c0af4a18b674 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 492/609] gnome-autoar: update to 0.4.3
---
srcpkgs/gnome-autoar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-autoar'
pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
revision=1
build_style=meson
build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
build_options="gir"
build_options_default="gir"
From 58c9776d7f234c85a3e60c8e521baed019174901 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:54:12 +0200
Subject: [PATCH 493/609] mm-common: update to 1.0.4.
---
srcpkgs/mm-common/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mm-common/template b/srcpkgs/mm-common/template
index 37911a499859..1b28eba6870f 100644
--- a/srcpkgs/mm-common/template
+++ b/srcpkgs/mm-common/template
@@ -1,13 +1,13 @@
# Template file for 'mm-common'
pkgname=mm-common
-version=1.0.3
+version=1.0.4
revision=1
build_style=meson
-hostmakedepends="pkg-config intltool itstool"
+hostmakedepends="pkg-config"
depends="gtk-doc gettext-devel glib-devel yelp-tools"
short_desc="Common development macros for GTK+ C++"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gtkmm.org/en/"
distfiles="http://download.gnome.org/sources/mm-common/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e81596625899aacf1d0bf27ccc2fcc7f373405ec48735ca1c7273c0fbcdc1ef5
+checksum=e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8
From ed3cf98c5d6d15d71546a81e3084ad7dad2986bd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:47:07 -0700
Subject: [PATCH 494/609] file-roller: update to 3.42.0
---
srcpkgs/file-roller/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 737a81972b2a..1baaf1e1922f 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,17 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.40.0
+version=3.42.0
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel"
+ libnotify-devel nautilus-devel libhandy1-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
+changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d
-
-CFLAGS="-fcommon"
+checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
From d6b034a47397c0b2bb9e4dfdc24c0e202cba481e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:27:53 -0700
Subject: [PATCH 495/609] gnome-sound-recorder: update to 42.0
---
.../patches/meson-0.61.patch | 41 -------------------
srcpkgs/gnome-sound-recorder/template | 11 ++---
2 files changed, 6 insertions(+), 46 deletions(-)
delete mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
deleted file mode 100644
index 40392e6a9fe8..000000000000
--- a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:37:06 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
-data/meson.build:16:0: ERROR: Function does not take positional arguments.
----
- data/appdata/meson.build | 1 -
- data/meson.build | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index 1f5744e..d2c2c3a 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
- metainfo_conf.set('gettext-package', gettext_package)
-
- metainfo_file = i18n.merge_file(
-- 'metainfo-file',
- input: configure_file(
- input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
- output: '@BASENAME@',
-diff --git a/data/meson.build b/data/meson.build
-index 44117ad..0ff8fa5 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -14,7 +14,6 @@ install_data(
- desktop_conf = configuration_data()
- desktop_conf.set('app-id', application_id)
- desktop_file = i18n.merge_file(
-- 'desktop',
- input: configure_file(
- input: 'org.gnome.SoundRecorder.desktop.in.in',
- output: '@BASENAME@',
---
-GitLab
-
diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2887819e5a8b..7b01a37919b3 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,18 +1,19 @@
# Template file for 'gnome-sound-recorder'
pkgname=gnome-sound-recorder
-version=40.0
-revision=2
+version=42.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel gst-plugins-bad1-devel
- libhandy1-devel"
+makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel
+ gst-plugins-bad1-devel"
depends="desktop-file-utils gjs gsettings-desktop-schemas gst-plugins-bad1
gst-plugins-good1 libhandy1"
short_desc="GNOME sound recorder application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/SoundRecorder"
+changelog="https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
+checksum=4c08c315282f3ebf7a2da6f20e0ff9f0c71daa5229fcd2fe0b5c0aaaaa06f0ad
lib32disabled=yes
From dad5af8ed659bbfdefebcc40ba38dfaafdc16f81 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:00:31 -0700
Subject: [PATCH 496/609] gnome-music: update to 42.1
---
srcpkgs/gnome-music/patches/meson-0.61.patch | 30 --------------------
srcpkgs/gnome-music/template | 16 ++++++-----
2 files changed, 9 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch
deleted file mode 100644
index aca43b5608a2..000000000000
--- a/srcpkgs/gnome-music/patches/meson-0.61.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001
-From: Jean Felder <jfelder@src.gnome.org>
-Date: Thu, 18 Nov 2021 12:09:26 +0100
-Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument
-
-The positional argument was being silently ignored until meson 0.60.0
-where it returns a deprecation message:
-"DEPRECATION: i18n.merge_file does not take any positional
-arguments. This will become a hard error in the next Meson release."
-
-See: https://github.com/mesonbuild/meson/issues/9441
----
- data/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 25ff1e102..145ee5221 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID)
- appdata_conf.set('package_url', PACKAGE_URL)
- appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
- i18n.merge_file(
-- 'appdata',
- input: configure_file(
- output: PROJECT_RDNN_NAME + '.appdata.xml.in',
- input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
---
-GitLab
-
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index fa38578939d3..c19480dff00a 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,20 +1,22 @@
# Template file for 'gnome-music'
pkgname=gnome-music
-version=41.0
+version=42.1
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config
+ gtk-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker3-devel gnome-online-accounts-devel
- libdazzle-devel grilo-plugins python3-cairo-devel libhandy1-devel"
+ python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker3 tracker3-miners gst-plugins-good1 grilo-plugins libdazzle
- libmediaart"
+ tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Music"
+changelog="https://gitlab.gnome.org/GNOME/gnome-music/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=69b13567a87dc77dcf0c926d71d0fa2ebfa5a97f37817828df71d8a1b0129fd2
+checksum=c7747fa6a86b56b18ad6ff950ff901e59ee7fac11c68b2a6727af86eaeed8270
lib32disabled=yes
From c9a65c7688639fb620a1cc6f9f84b52b6ca47d92 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Tue, 5 Jul 2022 13:34:17 -0300
Subject: [PATCH 497/609] i3lock: update to 2.14.1.
---
srcpkgs/i3lock/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/i3lock/template b/srcpkgs/i3lock/template
index b0245825af09..572403425f16 100644
--- a/srcpkgs/i3lock/template
+++ b/srcpkgs/i3lock/template
@@ -1,8 +1,8 @@
# Template file for 'i3lock'
pkgname=i3lock
-version=2.13
+version=2.14.1
revision=1
-build_style=gnu-configure
+build_style=meson
hostmakedepends="pkg-config"
makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel
xcb-util-devel xcb-util-image-devel xcb-util-xrm-devel"
@@ -11,8 +11,8 @@ short_desc="Improved screenlocker based upon XCB and PAM"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://i3wm.org/i3lock/"
-distfiles="https://i3wm.org/i3lock/i3lock-${version}.tar.bz2"
-checksum=637fe898acb324337d3ebc4fcdb2e390b082147fdc8a0cda6c19e7f395965f0b
+distfiles="https://i3wm.org/i3lock/i3lock-${version}.tar.xz"
+checksum=062ef27eba0bc5a0c7ae91f7b7cbbf03b316d6a49fe80a58fc9f20c18a4e6843
CFLAGS="-fcommon"
From b9fd12be76d1730f1a5d25ae00527a20e1a42b9c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:08:28 -0700
Subject: [PATCH 498/609] gnome-characters: update to 42.0
---
.../gnome-characters/patches/meson-0.61.patch | 18 ------------------
srcpkgs/gnome-characters/template | 8 ++++----
2 files changed, 4 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch
deleted file mode 100644
index 248f8d5dced7..000000000000
--- a/srcpkgs/gnome-characters/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id)
- desktop_conf.set('bindir', characters_bindir)
-
- i18n.merge_file(
-- 'desktop-file',
- type: 'desktop',
- input: configure_file (
- input: characters_name + '.desktop.in',
-@@ -61,7 +60,6 @@ i18n.merge_file(
- )
-
- appdata_file = i18n.merge_file(
-- 'appdata-file',
- input: characters_name + '.appdata.xml.in',
- output: characters_application_id + '.appdata.xml',
- po_dir: po_dir,
diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index 24607f718b15..3814889e1d76 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-characters'
pkgname=gnome-characters
-version=41.0
+version=42.0
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
-depends="gnome-desktop gjs libhandy1"
+makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel libunistring-devel"
+depends="gnome-desktop gjs"
short_desc="Utility to find and insert unusual characters for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e129eca93d0099490bc2bfe6437e685fd9855e264b32fb918c0e58ee6aac867b
+checksum=5da0ffb816f8a6b44f303744ca827a34080118c1c938d8d79af17b7fe67980f8
lib32disabled=yes
From d60130fab3d291197efd532734aa2994851c0394 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:54:55 -0700
Subject: [PATCH 499/609] gnome-text-editor: update to 42.2
---
srcpkgs/gnome-text-editor/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
index 631dc7b77dad..df716615b6d1 100644
--- a/srcpkgs/gnome-text-editor/template
+++ b/srcpkgs/gnome-text-editor/template
@@ -1,16 +1,17 @@
# Template file for 'gnome-text-editor'
pkgname=gnome-text-editor
-version=41.1
-revision=2
+version=42.2
+revision=1
build_style=meson
-hostmakedepends="pkg-config gettext itstool glib-devel"
+hostmakedepends="pkg-config gettext itstool glib-devel
+ gtk-update-icon-cache desktop-file-utils"
makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel
icu-devel libadwaita-devel pcre2-devel"
short_desc="Simple text editor"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor"
-changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz"
-checksum=619ec520d6e0905d431167024e43dce0dbf6a345f2d48693501d70dc7626f861
+checksum=e56d4a8cdcbce8a8f1c0881b45de799f8b25205ec0cbf2269e532025761cc5da
make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.
From 841eab5b6af144e19e57130d9f4791868cee40a7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:52:06 -0700
Subject: [PATCH 500/609] gnome-system-monitor: update to 42.0
---
srcpkgs/gnome-system-monitor/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 85e4c9b5e66e..f35a4ea217f4 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,16 @@
# Template file for 'gnome-system-monitor'
pkgname=gnome-system-monitor
-version=41.0
+version=42.0
revision=1
build_style=meson
configure_args="-Dsystemd=false"
-hostmakedepends="pkg-config intltool itstool glib-devel polkit"
+hostmakedepends="pkg-config gettext itstool glib-devel polkit
+ gtk-update-icon-cache"
makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
short_desc="Process viewer and system resource monitor for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/SystemMonitor"
+changelog="https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa81ed45c12139e5f
+checksum=13239d22032201a22bd29833c575b684816700d2de168a1530223577c5c075dc
From 256526bf31cee515cc49dfdf3ca9f23bbfbc671e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:47:06 -0700
Subject: [PATCH 501/609] gnome-disk-utility: update to 42.0
---
.../patches/meson-0.61.patch | 34 -------------------
srcpkgs/gnome-disk-utility/template | 4 +--
2 files changed, 2 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
deleted file mode 100644
index 09e0c33d0798..000000000000
--- a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Fri, 17 Dec 2021 12:29:30 +0000
-Subject: [PATCH] build: fix arguments of i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments for a time
-and explicitly rejects with error since meson 0.60.0
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index e38a1d8e..38fb5207 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -11,7 +11,6 @@ desktops = [
-
- foreach desktop: desktops
- i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop + '.in',
- output: desktop,
-@@ -38,7 +37,6 @@ install_data(
- info = 'org.gnome.DiskUtility.appdata.xml'
-
- i18n.merge_file(
-- info,
- input: info + '.in',
- output: info,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 6b3d1aa4aba7..6164ffb20058 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=41.0
+version=42.0
revision=1
build_style=meson
configure_args="-Dlogind=none"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Disks"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df
+checksum=1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b
lib32disabled=yes
From 147fc6023e7e7483b6bfa5c8e55e084629db7afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 4 Jul 2022 10:45:26 +0200
Subject: [PATCH 502/609] quakespasm: update to 0.94.6.
---
srcpkgs/quakespasm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/quakespasm/template b/srcpkgs/quakespasm/template
index 3808fa178260..1ec9992aa951 100644
--- a/srcpkgs/quakespasm/template
+++ b/srcpkgs/quakespasm/template
@@ -1,6 +1,6 @@
# Template file for 'quakespasm'
pkgname=quakespasm
-version=0.94.5
+version=0.94.6
revision=1
build_wrksrc="Quake"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://quakespasm.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/quakespasm/Source/quakespasm-${version}.tar.gz"
-checksum=a5369c0f100c919846991ebc4d2c801eaff2c6a6f3645ca913f7479bbbcda0e8
+checksum=7e8184acbefc003c712e40af17dfdf91233bfd89adea5cbded513fc0495f543c
case "$XBPS_TARGET_MACHINE" in
arm*) makedepends+=" MesaLib-devel"
From 89a3b855fc156d17b504fd47ddd9ee21faf3e442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 5 Jul 2022 22:24:19 +0200
Subject: [PATCH 503/609] bfs: update to 2.6.1.
---
srcpkgs/bfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index de85ef0a52fe..b1d011a206e0 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
# Template file for 'bfs'
pkgname=bfs
-version=2.6
+version=2.6.1
revision=1
build_style=gnu-makefile
makedepends="acl-devel libcap-devel oniguruma-devel"
@@ -11,7 +11,7 @@ license="0BSD"
homepage="https://github.com/tavianator/bfs"
changelog="https://raw.githubusercontent.com/tavianator/bfs/main/docs/CHANGELOG.md"
distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=5812a4c62004c851eb02e23c0b6698dbb40061ce1c4069bb33c5b14f5361d81b
+checksum=15e35b46774af305cbdfbfaa9889591440579a8233bc7308e050ec27b791647d
post_install() {
vlicense LICENSE
From a2426aacc17d1cf1285162f067f76056671ca522 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:28:08 -0700
Subject: [PATCH 504/609] poppler: update to 22.07.0
---
common/shlibs | 2 +-
.../patches/cmake-build-type-none.patch | 13 ++++++++++++
srcpkgs/poppler/patches/fix-cflags.patch | 21 -------------------
srcpkgs/poppler/template | 13 ++++++++----
4 files changed, 23 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/poppler/patches/cmake-build-type-none.patch
delete mode 100644 srcpkgs/poppler/patches/fix-cflags.patch
diff --git a/common/shlibs b/common/shlibs
index a5f385f719b9..8064f62c7a02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -350,7 +350,7 @@ libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.111 libpoppler-21.07.0_1
+libpoppler.so.122 libpoppler-22.06.0_1
libpoppler-glib.so.8 poppler-glib-0.18.2_1
libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/patches/cmake-build-type-none.patch b/srcpkgs/poppler/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..3f107d36bc6d
--- /dev/null
+++ b/srcpkgs/poppler/patches/cmake-build-type-none.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 2aed0284..ea8d7e57 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -80,7 +80,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE_UPPER)
+-set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE)
++set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE;NONE)
+ # We override CMAKE_CXX_FLAGS_${_CMAKE_BUILD_TYPE_UPPER} below. If the user
+ # selects a CMAKE_BUILD_TYPE that is not handled by the logic below, we will
+ # end up dropping the previous flags (e.g. those set in a cross-compilation
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
deleted file mode 100644
index f1a408d03cce..000000000000
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index fe1182d..6013bd2 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
-+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 0aa4edf20b57..74af1e5d2b63 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,13 +3,15 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
#
pkgname=poppler
-version=21.07.0
+version=22.07.0
revision=1
+_testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
build_style=cmake
build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
-DENABLE_GLIB=ON -DENABLE_GOBJECT_INTROSPECTION=$(vopt_if gir ON OFF)
- -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)"
+ -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)
+ -DTESTDATADIR='${XBPS_BUILDDIR}/test-${_testVersion}'"
hostmakedepends="pkg-config glib-devel"
makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
libcurl-devel libopenjpeg2-devel $(vopt_if boost boost-devel)"
@@ -17,8 +19,11 @@ short_desc="PDF rendering library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://poppler.freedesktop.org"
-distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
+changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
+distfiles="${homepage}/${pkgname}-${version}.tar.xz
+ https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
+checksum="420230c5c43782e2151259b3e523e632f4861342aad70e7e20b8773d9eaf3428
+ ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
build_options="gir boost"
build_options_default="gir boost"
From 6bd678618798f8af0e953263a1c3a5f0cc8a289d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:29:02 -0700
Subject: [PATCH 505/609] poppler-qt5: update to 22.07.0
---
srcpkgs/poppler-qt5/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 2a15f56128c1..23dcc6485ac1 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
#
pkgname=poppler-qt5
-version=21.07.0
+version=22.07.0
revision=1
wrksrc="poppler-${version}"
build_style=cmake
@@ -17,8 +17,9 @@ short_desc="PDF rendering library - Qt5 bindings"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://poppler.freedesktop.org"
+changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
+checksum=420230c5c43782e2151259b3e523e632f4861342aad70e7e20b8773d9eaf3428
# fails to find a bunch of files
make_check=no
From 72a52fd55e0bb36fdb0bacf7eba2a1db0136171f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:29:32 -0700
Subject: [PATCH 506/609] poppler-data: update to 0.4.11
---
srcpkgs/poppler-data/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/poppler-data/template b/srcpkgs/poppler-data/template
index 48dba2497fb6..4b6e956b7b72 100644
--- a/srcpkgs/poppler-data/template
+++ b/srcpkgs/poppler-data/template
@@ -1,13 +1,13 @@
# Template file for 'poppler-data'
pkgname=poppler-data
-version=0.4.10
+version=0.4.11
revision=1
short_desc="Encoding data for the poppler PDF rendering library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, GPL-2.0-or-later, BSD-3-Clause"
homepage="https://poppler.freedesktop.org/"
distfiles="https://poppler.freedesktop.org/${pkgname}-${version}.tar.gz"
-checksum=6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30
+checksum=2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
do_install() {
make prefix=/usr DESTDIR=${DESTDIR} install
From 12c7219a8ae58e3f551c8438bfac6b17c4136aa8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:33:32 -0700
Subject: [PATCH 507/609] calligra: rebuild against libpoppler 22.06.0
---
.../patches/0001-Fix-some-more-warnings.patch | 440 ++++++++++++++++++
.../0002-Make-show-hidden-row-s-work.patch | 29 ++
srcpkgs/calligra/patches/c++17.patch | 16 +
.../patches/poppler-22.03.0-fix.patch | 70 +++
.../patches/poppler-22.04.0-fix.patch | 91 ++++
srcpkgs/calligra/template | 2 +-
6 files changed, 647 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch
create mode 100644 srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch
create mode 100644 srcpkgs/calligra/patches/c++17.patch
create mode 100644 srcpkgs/calligra/patches/poppler-22.03.0-fix.patch
create mode 100644 srcpkgs/calligra/patches/poppler-22.04.0-fix.patch
diff --git a/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch b/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch
new file mode 100644
index 000000000000..6cc132925b16
--- /dev/null
+++ b/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch
@@ -0,0 +1,440 @@
+From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001
+From: Pierre Ducroquet <pinaraf@pinaraf.info>
+Date: Sun, 28 Feb 2021 23:23:02 +0100
+Subject: [PATCH] Fix some more warnings
+
+---
+ filters/libmsooxml/MsooXmlDiagramReader_p.cpp | 1 +
+ filters/sheets/csv/csvimport.cc | 2 +-
+ filters/sheets/excel/sidewinder/excel.cpp | 1 +
+ filters/sheets/excel/sidewinder/formulas.cpp | 2 +-
+ filters/sheets/gnumeric/gnumericexport.cc | 5 ++---
+ filters/sheets/html/htmlexport.cc | 2 --
+ filters/sheets/latex/export/latexexport.cc | 1 -
+ filters/sheets/latex/export/table.cc | 1 +
+ filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp | 1 -
+ filters/stage/pptx/PptxXmlDocumentReader.cpp | 2 +-
+ filters/words/msword-odf/texthandler.cpp | 2 ++
+ filters/words/msword-odf/wv2/src/parser9x.cpp | 4 +++-
+ filters/words/msword-odf/wv2/src/styles.cpp | 4 +---
+ filters/words/msword-odf/wv2/src/styles.h | 11 ++++++++---
+ gemini/lib/GeminiMainWindow.cpp | 2 ++
+ libs/pageapp/KoPAOdfPageSaveHelper.cpp | 2 +-
+ plugins/spacenavigator/SpaceNavigatorDevice.h | 6 ++----
+ plugins/spacenavigator/SpaceNavigatorEvent.h | 2 +-
+ plugins/spacenavigator/SpaceNavigatorPollingThread.h | 3 +--
+ plugins/vectorshape/VectorShape.cpp | 1 +
+ sheets/functions/datetime.cpp | 1 +
+ sheets/part/Digest.cpp | 8 ++++----
+ sheets/shape/TableToolFactory.h | 2 +-
+ sheets/tests/TestSort.cpp | 4 ++--
+ 24 files changed, 38 insertions(+), 32 deletions(-)
+
+diff --git a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
+index 14b08531262..14fc6ab9a71 100644
+--- a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
++++ b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
+@@ -872,6 +872,7 @@ void LayoutNodeAtom::finishBuild(Context* context) {
+ case AlgorithmAtom::UnknownAlg:
+ warnMsooXml << "Layout with name=" << m_name << "defines an unknown algorithm.";
+ // fall through and use the composite-algorithm
++ // fall through
+ case AlgorithmAtom::CompositeAlg: m_algorithmImpl = new CompositeAlgorithm; break;
+ case AlgorithmAtom::ConnectorAlg: m_algorithmImpl = new ConnectorAlgorithm; break;
+ case AlgorithmAtom::CycleAlg: m_algorithmImpl = new CycleAlgorithm; break;
+diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc
+index 89fb7162e00..1008d186f18 100644
+--- a/filters/sheets/csv/csvimport.cc
++++ b/filters/sheets/csv/csvimport.cc
+@@ -97,8 +97,8 @@ KoFilter::ConversionStatus CSVFilter::convert(const QByteArray& from, const QByt
+ return KoFilter::FileNotFound;
+ }
+
+- QString csv_delimiter;
+ // ###### FIXME: disabled for now
++ //QString csv_delimiter;
+ //if (!config.isNull())
+ // csv_delimiter = config[0];
+
+diff --git a/filters/sheets/excel/sidewinder/excel.cpp b/filters/sheets/excel/sidewinder/excel.cpp
+index ab592225ca6..7fa5633d433 100644
+--- a/filters/sheets/excel/sidewinder/excel.cpp
++++ b/filters/sheets/excel/sidewinder/excel.cpp
+@@ -2449,6 +2449,7 @@ bool ExcelReader::load(Workbook* workbook, const char* filename)
+ } else {
+ bytes_read = combObjStream->read( buffer, markerOrLength );
+ QString ansiString = readByteString(buffer, markerOrLength);
++ Q_UNUSED(ansiString);
+ //TODO...
+ //printf( "markerOrLength=%i ansiString=%s\n",markerOrLength,ansiString.ascii() );
+ }
+diff --git a/filters/sheets/excel/sidewinder/formulas.cpp b/filters/sheets/excel/sidewinder/formulas.cpp
+index 62747469a49..0132d39e024 100644
+--- a/filters/sheets/excel/sidewinder/formulas.cpp
++++ b/filters/sheets/excel/sidewinder/formulas.cpp
+@@ -1513,7 +1513,7 @@ static void mergeTokens(UStringStack* stack, unsigned count, const QString &merg
+ if (!stack) return;
+ if (stack->size() < count) return;
+
+- QString s1, s2;
++ QString s1;
+
+ while (count) {
+ count--;
+diff --git a/filters/sheets/gnumeric/gnumericexport.cc b/filters/sheets/gnumeric/gnumericexport.cc
+index 1256c68bc74..2468548edb3 100644
+--- a/filters/sheets/gnumeric/gnumericexport.cc
++++ b/filters/sheets/gnumeric/gnumericexport.cc
+@@ -1293,15 +1293,13 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const
+ i = 0;
+ }
+
+- QString line;
+ for (int currentcolumn = 1; currentcolumn <= iMaxColumn; currentcolumn++) {
+ QDomElement cell_contents;
+ Cell cell(table, currentcolumn, currentrow);
+
+- QString text, style;
++ QString text;
+ QDomDocument domLink;
+ QDomElement domRoot;
+- QDomNode domNode;
+ QDomNodeList childNodes;
+
+ if (!cell.isDefault() && !cell.isEmpty()) {
+@@ -1342,6 +1340,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const
+ text = domNode.toElement().text();
+
+ while (!domNode.isNull()) {
++ QString style;
+ style = domNode.toElement().tagName();
+
+ if (style == "b")
+diff --git a/filters/sheets/html/htmlexport.cc b/filters/sheets/html/htmlexport.cc
+index 2d116e0608c..bf41a6f743e 100644
+--- a/filters/sheets/html/htmlexport.cc
++++ b/filters/sheets/html/htmlexport.cc
+@@ -242,7 +242,6 @@ void HTMLExport::convertSheet(Sheet *sheet, QString &str, int iMaxUsedRow, int i
+ i = 0;
+ }
+
+- QString separators;
+ QString line;
+ unsigned int nonempty_cells = 0;
+
+@@ -435,7 +434,6 @@ void HTMLExport::detectFilledCells(Sheet *sheet, int &rows, int &columns)
+ int iUsedColumn = 0;
+ for (int currentcolumn = 1 ; currentcolumn <= iMaxColumn ; currentcolumn++) {
+ cell = Cell(sheet, currentcolumn, currentrow);
+- QString text;
+ if (!cell.isDefault() && !cell.isEmpty()) {
+ iUsedColumn = currentcolumn;
+ }
+diff --git a/filters/sheets/latex/export/latexexport.cc b/filters/sheets/latex/export/latexexport.cc
+index 8d0698a3420..4f8caf235d9 100644
+--- a/filters/sheets/latex/export/latexexport.cc
++++ b/filters/sheets/latex/export/latexexport.cc
+@@ -38,7 +38,6 @@ LATEXExport::LATEXExport(QObject* parent, const QVariantList&) :
+
+ KoFilter::ConversionStatus LATEXExport::convert(const QByteArray& from, const QByteArray& to)
+ {
+- QString config;
+
+ if (to != "text/x-tex" || from != "application/x-kspread")
+ return KoFilter::NotImplemented;
+diff --git a/filters/sheets/latex/export/table.cc b/filters/sheets/latex/export/table.cc
+index 8d8b6701a39..e58827dfbc7 100644
+--- a/filters/sheets/latex/export/table.cc
++++ b/filters/sheets/latex/export/table.cc
+@@ -118,6 +118,7 @@ void Table::analyzePaper(const QDomNode node)
+
+ /* borders */
+ QDomNode border = getChild(node, "borders");
++ Q_UNUSED(border);
+ setBorderRight(getAttr(node, "right").toLong());
+ setBorderLeft(getAttr(node, "left").toLong());
+ setBorderBottom(getAttr(node, "bottom").toLong());
+diff --git a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
+index 782a5914729..eda8ffc6b47 100644
+--- a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
++++ b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
+@@ -872,7 +872,6 @@ KoFilter::ConversionStatus XlsxXmlWorksheetReader::read_conditionalFormatting()
+ while (index < m_conditionalIndices.size()) {
+ QString conditionalArea;
+ Condition examinedCondition = m_conditionalIndices.at(index);
+- QString sqrefOriginal = sqref;
+ int areaIndex = 0;
+ Condition previousCond;
+
+diff --git a/filters/stage/pptx/PptxXmlDocumentReader.cpp b/filters/stage/pptx/PptxXmlDocumentReader.cpp
+index 4cf86aea8c8..11b5ad266b9 100644
+--- a/filters/stage/pptx/PptxXmlDocumentReader.cpp
++++ b/filters/stage/pptx/PptxXmlDocumentReader.cpp
+@@ -316,7 +316,7 @@ KoFilter::ConversionStatus PptxXmlDocumentReader::read_sldId()
+
+ QString slideMasterPath, slideMasterFile;
+ MSOOXML::Utils::splitPathAndFile(m_context->relationships->targetForType(slidePath, slideFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideLayout"), &slideMasterPath, &slideMasterFile);
+- const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster");
++ // const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster");
+
+ // Delay the reading of a tableStyle until we find a table as we need the
+ // clrMap from the master slide
+diff --git a/filters/words/msword-odf/texthandler.cpp b/filters/words/msword-odf/texthandler.cpp
+index e167d86e028..89ef678961a 100644
+--- a/filters/words/msword-odf/texthandler.cpp
++++ b/filters/words/msword-odf/texthandler.cpp
+@@ -408,6 +408,7 @@ void WordsTextHandler::footnoteFound(wvWare::FootnoteData data,
+ }
+ case msonfcUCLetter:
+ letter = 'A';
++ // fall through
+ case msonfcLCLetter:
+ {
+ while (noteNumber / 25 > 0) {
+@@ -1064,6 +1065,7 @@ void WordsTextHandler::fieldStart(const wvWare::FLD* fld, wvWare::SharedPtr<cons
+ break;
+ case UNSUPPORTED:
+ warnMsDoc << "Warning: Fld data missing, ignoring!";
++ // fall through
+ default:
+ warnMsDoc << "Warning: unrecognized field type, ignoring!";
+ m_fld->m_type = UNSUPPORTED;
+diff --git a/filters/words/msword-odf/wv2/src/parser9x.cpp b/filters/words/msword-odf/wv2/src/parser9x.cpp
+index 9a6d1606ce9..e5d7d14691c 100644
+--- a/filters/words/msword-odf/wv2/src/parser9x.cpp
++++ b/filters/words/msword-odf/wv2/src/parser9x.cpp
+@@ -581,7 +581,8 @@ void Parser9x::processPiece( String* string, U32 fc, U32 limit, const Position&
+ // same ASCII code as TTP_MARK (0x0007), NOTE: table depth == 1
+ case CELL_MARK:
+ m_cellMarkFound = true;
+- // Fall-through intended. A row/cell end is also a paragraph end.
++ // A row/cell end is also a paragraph end.
++ // fall through
+ case PARAGRAPH_MARK:
+ {
+ // No "index - start + 1" here, as we don't want to copy the
+@@ -1064,6 +1065,7 @@ void Parser9x::emitSpecialCharacter( UChar character, U32 globalCP, SharedPtr<co
+ if (m_subDocument == Main) {
+ emitAnnotation( UString(character), globalCP, chp );
+ }
++ break;
+ }
+ case TextHandler::FieldEscapeChar:
+ wvlog << "Found an escape character ++++++++++++++++++++?" << endl;
+diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp
+index f47c3dd8d51..d2c96e3d92b 100644
+--- a/filters/words/msword-odf/wv2/src/styles.cpp
++++ b/filters/words/msword-odf/wv2/src/styles.cpp
+@@ -42,7 +42,6 @@ STD::STD()
+ }
+
+ STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos )
+-throw(InvalidFormatException)
+ {
+ clearInternal();
+ if (!read( baseSize, totalSize, stream, preservePos )) {
+@@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs )
+ }
+
+ bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos )
+-throw(InvalidFormatException)
+ {
+ U16 shifterU16;
+ S32 startOffset=stream->tell(); // address where the STD starts
+@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version )
+ }
+
+
+-StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException)
++StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf )
+ : m_udsNum(0)
+ {
+ WordVersion version = Word8;
+diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h
+index ba02def6845..41c8278dd21 100644
+--- a/filters/words/msword-odf/wv2/src/styles.h
++++ b/filters/words/msword-odf/wv2/src/styles.h
+@@ -58,8 +58,9 @@ struct STD
+ STD();
+ /**
+ * Simply calls read(...)
++ * @throw InvalidFormatException
+ */
+- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
++ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false );
+ /**
+ * Attention: This struct allocates memory on the heap
+ */
+@@ -74,8 +75,9 @@ struct STD
+ * false the state of stream will be changed!
+ *
+ * @return true - success, false - failed
++ * @throw InvalidFormatException
+ */
+- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
++ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false );
+
+ /**
+ * Same as reading :)
+@@ -365,7 +367,10 @@ class WV2_EXPORT Style
+ class WV2_EXPORT StyleSheet
+ {
+ public:
+- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException);
++ /**
++ * @throw InvalidFormatException
++ */
++ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf );
+ ~StyleSheet();
+
+ /**
+diff --git a/gemini/lib/GeminiMainWindow.cpp b/gemini/lib/GeminiMainWindow.cpp
+index 3d05f6461e0..eb5f120c0f7 100644
+--- a/gemini/lib/GeminiMainWindow.cpp
++++ b/gemini/lib/GeminiMainWindow.cpp
+@@ -136,8 +136,10 @@ void GeminiMainWindow::setFullScreen(bool newState)
+ }
+
+
++
+ void GeminiMainWindow::changeState(GeminiMainWindow::GeminiState newState, bool lockNewState)
+ {
++ Q_UNUSED(lockNewState);
+ d->syncObject = new GeminiModeSynchronisationObject;
+
+ if(centralWidget()) {
+diff --git a/libs/pageapp/KoPAOdfPageSaveHelper.cpp b/libs/pageapp/KoPAOdfPageSaveHelper.cpp
+index 92c6dfd4cb4..068501c8af1 100644
+--- a/libs/pageapp/KoPAOdfPageSaveHelper.cpp
++++ b/libs/pageapp/KoPAOdfPageSaveHelper.cpp
+@@ -49,7 +49,7 @@ KoPAOdfPageSaveHelper::KoPAOdfPageSaveHelper( KoPADocument * doc, QList<KoPAPage
+ KoPAPage * p = static_cast<KoPAPage *>( page );
+ masterPages.insert( p->masterPage() );
+ }
+- m_masterPages = masterPages.toList();
++ m_masterPages = masterPages.values();
+ }
+ }
+
+diff --git a/plugins/spacenavigator/SpaceNavigatorDevice.h b/plugins/spacenavigator/SpaceNavigatorDevice.h
+index b9056ac98c1..ecd696e415f 100644
+--- a/plugins/spacenavigator/SpaceNavigatorDevice.h
++++ b/plugins/spacenavigator/SpaceNavigatorDevice.h
+@@ -31,10 +31,8 @@ class SpaceNavigatorDevice : public KoInputDeviceHandler
+ explicit SpaceNavigatorDevice(QObject *parent);
+ virtual ~SpaceNavigatorDevice();
+
+- /// reimplemented from KoInputDeviceHandler
+- virtual bool start();
+- /// reimplemented from KoInputDeviceHandler
+- virtual bool stop();
++ virtual bool start() override;
++ virtual bool stop() override;
+ private Q_SLOTS:
+ void slotMoveEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons );
+ void slotButtonEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons, Qt::MouseButton, int type );
+diff --git a/plugins/spacenavigator/SpaceNavigatorEvent.h b/plugins/spacenavigator/SpaceNavigatorEvent.h
+index 73751ec88ff..76ee8e2f880 100644
+--- a/plugins/spacenavigator/SpaceNavigatorEvent.h
++++ b/plugins/spacenavigator/SpaceNavigatorEvent.h
+@@ -33,7 +33,7 @@ class SpaceNavigatorEvent : public KoInputDeviceHandlerEvent
+ void setPosition( int x, int y, int z );
+ void setRotation( int rx, int ry, int rz );
+
+- virtual KoPointerEvent * pointerEvent();
++ virtual KoPointerEvent * pointerEvent() override;
+
+ private:
+ int m_x, m_y, m_z;
+diff --git a/plugins/spacenavigator/SpaceNavigatorPollingThread.h b/plugins/spacenavigator/SpaceNavigatorPollingThread.h
+index 62c4de8ab73..67d59177021 100644
+--- a/plugins/spacenavigator/SpaceNavigatorPollingThread.h
++++ b/plugins/spacenavigator/SpaceNavigatorPollingThread.h
+@@ -39,8 +39,7 @@ class SpaceNavigatorPollingThread : public QThread
+
+ protected:
+
+- /// reimplemented from QThread
+- virtual void run();
++ virtual void run() override;
+
+ private:
+ bool m_stopped;
+diff --git a/plugins/vectorshape/VectorShape.cpp b/plugins/vectorshape/VectorShape.cpp
+index a25ab3fc561..9acbd251c94 100644
+--- a/plugins/vectorshape/VectorShape.cpp
++++ b/plugins/vectorshape/VectorShape.cpp
+@@ -294,6 +294,7 @@ void VectorShape::saveOdf(KoShapeSavingContext & context) const
+ break;
+ case VectorTypeSvg:
+ mimeType = "image/svg+xml";
++ break;
+ default:
+ // FIXME: What here?
+ mimeType = "application/x-what";
+diff --git a/sheets/functions/datetime.cpp b/sheets/functions/datetime.cpp
+index 9f59fe2cf75..6157b0996c1 100644
+--- a/sheets/functions/datetime.cpp
++++ b/sheets/functions/datetime.cpp
+@@ -597,6 +597,7 @@ Value func_currentDate(valVector, ValueCalc * calc, FuncExtra *)
+ // Function: CURRENTTIME
+ Value func_currentTime(valVector, ValueCalc * calc, FuncExtra *)
+ {
++ Q_UNUSED(calc);
+ return Value(QTime::currentTime());
+ }
+
+diff --git a/sheets/part/Digest.cpp b/sheets/part/Digest.cpp
+index 8cd972db989..e9246ce6e7d 100644
+--- a/sheets/part/Digest.cpp
++++ b/sheets/part/Digest.cpp
+@@ -596,10 +596,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx)
+ }
+
+ switch (ctx->m_nDatLen & 0x03) {
+- case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L;
+- case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L;
+- case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
+- case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L;
++ case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; /* fall through */
++ case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; /* fall through */
++ case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; /* fall through */
++ case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; /* fall through */
+ }
+
+ __rtl_digest_swapLong(X, i + 1);
+diff --git a/sheets/shape/TableToolFactory.h b/sheets/shape/TableToolFactory.h
+index 679bfe14b8e..9412d8ffdc5 100644
+--- a/sheets/shape/TableToolFactory.h
++++ b/sheets/shape/TableToolFactory.h
+@@ -34,7 +34,7 @@ class TableToolFactory : public KoToolFactoryBase
+ TableToolFactory();
+ ~TableToolFactory();
+
+- KoToolBase* createTool(KoCanvasBase* canvas);
++ KoToolBase* createTool(KoCanvasBase* canvas) override;
+ };
+
+ } // namespace Sheets
+diff --git a/sheets/tests/TestSort.cpp b/sheets/tests/TestSort.cpp
+index b3f1e35169d..6354d79abc5 100644
+--- a/sheets/tests/TestSort.cpp
++++ b/sheets/tests/TestSort.cpp
+@@ -68,7 +68,7 @@ void TestSort::AscendingOrder()
+ command->setSheet(sheet);
+
+ // Parameters.
+- command->setSortRows(Qt::Vertical);
++ command->setSortRows(true);
+ command->setSkipFirst(false);
+ command->setCopyFormat(false);
+
+@@ -121,7 +121,7 @@ void TestSort::DescendingOrder()
+ command->setSheet(sheet);
+
+ // Parameters.
+- command->setSortRows(Qt::Vertical);
++ command->setSortRows(true);
+ command->setSkipFirst(false);
+ command->setCopyFormat(false);
+
diff --git a/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch b/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch
new file mode 100644
index 000000000000..d4b082b9a0f1
--- /dev/null
+++ b/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch
@@ -0,0 +1,29 @@
+From 22e02998dec8af15a25b7e8e3d53c174810cc3be Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+Date: Thu, 11 Jun 2020 10:43:38 +0200
+Subject: [PATCH] Make show hidden row(s) work
+
+Check for hidden rows was inverted to check for shown rows,
+hence hidden rows would never be unhidden.
+
+BUG:338816
+BUG:354236
+FIXED-IN:3.2.2
+(cherry picked from commit 28920c50e6300d643477f256aba91c8c51836682)
+---
+ sheets/commands/RowColumnManipulators.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sheets/commands/RowColumnManipulators.cpp b/sheets/commands/RowColumnManipulators.cpp
+index 95282d6e31b..25e8c454e27 100644
+--- a/sheets/commands/RowColumnManipulators.cpp
++++ b/sheets/commands/RowColumnManipulators.cpp
+@@ -192,7 +192,7 @@ bool HideShowManipulator::preProcessing()
+ }
+ }
+ for (int row = range.top(); row <= range.bottom(); ++row) {
+- if (!m_sheet->rowFormats()->isHidden(row)) {
++ if (m_sheet->rowFormats()->isHidden(row)) {
+ region.add(QRect(1, row, KS_colMax, 1));
+ }
+ }
diff --git a/srcpkgs/calligra/patches/c++17.patch b/srcpkgs/calligra/patches/c++17.patch
new file mode 100644
index 000000000000..1db8385161a3
--- /dev/null
+++ b/srcpkgs/calligra/patches/c++17.patch
@@ -0,0 +1,16 @@
+diff -Naur CMakeLists.txt.orig CMakeLists.txt
+--- a/CMakeLists.txt.orig
++++ b/CMakeLists.txt
+@@ -106,9 +106,9 @@
+
+ # use CPP-11
+ if (CMAKE_VERSION VERSION_LESS "3.1")
+- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ else ()
+- set (CMAKE_CXX_STANDARD 11)
++ set (CMAKE_CXX_STANDARD 17)
+ endif ()
+
+ ############
+
diff --git a/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch b/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch
new file mode 100644
index 000000000000..7dab53bcfc7f
--- /dev/null
+++ b/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch
@@ -0,0 +1,70 @@
+From 236bacbe13739414e919de868283b0caf2df5d8a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Apr 2022 01:25:44 +0200
+Subject: [PATCH] PdfImport: Fix compile with newer poppler
+
+Brings a dependency on poppler-qt5 to be able to include the version
+header, honestly it's not strictly needed, one could do a
+check_cxx_source_compiles, but I don't care about Calligra enough to
+spend more time making it compile while it's using poppler the wrong
+way.
+---
+ CMakeLists.txt | 1 +
+ filters/karbon/pdf/CMakeLists.txt | 2 +-
+ filters/karbon/pdf/PdfImport.cpp | 9 +++++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 51f1d65b8e6..06bbad5c24c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -952,6 +952,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG
+ calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG
+ NOT_WIN "not supported on Windows"
+ PopplerXPDFHeaders_FOUND "poppler xpdf headers not found"
++ Poppler_FOUND "poppler qt5 headers not found"
+ )
+
+ calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index 8fddf1ad757..b71c92cbf04 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -3,7 +3,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+ calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop)
+
+-target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core)
++target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5)
+
+ install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
+
+diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+index abbe681b4e8..e97974fc133 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -17,6 +17,10 @@
+
+ #include <kpluginfactory.h>
+
++#include <poppler-version.h>
++
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ // Don't show this warning: it's an issue in poppler
+ #ifdef __GNUC__
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+@@ -54,8 +58,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
++ PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
++#endif
+ if (! pdfDoc) {
+ globalParams.reset();
+ return KoFilter::StupidError;
diff --git a/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch b/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch
new file mode 100644
index 000000000000..e47169950b8b
--- /dev/null
+++ b/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch
@@ -0,0 +1,91 @@
+From 6b75bec784c9835c78993349845d8c2ef22ec3de Mon Sep 17 00:00:00 2001
+From: Dag Andersen <dag.andersen@kdemail.net>
+Date: Wed, 13 Apr 2022 14:45:33 +0200
+Subject: [PATCH] PdfImport: Fix compile with newer poppler
+
+Also fixes odg2pdf filter.
+
+Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a
+by accid@kde.org.
+---
+ filters/karbon/pdf/CMakeLists.txt | 2 +-
+ filters/karbon/pdf/Pdf2OdgImport.cpp | 9 +++++++++
+ filters/karbon/pdf/SvgOutputDev.cpp | 9 +++++++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index b71c92cbf04..4ce138ccdd6 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -13,6 +13,6 @@ set(pdf2odg_PART_SRCS PdfImportDebug.cpp Pdf2OdgImport.cpp SvgOutputDev.cpp)
+ add_library(calligra_filter_pdf2odg MODULE ${pdf2odg_PART_SRCS})
+ calligra_filter_desktop_to_json(calligra_filter_pdf2odg calligra_filter_pdf2odg.desktop)
+
+-target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core)
++target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core Poppler::Qt5)
+
+ install(TARGETS calligra_filter_pdf2odg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
+diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp
+index 934e31dd5aa..a21eac97a77 100644
+--- a/filters/karbon/pdf/Pdf2OdgImport.cpp
++++ b/filters/karbon/pdf/Pdf2OdgImport.cpp
+@@ -27,6 +27,8 @@
+
+ #include <kpluginfactory.h>
+
++#include <poppler-version.h>
++
+ // Don't show this warning: it's an issue in poppler
+ #ifdef __GNUC__
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+@@ -36,6 +38,8 @@
+ #include <PDFDoc.h>
+ #include <GlobalParams.h>
+
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ K_PLUGIN_FACTORY_WITH_JSON(Pdf2OdgImportFactory, "calligra_filter_pdf2odg.json",
+ registerPlugin<Pdf2OdgImport>();)
+
+@@ -69,8 +73,13 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
++ PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
++#endif
+ if (! pdfDoc) {
+ globalParams.reset();
+ return KoFilter::StupidError;
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 0e6e5a934ca..7caec15175a 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -22,6 +22,10 @@
+ #include <QPen>
+ #include <QImage>
+
++#include <poppler-version.h>
++
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ class SvgOutputDev::Private
+ {
+ public:
+@@ -386,7 +390,12 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ if (s->getLength() == 0)
+ return;
+
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GfxFont * font = state->getFont();
++#else
++ std::shared_ptr<GfxFont> font = state->getFont();
++#endif
++
+
+ QString str;
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 7c1411bf3da6..6f924d62f8ff 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=7
+revision=8
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 9c2d6152e5cc83a96ddc095f87eec9682ee2df9e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:34:07 -0700
Subject: [PATCH 508/609] inkscape: rebuild against libpoppler 22.06.0
---
...ibility-with-Poppler-22.03-and-later.patch | 50 ++++++
.../Fix-build-with-poppler-21.11.0.patch | 29 ++++
.../Fix-build-with-poppler-22.04.patch | 143 ++++++++++++++++++
srcpkgs/inkscape/template | 2 +-
4 files changed, 223 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
create mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
create mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
new file mode 100644
index 000000000000..297ef677665e
--- /dev/null
+++ b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
@@ -0,0 +1,50 @@
+From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Sun, 20 Mar 2022 22:41:51 -0300
+Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
+
+This change ensures that Inkscape will build against Poppler 22.03 after
+the changes that were made to the constructor of `PDFDoc`.
+
+See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
+
+Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
+---
+ src/extension/internal/pdfinput/pdf-input.cpp | 3 +--
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
+index 3dabc94ba2..079b0dc713 100644
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+
+ // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
+ // glib gstdio.c
+- GooString *filename_goo = new GooString(uri);
+- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
++ pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
+
+ if (!pdf_doc->isOk()) {
+ int error = pdf_doc->getErrorCode();
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 87a19d4c42..50b617c25c 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
++#else
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+ #define _POPPLER_CONST_83 const
+ #else
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
new file mode 100644
index 000000000000..5d7f4801273d
--- /dev/null
+++ b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
@@ -0,0 +1,29 @@
+From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Mon, 1 Nov 2021 21:45:38 +0200
+Subject: [PATCH] Fix build with poppler 21.11.0
+
+GfxFont::tag is now of type std::string instead of GooString *.
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index e3d04d544b..feecefa043 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ }
+ if (printCommands) {
+ printf(" font: tag=%s name='%s' %g\n",
++#if POPPLER_CHECK_VERSION(21,11,0)
++ font->getTag().c_str(),
++#else
+ font->getTag()->getCString(),
++#endif
+ font->getName() ? font->getName()->getCString() : "???",
+ args[1].getNum());
+ fflush(stdout);
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
new file mode 100644
index 000000000000..f12054268a3c
--- /dev/null
+++ b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
@@ -0,0 +1,143 @@
+From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
+From: Rafael Siejakowski <rs@rs-math.net>
+Date: Mon, 4 Apr 2022 22:09:39 -0300
+Subject: [PATCH] Compatibility with Poppler 22.04
+
+Replace vanilla pointers with std::shared_ptr for pointers to fonts;
+eliminate manual ref-counting.
+
+Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 14 ++++++++------
+ .../internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ src/extension/internal/pdfinput/svg-builder.cpp | 7 +------
+ src/extension/internal/pdfinput/svg-builder.h | 1 -
+ 4 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index feecefa043..d6e2ede4f3 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -30,6 +30,7 @@
+ #include "Gfx.h"
+ #include "pdf-parser.h"
+ #include "util/units.h"
++#include "poppler-transition-api.h"
+
+ #include "glib/poppler-features.h"
+ #include "goo/gmem.h"
+@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
+ // TODO not good that numArgs is ignored but args[] is used:
+ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ {
+- GfxFont *font = res->lookupFont(args[0].getName());
++ auto font = res->lookupFont(args[0].getName());
+
+ if (!font) {
+ // unsetting the font (drawing no text) is better than using the
+@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ fflush(stdout);
+ }
+
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+ font->incRefCnt();
++#endif
+ state->setFont(font, args[1].getNum());
+ fontChanged = gTrue;
+ }
+@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
+ #else
+ void PdfParser::doShowText(GooString *s) {
+ #endif
+- GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+ CharCode code;
+@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
+ #endif
+ int len, n, uLen;
+
+- font = state->getFont();
++ auto font = state->getFont();
+ wMode = font->getWMode();
+
+ builder->beginString(state);
+@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
+ //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
+ if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
+ code, u, uLen)) {*/
+- _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
+- if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
++ _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
++ if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
+ pushResources(resDict);
+- }
++ }
+ if (charProc.isStream()) {
+ //parse(&charProc, gFalse); // TODO: parse into SVG font
+ } else {
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 50b617c25c..dc9e47e45b 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 4, 0)
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
++#else
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 3, 0)
+ #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
+ #else
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index eede668893..901cc8cddb 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
+
+ void SvgBuilder::_init() {
+ _font_style = nullptr;
+- _current_font = nullptr;
+ _font_specification = nullptr;
+ _font_scaling = 1;
+ _need_font_update = true;
+@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
+ _need_font_update = false;
+ updateTextMatrix(state); // Ensure that we have a text matrix built
+
+- if (_font_style) {
+- //sp_repr_css_attr_unref(_font_style);
+- }
+ _font_style = sp_repr_css_attr_new();
+- GfxFont *font = state->getFont();
++ auto font = state->getFont();
+ // Store original name
+ if (font->getName()) {
+ _font_specification = font->getName()->getCString();
+@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
+ sp_repr_css_set_property(_font_style, "writing-mode", "tb");
+ }
+
+- _current_font = font;
+ _invalidated_style = true;
+ }
+
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index fb4e64fa19..e91febd717 100644
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -204,7 +204,6 @@ private:
+ std::vector<SvgGraphicsState> _state_stack;
+
+ SPCSSAttr *_font_style; // Current font style
+- GfxFont *_current_font;
+ const char *_font_specification;
+ double _font_scaling;
+ bool _need_font_update;
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..4d902e663f73 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=3
+revision=4
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From 00249218eaa1c220b33626b0fad7123a70b17fdc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:34:43 -0700
Subject: [PATCH 509/609] ipe: rebuild against libpoppler 22.06.0
---
srcpkgs/ipe/patches/poppler-22.03.0-fix.patch | 33 +++++++++++++++++++
srcpkgs/ipe/template | 2 +-
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ipe/patches/poppler-22.03.0-fix.patch
diff --git a/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch b/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch
new file mode 100644
index 000000000000..df2894809c1c
--- /dev/null
+++ b/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch
@@ -0,0 +1,33 @@
+diff -Naur pdftoipe.cpp.orig pdftoipe.cpp
+--- a/ipe-tools/pdftoipe/pdftoipe.cpp.orig
++++ b/ipe-tools/pdftoipe/pdftoipe.cpp
+@@ -84,22 +84,20 @@
+ if (quiet)
+ globalParams->setErrQuiet(quiet);
+
+- GooString *ownerPW, *userPW;
++ std::optional<GooString> ownerPW, userPW;
+ if (ownerPassword[0]) {
+- ownerPW = new GooString(ownerPassword);
++ ownerPW = GooString(ownerPassword);
+ } else {
+- ownerPW = 0;
++ ownerPW = std::nullopt;
+ }
+ if (userPassword[0]) {
+- userPW = new GooString(userPassword);
++ userPW = GooString(userPassword);
+ } else {
+- userPW = 0;
++ userPW = std::nullopt;
+ }
+
+ // open PDF file
+- PDFDoc *doc = new PDFDoc(fileName, ownerPW, userPW);
+- delete userPW;
+- delete ownerPW;
++ PDFDoc *doc = new PDFDoc(std::make_unique<GooString>(fileName), ownerPW, userPW);
+
+ if (!doc->isOk())
+ return 1;
+
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index a84d5c036b2f..72398e7ff924 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.24
-revision=6
+revision=7
_tools_commit=v7.2.20.1
hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
From 9d7c609d6b8cc8bc1789ffc0bf5240431cc8fc7f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:35:30 -0700
Subject: [PATCH 510/609] kitinerary: rebuild against libpoppler 22.06.0
---
srcpkgs/kitinerary/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index 343ef64911d6..a2cfcaa178b6 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
# Template file for 'kitinerary'
pkgname=kitinerary
version=22.04.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel
From 15d78b91372adf1a882aeb95a8a4038dc645421e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:36:24 -0700
Subject: [PATCH 511/609] scribus: rebuild against libpoppler 22.06.0
---
.../patches/0001-poppler-22.02.0-fix.patch | 129 ++++++++
.../patches/0002-poppler-22.03.0-fix.patch | 52 ++++
.../patches/0003-poppler-22.04.0-fix.patch | 288 ++++++++++++++++++
srcpkgs/scribus/template | 2 +-
4 files changed, 470 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch
create mode 100644 srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch
create mode 100644 srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch
diff --git a/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch b/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch
new file mode 100644
index 000000000000..4e0f607c6a07
--- /dev/null
+++ b/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch
@@ -0,0 +1,129 @@
+From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 2 Feb 2022 23:12:52 +0000
+Subject: [PATCH] #16734: Build break with poppler 22.2.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24884 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 47 +++++++++++++++++++-----
+ 1 file changed, 37 insertions(+), 10 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 5894bf2ad6..3650c96f52 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place.
+
+ #include "slaoutput.h"
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#include <memory>
++#include <optional>
++#endif
++
+ #include <poppler/GlobalParams.h>
+ #include <poppler/poppler-config.h>
+ #include <poppler/FileSpec.h>
+@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
+ void SlaOutputDev::updateFont(GfxState *state)
+ {
+ GfxFont *gfxFont;
+- GfxFontLoc *fontLoc;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ std::optional<GfxFontLoc> fontLoc;
++ const GooString * fileName = nullptr;
++ std::unique_ptr<FoFiTrueType> ff;
++#else
++ GfxFontLoc * fontLoc = nullptr;
++ GooString * fileName = nullptr;
++ FoFiTrueType * ff = nullptr;
++#endif
+ GfxFontType fontType;
+ SlaOutFontFileID *id;
+ SplashFontFile *fontFile;
+ SplashFontSrc *fontsrc = nullptr;
+- FoFiTrueType *ff;
+ Object refObj, strObj;
+- GooString *fileName;
+- char *tmpBuf;
++ char *tmpBuf = nullptr;
+ int tmpBufLen = 0;
+- int *codeToGID;
+- const double *textMat;
++ int *codeToGID = nullptr;
++ const double *textMat = nullptr;
+ double m11, m12, m21, m22, fontSize;
+ SplashCoord mat[4];
+ int n = 0;
+@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state)
+ SplashCoord matrix[6];
+
+ m_font = nullptr;
+- fileName = nullptr;
+- tmpBuf = nullptr;
+- fontLoc = nullptr;
+
+ gfxFont = state->getFont();
+ if (!gfxFont)
+@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+ }
+ else
+ { // gfxFontLocExternal
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ fileName = fontLoc->pathAsGooString();
++#else
+ fileName = fontLoc->path;
++#endif
+ fontType = fontLoc->fontType;
+ }
+
+@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state)
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+ if (ff)
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get());
++ ff.reset();
++#else
+ codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
+- n = 256;
+ delete ff;
++#endif
++ n = 256;
+ }
+ else
+ {
+@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state)
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+ if (! ff)
+ goto err2;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);
++ ff.reset();
++#else
+ codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
+ delete ff;
++#endif
+ }
+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+ id,
+@@ -3247,14 +3269,19 @@ void SlaOutputDev::updateFont(GfxState *state)
+ mat[3] = -m22;
+ m_font = m_fontEngine->getFont(fontFile, mat, matrix);
+
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ delete fontLoc;
++#endif
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
+ return;
+
+ err2:
+ delete id;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ delete fontLoc;
++#endif
++
+ err1:
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
diff --git a/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch b/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch
new file mode 100644
index 000000000000..f7a0c03fdd96
--- /dev/null
+++ b/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch
@@ -0,0 +1,52 @@
+From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 2 Mar 2022 22:22:53 +0000
+Subject: [PATCH] #16764: Build break with poppler 22.03.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24982 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
+index 154e58a3f0..392dcd9e64 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
++++ b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName)
+ #endif
+ globalParams->setErrQuiet(gTrue);
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ PDFDoc pdfDoc{ std::make_unique<GooString>(fname) };
++#else
+ PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};
++#endif
+ if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)
+ return QImage();
+
+@@ -342,7 +346,11 @@ bool PdfPlug::convert(const QString& fn)
+ globalParams->setErrQuiet(gTrue);
+ // globalParams->setPrintCommands(gTrue);
+ QList<OptionalContentGroup*> ocgGroups;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ auto pdfDoc = std::make_unique<PDFDoc>(std::make_unique<GooString>(fname));
++#else
+ auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(fname, nullptr, nullptr, nullptr));
++#endif
+ if (pdfDoc)
+ {
+ if (pdfDoc->getErrorCode() == errEncrypted)
+@@ -361,8 +369,13 @@ bool PdfPlug::convert(const QString& fn)
+ #else
+ auto fname = new GooString(QFile::encodeName(fn).data());
+ #endif
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ std::optional<GooString> userPW(std::in_place, text.toLocal8Bit().data());
++ pdfDoc.reset(new PDFDoc(std::make_unique<GooString>(fname), userPW, userPW, nullptr));
++#else
+ auto userPW = new GooString(text.toLocal8Bit().data());
+ pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr));
++#endif
+ qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+ }
+ if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))
diff --git a/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch b/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch
new file mode 100644
index 000000000000..e15ec7d81266
--- /dev/null
+++ b/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch
@@ -0,0 +1,288 @@
+From f2237b8f0b5cf7690e864a22ef7a63a6d769fa36 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Fri, 1 Apr 2022 23:52:32 +0000
+Subject: [PATCH] Fix build with poppler 22.04.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@25074 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 123 ++++++++++++++---------
+ 1 file changed, 78 insertions(+), 45 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index e20a81f99e..5626fe3477 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -174,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s)
+ int shade = 100;
+ currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);
+ fontSize = state->getFontSize();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (state->getFont() && state->getFont()->getName())
++ fontName = new GooString(state->getFont()->getName().value());
++#else
+ if (state->getFont())
+ fontName = state->getFont()->getName()->copy();
++#endif
+ itemText = s->copy();
+ }
+
+@@ -357,7 +362,12 @@ std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key
+ GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
+ {
+ SlaOutputDev *dev = (SlaOutputDev*)user_data;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ const PDFRectangle& annotRect = annota->getRect();;
++ const PDFRectangle* box = &annotRect;
++#else
+ PDFRectangle *box = annota->getRect();
++#endif
+ double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX;
+ double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY;
+ double width = box->x2 - box->x1;
+@@ -684,7 +694,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
+ if (apa || !achar)
+ {
+ AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ const PDFRectangle& annotaRect = annota->getRect();
++ Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr);
++#else
+ Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr);
++#endif
+ ano->draw(gfx, false);
+ if (!bgFound)
+ m_currColorFill = annotOutDev->currColorFill;
+@@ -2916,22 +2931,27 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
+
+ void SlaOutputDev::updateFont(GfxState *state)
+ {
+- GfxFont *gfxFont;
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ std::optional<GfxFontLoc> fontLoc;
++ std::string fileName;
++ std::unique_ptr<FoFiTrueType> ff;
++ std::optional<std::vector<unsigned char>> tmpBuf;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ std::optional<GfxFontLoc> fontLoc;
+ const GooString * fileName = nullptr;
+ std::unique_ptr<FoFiTrueType> ff;
++ char* tmpBuf = nullptr;
+ #else
+ GfxFontLoc * fontLoc = nullptr;
+ GooString * fileName = nullptr;
+ FoFiTrueType * ff = nullptr;
++ char* tmpBuf = nullptr;
+ #endif
+ GfxFontType fontType;
+ SlaOutFontFileID *id;
+ SplashFontFile *fontFile;
+ SplashFontSrc *fontsrc = nullptr;
+ Object refObj, strObj;
+- char *tmpBuf = nullptr;
+ int tmpBufLen = 0;
+ int *codeToGID = nullptr;
+ const double *textMat = nullptr;
+@@ -2943,7 +2963,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+
+ m_font = nullptr;
+
+- gfxFont = state->getFont();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ GfxFont* gfxFont = state->getFont().get();
++#else
++ GfxFont* gfxFont = state->getFont();
++#endif
+ if (!gfxFont)
+ goto err1;
+
+@@ -2968,15 +2992,23 @@ void SlaOutputDev::updateFont(GfxState *state)
+ if (fontLoc->locType == gfxFontLocEmbedded)
+ {
+ // if there is an embedded font, read it to memory
+- tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef());
+ if (! tmpBuf)
+ goto err2;
++#else
++ tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
++ if (!tmpBuf)
++ goto err2;
++#endif
+
+ // external font
+ }
+ else
+ { // gfxFontLocExternal
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ fileName = fontLoc->path;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ fileName = fontLoc->pathAsGooString();
+ #else
+ fileName = fontLoc->path;
+@@ -2985,52 +3017,54 @@ void SlaOutputDev::updateFont(GfxState *state)
+ }
+
+ fontsrc = new SplashFontSrc;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ fontsrc->setFile(fileName);
++ else
++ fontsrc->setBuf(std::move(tmpBuf.value()));
++#else
+ if (fileName)
+ fontsrc->setFile(fileName, gFalse);
+ else
+ fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
++#endif
+
+ // load the font file
+ switch (fontType) {
+ case fontType1:
+- if (!(fontFile = m_fontEngine->loadType1Font(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontType1C:
+- if (!(fontFile = m_fontEngine->loadType1CFont(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontType1COT:
+- if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontTrueType:
+ case fontTrueTypeOT:
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ ff = FoFiTrueType::load(fileName.c_str());
++ else
++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
++#else
+ if (fileName)
+ ff = FoFiTrueType::load(fileName->getCString());
+ else
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
++#endif
+ if (ff)
+ {
+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+@@ -3047,24 +3081,17 @@ void SlaOutputDev::updateFont(GfxState *state)
+ codeToGID = nullptr;
+ n = 0;
+ }
+- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+- id,
+- fontsrc,
+- codeToGID, n)))
++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontCIDType0:
+ case fontCIDType0C:
+- if (!(fontFile = m_fontEngine->loadCIDFont(
+- id,
+- fontsrc)))
++ if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+@@ -3080,10 +3107,7 @@ void SlaOutputDev::updateFont(GfxState *state)
+ codeToGID = nullptr;
+ n = 0;
+ }
+- if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
+- id,
+- fontsrc,
+- codeToGID, n)))
++ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))
+ {
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+ gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+@@ -3105,10 +3129,17 @@ void SlaOutputDev::updateFont(GfxState *state)
+ }
+ else
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ ff = FoFiTrueType::load(fileName.c_str());
++ else
++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
++#else
+ if (fileName)
+ ff = FoFiTrueType::load(fileName->getCString());
+ else
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
++#endif
+ if (! ff)
+ goto err2;
+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+@@ -3119,13 +3150,9 @@ void SlaOutputDev::updateFont(GfxState *state)
+ delete ff;
+ #endif
+ }
+- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+- id,
+- fontsrc,
+- codeToGID, n, faceIndex)))
++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+@@ -3269,9 +3296,15 @@ void SlaOutputDev::drawChar(GfxState* state, double x, double y, double dx, doub
+ GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
+ {
+ // qDebug() << "beginType3Char";
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ GfxFont *gfxFont;
++ if (!(gfxFont = state->getFont().get()))
++ return gTrue;
++#else
++ GfxFont* gfxFont;
+ if (!(gfxFont = state->getFont()))
+ return gTrue;
++#endif
+ if (gfxFont->getType() != fontType3)
+ return gTrue;
+ F3Entry f3e;
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 791cdea712c5..125a7d54e4cf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -4,7 +4,7 @@ version=1.5.8
revision=2
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
- -DWANT_GRAPHICSMAGICK=1"
+ -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
makedepends="qt5-devel qt5-tools-devel zlib-devel cairo-devel lcms2-devel
cups-devel libxml2-devel hyphen-devel ghostscript-devel boost-devel
From 445db84b1acc6a5dfa91ce05def409e958999777 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 16 Jun 2022 17:05:36 -0700
Subject: [PATCH 512/609] libreoffice: rebuild against libpoppler 22.06.0
---
.../libreoffice/patches/poppler-22.03.0.patch | 28 ++++++++
.../libreoffice/patches/poppler-22.04.0.patch | 71 +++++++++++++++++++
srcpkgs/libreoffice/template | 2 +-
3 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libreoffice/patches/poppler-22.03.0.patch
create mode 100644 srcpkgs/libreoffice/patches/poppler-22.04.0.patch
diff --git a/srcpkgs/libreoffice/patches/poppler-22.03.0.patch b/srcpkgs/libreoffice/patches/poppler-22.03.0.patch
new file mode 100644
index 000000000000..c6544b2575f9
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/poppler-22.03.0.patch
@@ -0,0 +1,28 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index ad6320139..e5f6d9c68 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -138,6 +138,15 @@ int main(int argc, char **argv)
+ _setmode( _fileno( g_binary_out ), _O_BINARY );
+ #endif
+
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++ PDFDoc aDoc( std::make_unique<GooString>(pFileName),
++ GooString(pOwnerPasswordStr),
++ GooString(pUserPasswordStr) );
++
++ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
++ GooString(pOwnerPasswordStr),
++ GooString(pUserPasswordStr) );
++#else
+ PDFDoc aDoc( pFileName,
+ pOwnerPasswordStr,
+ pUserPasswordStr );
+@@ -145,6 +154,7 @@ int main(int argc, char **argv)
+ PDFDoc aErrDoc( pErrFileName,
+ pOwnerPasswordStr,
+ pUserPasswordStr );
++#endif
+
+ // Check various permissions for aDoc.
+ PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
diff --git a/srcpkgs/libreoffice/patches/poppler-22.04.0.patch b/srcpkgs/libreoffice/patches/poppler-22.04.0.patch
new file mode 100644
index 000000000000..47f59673d69e
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/poppler-22.04.0.patch
@@ -0,0 +1,71 @@
+# Patch from FreeBSD (https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd)
+
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* g
+ {
+ // TODO(P3): Unfortunately, need to read stream twice, since
+ // we must write byte count to stdout before
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+ if( pBuf )
+ {
+ aNewFont.isEmbedded = true;
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ gfree(pBuf);
++#endif
+ }
+ }
+
+@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons
+ return;
+
+ int nSize = 0;
+- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+ if( !pBuf )
+ return;
+
+ // ---sync point--- see SYNC STREAMS above
+ fflush(stdout);
+-
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#else
++ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#endif
+ {
+- gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ gfree(pBuf);
++#endif
+ exit(1); // error
+ }
+ // ---sync point--- see SYNC STREAMS above
+ fflush(g_binary_out);
+- gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ gfree(pBuf);
++#endif
+ }
+
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state)
+ {
+ assert(state);
+
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ GfxFont *gfxFont = state->getFont();
++#else
++ GfxFont *gfxFont = state->getFont().get();
++#endif
+ if( !gfxFont )
+ return;
+
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6d35e14a3274..158df0f30ebc 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.3.3.2
-revision=2
+revision=3
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
From adb2e248c3d293612a90a92a16696d54c60ea21a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 5 Jul 2022 16:10:12 -0700
Subject: [PATCH 513/609] texlive: Remove poppler from makedepends
Texlive previously dropped support for libpoppler on 2020-05-14
---
srcpkgs/texlive/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 7a922bc07f2b..f3f8aa9995a2 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -60,7 +60,6 @@ configure_args="
--with-system-libpaper
--with-system-libpng
--with-system-mpfr
- --with-system-poppler
--with-system-pixman
--with-system-teckit
--with-system-zlib
@@ -69,8 +68,7 @@ configure_args="
hostmakedepends="pkg-config perl lua52-BitOp texinfo"
makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel
harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
- poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel
- libXaw-devel"
+ pixman-devel libteckit-devel zlib-devel zziplib-devel libXaw-devel"
depends="dialog ghostscript perl-Tk texlive-core texlive-latexmk xbps-triggers"
short_desc="TeX Live"
maintainer="fosslinux <fosslinux@aussies.space>"
From 6cf92743712a34e7f5ea82f2f93d3c92576a0942 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jul 2022 11:25:23 +0200
Subject: [PATCH 514/609] libuninameslist: update to 20220701.
---
srcpkgs/libuninameslist/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libuninameslist/template b/srcpkgs/libuninameslist/template
index 8b97662a4a31..0f31d5fe2c2a 100644
--- a/srcpkgs/libuninameslist/template
+++ b/srcpkgs/libuninameslist/template
@@ -1,6 +1,6 @@
# Template file for 'libuninameslist'
pkgname=libuninameslist
-version=20211114
+version=20220701
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/fontforge/libuninameslist"
distfiles="https://github.com/fontforge/libuninameslist/archive/${version}.tar.gz"
-checksum=c089c6164f2cef361c3419a07408be72d6b58d6ef224ec226724a9fa93c0d46e
+checksum=d3067298a5a8037a842400b48d8799abc1718ce0bd32828e8828303be79a8b37
pre_configure() {
autoreconf -fi
From f5b37d883fb5b2506db4f1a93bc9a47cb4d18d72 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jul 2022 11:27:00 +0200
Subject: [PATCH 515/609] perl-File-ShareDir-Install: update to 0.14.
---
srcpkgs/perl-File-ShareDir-Install/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-File-ShareDir-Install/template b/srcpkgs/perl-File-ShareDir-Install/template
index 7c49bdf8ce86..cddfa26d3616 100644
--- a/srcpkgs/perl-File-ShareDir-Install/template
+++ b/srcpkgs/perl-File-ShareDir-Install/template
@@ -1,7 +1,7 @@
# Template file for 'perl-File-ShareDir-Install'
pkgname=perl-File-ShareDir-Install
-version=0.13
-revision=3
+version=0.14
+revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/File-ShareDir-Install"
distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-$version.tar.gz"
-checksum=45befdf0d95cbefe7c25a1daf293d85f780d6d2576146546e6828aad26e580f9
+checksum=8f9533b198f2d4a9a5288cbc7d224f7679ad05a7a8573745599789428bc5aea0
pre_configure() {
export PERL_MM_FALLBACK_SILENCE_WARNING=yes
From b9e334bec901e53bc97b83e291366760586c4331 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jul 2022 11:27:05 +0200
Subject: [PATCH 516/609] perl-WWW-Mechanize: update to 2.10.
---
srcpkgs/perl-WWW-Mechanize/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index a098cc8e75a2..1ff4c9c27e97 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
# Template file for 'perl-WWW-Mechanize'
pkgname=perl-WWW-Mechanize
-version=2.09
+version=2.10
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/WWW-Mechanize"
distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=a671310766e11a963d0795915ec2335ab5b282d96db160e352bbd254720f3fa5
+checksum=e62787bfd9149b06989c86d55e4cde529e400c98b4dca40d51adb8a267a2cc3f
From 1e22e257b321845ae98621202e501d9aadcdccd5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:09 +0200
Subject: [PATCH 517/609] gtksourceview5: update to 5.4.2.
---
srcpkgs/gtksourceview5/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 2f056edbeeab..ade311c55c16 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
# Template file for 'gtksourceview5'
pkgname=gtksourceview5
-version=5.4.1
+version=5.4.2
revision=1
wrksrc="gtksourceview-${version}"
build_style=meson
@@ -19,19 +19,19 @@ homepage="https://wiki.gnome.org/Projects/GtkSourceView"
#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=eb3584099cfa0adc9a0b1ede08def6320bd099e79e74a2d0aefb4057cd93d68e
+checksum=ad140e07eb841910de483c092bd4885abd29baadd6e95fa22d93ed2df0b79de7
+make_check_pre="xvfb-run"
# Package build options
build_options="gir gtk_doc"
desc_option_gtk_doc="Build API docs via gtk-doc"
-build_options_default="gir"
+build_options_default="gir gtk_doc"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-do_check() {
- xvfb-run ninja -C build test
+pre_build() {
+ # help gi-docgen find gi files on cross
+ if [ -n "$CROSS_BUILD" ]; then
+ export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+ fi
}
gtksourceview5-devel_package() {
From b49662eedfdaa3a7660f9330c3f9602a01ba3ffd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jul 2022 12:49:04 +0200
Subject: [PATCH 518/609] openssl: update to 1.1.1q.
---
srcpkgs/openssl/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index b77267e3d098..317ae4995bb6 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
# Template file for 'openssl'
pkgname=openssl
-version=1.1.1n
+version=1.1.1q
revision=1
bootstrap=yes
build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <johnz@posteo.net>"
license="OpenSSL"
homepage="https://www.openssl.org"
distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a
+checksum=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
conf_files="/etc/ssl/openssl.cnf"
replaces="libressl>=0"
@@ -52,6 +52,11 @@ pre_build() {
make ${makejobs} depend
}
+pre_check() {
+ # developer test, fails due to different nm output
+ rm -f test/recipes/01-test_symbol_presence.t
+}
+
post_install() {
if [ ! "$CHROOT_READY" ]; then
rm -f "${DESTDIR}/usr/bin/c_rehash"
From 6c109e734d6221a6100fce548f1dc03de4268858 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 16 Apr 2022 18:50:48 -0700
Subject: [PATCH 519/609] simple-scan: update to 42.1
---
srcpkgs/simple-scan/patches/meson-0.61.patch | 37 --------------------
srcpkgs/simple-scan/patches/vala-0.56.patch | 25 -------------
srcpkgs/simple-scan/template | 5 +--
3 files changed, 3 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch
delete mode 100644 srcpkgs/simple-scan/patches/vala-0.56.patch
diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch
deleted file mode 100644
index e193747322c0..000000000000
--- a/srcpkgs/simple-scan/patches/meson-0.61.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Tue, 16 Nov 2021 02:43:11 +0800
-Subject: [PATCH] Remove incorrect i18n.merge_file argument
-
-The positional argument was being silently ignored until meson 0.60.0 where
-it fails with "ERROR: Function does not take positional arguments".
----
- data/meson.build | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2b5a0ee3..cf6e4ae1 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
- install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
- meson.add_install_script ('meson_compile_gschema.py')
-
--i18n.merge_file ('desktop-file',
-- input: 'simple-scan.desktop.in',
-+i18n.merge_file (input: 'simple-scan.desktop.in',
- output: 'simple-scan.desktop',
- install: true,
- install_dir: join_paths (datadir, 'applications'),
- po_dir: '../po',
- type: 'desktop')
-
--i18n.merge_file ('appdata-file',
-- input: 'simple-scan.appdata.xml.in',
-+i18n.merge_file (input: 'simple-scan.appdata.xml.in',
- output: 'simple-scan.appdata.xml',
- install: true,
- install_dir: join_paths (datadir, 'metainfo'),
---
-GitLab
-
diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch
deleted file mode 100644
index 0820cee20e40..000000000000
--- a/srcpkgs/simple-scan/patches/vala-0.56.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 6 Nov 2021 19:46:07 +0100
-Subject: [PATCH] Fix accessibility conflict of constant and its value
-
----
- src/simple-scan.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/simple-scan.vala b/src/simple-scan.vala
-index c15a5418..71f32de9 100644
---- a/src/simple-scan.vala
-+++ b/src/simple-scan.vala
-@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application
- static bool show_version;
- static bool debug_enabled;
- static string? fix_pdf_filename = null;
-- public const OptionEntry[] options =
-+ const OptionEntry[] options =
- {
- { "version", 'v', 0, OptionArg.NONE, ref show_version,
- /* Help string for command line --version flag */
---
-GitLab
-
diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index 50ac5f2ea0bf..effd37a933ed 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,6 +1,6 @@
# Template file for 'simple-scan'
pkgname=simple-scan
-version=40.7
+version=42.1
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -10,5 +10,6 @@ short_desc="GTK Simple scanning utility"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/simple-scan"
+changelog="https://gitlab.gnome.org/GNOME/simple-scan/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7c551852cb5af7d34aa989f8ad5ede3cbe31828cf8dd5aec2b2b6fdcd1ac3d53
+checksum=859bc0611c1769b5bdaba9639deed359f50474c2eecf58bbbfd7ce21911b2226
From 57cc8552496e03355df46858ec5a640e06c268c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 16 Apr 2022 18:52:04 -0700
Subject: [PATCH 520/609] totem: update to 42.0
---
srcpkgs/totem/patches/meson-0.61.patch | 39 --------------------------
srcpkgs/totem/template | 11 ++++----
2 files changed, 6 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/totem/patches/meson-0.61.patch
diff --git a/srcpkgs/totem/patches/meson-0.61.patch b/srcpkgs/totem/patches/meson-0.61.patch
deleted file mode 100644
index 8f05c5c7a015..000000000000
--- a/srcpkgs/totem/patches/meson-0.61.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 61e3a957cb7339c6614e764fcf1120d967d687e9 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Thu, 6 Jan 2022 17:21:28 +0100
-Subject: [PATCH] build: Remove unused i18n.merge_file() "name"
-
-data/meson.build:78:0: ERROR: Function does not take positional arguments.
-data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments.
----
- data/appdata/meson.build | 1 -
- data/meson.build | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index c4d17e927..c2e646327 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,7 +1,6 @@
- appdata = 'org.gnome.Totem.appdata.xml'
-
- appdata_file = i18n.merge_file (
-- 'appdata',
- input: appdata + '.in',
- output: appdata,
- install: true,
-diff --git a/data/meson.build b/data/meson.build
-index b31ce755c..8eebe3db1 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -76,7 +76,6 @@ desktop_in = configure_file(
- )
-
- desktop_file = i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
---
-GitLab
-
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index bccea7f2a7c3..aed625f2f65a 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,24 +1,25 @@
# Template file for 'totem'
pkgname=totem
-version=3.38.2
-revision=2
+version=42.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
hostmakedepends="gettext itstool pkg-config gstreamer1 gst-plugins-base1
gst-plugins-good1 glib-devel"
-makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
+makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel libhandy1-devel
evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
gst-plugins-ugly1 libSM-devel libXtst-devel libepc-devel libpeas-devel
nautilus-devel zeitgeist-devel gst-plugins-base1-devel"
-depends="grilo-plugins gst-libav gst-plugins-good1 gst-plugins-ugly1 tracker3"
+depends="grilo-plugins gst-libav gst-plugins-good1 gst-plugins-ugly1 tracker"
checkdepends="xvfb-run"
short_desc="GNOME integrated movie player based on Gstreamer"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Videos"
+changelog="https://gitlab.gnome.org/GNOME/totem/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce562e2b26cbcfc0c678538dcc81f9dc15ce60d5a89ee4358907bf634304c40
+checksum=4af0491ddb95df8b33aee399d3a50f9c7ab17de88d3af63356567cf88f57e6ab
make_check_pre="xvfb-run"
# XXX xulrunner plugin.
From b003aaf9469f4be401eb6b6c053969290578e868 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:02:53 -0700
Subject: [PATCH 521/609] evince: update to 42.3.
---
srcpkgs/evince/patches/docs-cross.patch | 28 +++++++++++++
srcpkgs/evince/patches/meson-0.61.patch | 52 -------------------------
srcpkgs/evince/template | 27 +++++++------
3 files changed, 43 insertions(+), 64 deletions(-)
create mode 100644 srcpkgs/evince/patches/docs-cross.patch
delete mode 100644 srcpkgs/evince/patches/meson-0.61.patch
diff --git a/srcpkgs/evince/patches/docs-cross.patch b/srcpkgs/evince/patches/docs-cross.patch
new file mode 100644
index 000000000000..dbb8ce7324b4
--- /dev/null
+++ b/srcpkgs/evince/patches/docs-cross.patch
@@ -0,0 +1,28 @@
+From 26051aa87e50e075e3acd87c9a698f2026efb5f7 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 6 Jul 2022 12:47:04 +0200
+Subject: [PATCH] build: fix docs cross build
+
+gi-docgen is a binary that runs on the host, so the meson should search
+for it on the host
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index b5dbea53a..1e3115f05 100644
+--- a/meson.build
++++ b/meson.build
+@@ -169,7 +169,8 @@ m_dep = cc.find_library('m')
+
+ gidocgen_dep = dependency('gi-docgen', version: '>= 2021.1',
+ fallback: ['gi-docgen', 'dummy_dep'],
+- required: get_option('gtk_doc'))
++ required: get_option('gtk_doc'),
++ native: true)
+
+ # Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with
+ # cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi,
+--
+GitLab
+
diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch
deleted file mode 100644
index baed9dc1af8f..000000000000
--- a/srcpkgs/evince/patches/meson-0.61.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:22:45 +0800
-Subject: [PATCH] Remove incorrect args for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments for
-a time and explicitly rejects with error since meson 0.60.0
----
- backend/meson.build | 1 -
- data/meson.build | 1 -
- meson.build | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/backend/meson.build b/backend/meson.build
-index e44c1d6d7..ab3df9acf 100644
---- a/backend/meson.build
-+++ b/backend/meson.build
-@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
- )
-
- i18n.merge_file(
-- appstream,
- input: appstream_in,
- output: appstream,
- po_dir: po_dir,
-diff --git a/data/meson.build b/data/meson.build
-index 8a308b853..afc302098 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -15,7 +15,6 @@ foreach desktop: desktops
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
-diff --git a/meson.build b/meson.build
-index 34c86661f..f74efb3c4 100644
---- a/meson.build
-+++ b/meson.build
-@@ -492,7 +492,6 @@ install_headers(
- appdata = ev_namespace + '.appdata.xml'
-
- i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 1fbba2b8c8bc..228f202a23b2 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,14 +1,13 @@
# Template file for 'evince'
pkgname=evince
-version=41.3
+version=42.3
revision=1
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
- -Dcomics=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled
- -Dt1lib=disabled"
-hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
- itstool pkg-config perl-XML-Parser appstream-glib"
+ -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled"
+hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen)
+ glib-devel itstool pkg-config perl-XML-Parser appstream-glib"
# XXX missing packages for DVI backend.
makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
libgxps-devel libsecret-devel libspectre-devel nautilus-devel
@@ -18,15 +17,19 @@ short_desc="GNOME Document viewer for multiple document formats"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evince"
+changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0
+checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e
build_options="gir gtk_doc"
-build_options_default="gir"
+build_options_default="gir gtk_doc"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
+pre_build() {
+ # help gi-docgen find gi files on cross
+ if [ -n "$CROSS_BUILD" ]; then
+ export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+ fi
+}
libevince_package() {
short_desc+=" - runtime libraries"
@@ -39,14 +42,14 @@ libevince_package() {
}
evince-devel_package() {
- depends="gtk+3-devel libevince>=${version}_${revision}"
+ depends="gtk+3-devel libglib-devel libevince>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
+ vmove usr/share/doc
fi
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
From d59cb59f8f909e1432f289d7bae7298273356625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 522/609] yelp: update to 42.0
---
srcpkgs/yelp/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..ee51f61289ca 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,28 +1,27 @@
# Template file for 'yelp'
pkgname=yelp
-version=41.2
+version=42.1
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
short_desc="Help browser for GNOME desktop"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp"
# change this when it moves to a new major release
-changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41
yelp-devel_package() {
depends="yelp-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
}
}
From 530615544e4a9d89a23d22f8cc08db85ba4fef85 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:34 -0700
Subject: [PATCH 523/609] yelp-xsl: update to 42.0
---
srcpkgs/yelp-xsl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 1858aeba250c..8a44b352bfe1 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,10 +1,10 @@
# Template file for 'yelp-xsl'
# keep up to date with yelp
pkgname=yelp-xsl
-version=41.1
+version=42.0
revision=1
build_style=gnu-configure
-hostmakedepends="pkg-config intltool itstool libxslt"
+hostmakedepends="pkg-config gettext itstool libxslt"
makedepends="libxslt-devel"
short_desc="Help browser for GNOME desktop - XSL and misc files"
maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54
+checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846
From cdb6b55a9f7afdc44e8892bf3bca168165abf738 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:52 -0700
Subject: [PATCH 524/609] yelp-tools: update to 42.0
---
srcpkgs/yelp-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index ac7dd742357f..8ce722e9b5f2 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,6 +1,6 @@
# Template file for 'yelp-tools'
pkgname=yelp-tools
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends="pkg-config itstool libxslt python3-lxml"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272
+checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4
From c7670c8f5ec6aa07034591b04ec8fe0fa65da062 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 525/609] gsettings-desktop-schemas: update to 42.0
---
srcpkgs/gsettings-desktop-schemas/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 3d841c45f8a8..1779e26f56df 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=41.0
+version=42.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,8 +11,9 @@ short_desc="Collection of GSettings schemas"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
+changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
# Package build options
build_options="gir"
From d1f42edf8827e2fe71f9e9a5716a8f85d5666fd2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:40:26 -0700
Subject: [PATCH 526/609] libportal: update to 0.6
---
common/shlibs | 4 +-
srcpkgs/libportal-gtk3 | 1 +
srcpkgs/libportal-gtk3-devel | 1 +
srcpkgs/libportal-gtk4 | 1 +
srcpkgs/libportal-gtk4-devel | 1 +
srcpkgs/libportal/template | 80 ++++++++++++++++++++++++++++++------
6 files changed, 75 insertions(+), 13 deletions(-)
create mode 120000 srcpkgs/libportal-gtk3
create mode 120000 srcpkgs/libportal-gtk3-devel
create mode 120000 srcpkgs/libportal-gtk4
create mode 120000 srcpkgs/libportal-gtk4-devel
diff --git a/common/shlibs b/common/shlibs
index 8064f62c7a02..7a0259426425 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,7 +3924,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
libhidrd_fmt.so.0 hidrd-0.2.0_1
libjcat.so.1 libjcat-0.1.2_1
libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-gtk3-0.6_1
+libportal-gtk4.so.1 libportal-gtk4-0.6_1
libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal-gtk3 b/srcpkgs/libportal-gtk3
new file mode 120000
index 000000000000..2e15139a5d95
--- /dev/null
+++ b/srcpkgs/libportal-gtk3
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal-gtk3-devel b/srcpkgs/libportal-gtk3-devel
new file mode 120000
index 000000000000..2e15139a5d95
--- /dev/null
+++ b/srcpkgs/libportal-gtk3-devel
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal-gtk4 b/srcpkgs/libportal-gtk4
new file mode 120000
index 000000000000..2e15139a5d95
--- /dev/null
+++ b/srcpkgs/libportal-gtk4
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal-gtk4-devel b/srcpkgs/libportal-gtk4-devel
new file mode 120000
index 000000000000..2e15139a5d95
--- /dev/null
+++ b/srcpkgs/libportal-gtk4-devel
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..31228a120f12 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,33 +1,89 @@
# Template file for 'libportal'
pkgname=libportal
-version=0.4
+version=0.6
revision=1
build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala)
+ $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
short_desc="Flatpak portal library"
maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/flatpak/libportal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
-build_options="gtk_doc"
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
+if [ -n "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qemu-user-static prelink-cross"
fi
libportal-devel_package() {
depends="libportal>=${version}_${revision} glib-devel"
short_desc+=" - development files"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
+ vmove usr/include/libportal
+ vmove "usr/lib/libportal.so"
+ vmove usr/lib/pkgconfig/libportal.pc
if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
+ vmove usr/share/doc
+ fi
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/Xdp-1.0.gir
+ vmove "usr/share/vala/vapi/libportal.*"
+ fi
+ }
+}
+
+libportal-gtk3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - GTK3"
+ pkg_install() {
+ vmove "usr/lib/libportal-gtk3.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove "usr/lib/girepository-1.0/XdpGtk3*"
+ fi
+ }
+}
+
+libportal-gtk3-devel_package() {
+ depends="libportal-gtk3>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk+3-devel"
+ short_desc+=" - GTK3 - development files"
+ pkg_install() {
+ vmove usr/include/libportal-gtk3
+ vmove "usr/lib/libportal-gtk3.so"
+ vmove usr/lib/pkgconfig/libportal-gtk3.pc
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/XdpGtk3*
+ vmove "usr/share/vala/vapi/libportal-gtk3*"
+ fi
+ }
+}
+
+libportal-gtk4_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - GTK4"
+ pkg_install() {
+ vmove "usr/lib/libportal-gtk4.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove "usr/lib/girepository-1.0/XdpGtk4*"
+ fi
+ }
+}
+
+libportal-gtk4-devel_package() {
+ depends="libportal-gtk4>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk4-devel"
+ short_desc+=" - GTK4 - development files"
+ pkg_install() {
+ vmove usr/include/libportal-gtk4
+ vmove "usr/lib/libportal-gtk4.so"
+ vmove usr/lib/pkgconfig/libportal-gtk4.pc
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/XdpGtk4*
+ vmove "usr/share/vala/vapi/libportal-gtk4*"
fi
}
}
From 2b1e2def19fdb889f78ba64d74b60cfb7d567fa1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 527/609] nautilus: update to 42.2
---
srcpkgs/nautilus/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..571013b24c7d 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,24 +1,25 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=41.2
+version=42.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
+hostmakedepends="gettext glib-devel libxslt pkg-config tracker"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
- libhandy1-devel libportal-devel"
+ libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker3-miners tracker3"
-checkdepends="tracker3 tracker3-miners python3-gobject dbus"
+ tracker-miners tracker"
+checkdepends="tracker tracker-miners python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Nautilus"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+checksum=99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2
# tests timeout:
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=extended
From 54fffdced658943885c93413ec2625779b5a9dd8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:42:41 -0700
Subject: [PATCH 528/609] gnome-todo: rebuild against libportal 0.6
---
srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
srcpkgs/gnome-todo/template | 4 +-
2 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch
diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+ {
+ "name" : "libportal",
+ "buildsystem" : "meson",
++ "config-opts" : [
++ "-Dbackends=gtk4"
++ ],
+ "sources" : [
+ {
+ "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+
+ #define AUTOSTART_NOTIFICATION_ID "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3 /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+
+ plugins_deps += [
+- dependency('libportal'),
++ dependency('libportal-gtk4'),
+ ]
+
+ plugins_sources += files(
+--
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..dc3031156c79 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-todo'
pkgname=gnome-todo
version=41.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="pkg-config glib-devel gettext itstool
$(vopt_if gir 'gobject-introspection')"
makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
- libpeas-devel libportal-devel evolution-data-server-devel"
+ libpeas-devel libportal-gtk4-devel evolution-data-server-devel"
short_desc="Task manager designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From ca2be47365323feb16572c96db146a5e4675eebc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:40:43 -0700
Subject: [PATCH 529/609] gcolor3: rebuild against libportal 0.6
---
srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
srcpkgs/gcolor3/template | 4 +-
2 files changed, 55 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch
diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+ 'libportal',
+ required: true,
++ version: '>= 0.5',
+ fallback: ['libportal', 'libportal_dep'],
+ default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+ dependencies: [
+ dep_gtk,
+ dep_libportal,
++ dep_libportal_gtk3,
+ dep_lm
+ ],
+ install: true,
+--
diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..fd95c684a674 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,11 +1,11 @@
# Template file for 'gcolor3'
pkgname=gcolor3
version=2.4.0
-revision=1
+revision=2
wrksrc="gcolor3-v${version}"
build_style=meson
hostmakedepends="pkg-config gettext glib-devel"
-makedepends="gtk+3-devel libportal-devel"
+makedepends="gtk+3-devel libportal-gtk3-devel"
short_desc="Color selection dialog written in GTK+3"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
From 6adc53b4042eacd40ab0358703ca46f10a27ef92 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 530/609] gnome-builder: update to 42.1
---
srcpkgs/gnome-builder/patches/format-bug.diff | 11 -----------
srcpkgs/gnome-builder/template | 10 +++++-----
2 files changed, 5 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/gnome-builder/patches/format-bug.diff
diff --git a/srcpkgs/gnome-builder/patches/format-bug.diff b/srcpkgs/gnome-builder/patches/format-bug.diff
deleted file mode 100644
index cc86932a9155..000000000000
--- a/srcpkgs/gnome-builder/patches/format-bug.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c.orig 2022-01-21 08:41:29.263933575 +0100
-+++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c 2022-01-21 08:42:52.177180207 +0100
-@@ -597,7 +597,7 @@ is_known_worker (GTask *task,
- }
-
- finish:
-- g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size);
-+ g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size);
- ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task),
- g_steal_pointer (&state->invocation),
- found,
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..67de24f18938 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=41.3
+version=42.1
revision=1
build_style=meson
build_helper=qemu
@@ -10,17 +10,17 @@ hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-intro
makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- python3-gobject-devel sysprof-devel glade3-devel libportal-devel cmark-devel"
+ libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel libhandy1-devel
+ python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel cmark-devel"
depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
checkdepends="xvfb-run"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
case "$XBPS_TARGET_MACHINE" in
*-musl)
From 408533af50be96a85d7955db76163451f5c5706e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 531/609] eog: update to 42.2
---
srcpkgs/eog/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..30522c83eb5a 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,21 @@
# Template file for 'eog'
pkgname=eog
-version=41.1
+version=42.2
revision=1
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-gtk3-devel libhandy1-devel"
depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
short_desc="Eye of GNOME graphics viewer program"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
+changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=0e4d4a6a2ee1a240ae8b58449f02ba2c64b7f99490d0b8915d7f52c90a58045e
shlib_provides="libeog.so"
lib32disabled=yes
@@ -22,7 +23,7 @@ build_options="gir"
build_options_default="gir"
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" libglib-devel"
+ hostmakedepends+=" libglib-devel gtk-update-icon-cache"
fi
eog-devel_package() {
From 5a7f2c94e0fd48dc50437e66649309c49b519456 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 532/609] eog-plugins: update to 42.1
---
srcpkgs/eog-plugins/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..cea2832f73d3 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,19 +1,20 @@
# Template file for 'eog-plugins'
pkgname=eog-plugins
-version=3.26.8
+version=42.1
revision=1
-build_style=gnu-configure
+build_style=meson
pycompile_dirs="usr/lib/eog/plugins"
-hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="eog-devel libhandy1-devel libgdata-devel
libchamplain-devel libpeas-devel libexif-devel exempi-devel
gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
depends="eog gsettings-desktop-schemas python3-gobject"
short_desc="Eye of GNOME plugins"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
+homepage="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
+changelog="https://gitlab.gnome.org/GNOME/eog-plugins/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=8b7211ca145a57fd5a929afd07905de742fd150743aaa2f600d718e832ad3e5f
python_version=3
lib32disabled=yes
From 72f868ea5c8ad00260012174384eaa3f76dd2705 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 533/609] epiphany: update to 42.2
---
srcpkgs/epiphany/patches/meson-0.61.patch | 33 -----------------------
srcpkgs/epiphany/template | 8 +++---
2 files changed, 4 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch
diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch
deleted file mode 100644
index 1584627ca2d9..000000000000
--- a/srcpkgs/epiphany/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Wed, 24 Nov 2021 04:52:42 +0000
-Subject: [PATCH] Remove incorrect args for i18n.merge_file
-
-Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 46df3fd80..eac6b8224 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -16,7 +16,6 @@ install_data(
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop = i18n.merge_file(
-- 'desktop',
- input: configure_file(
- input: files('org.gnome.Epiphany.desktop.in.in'),
- output: 'org.gnome.Epiphany.desktop.in',
-@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
- appdata = i18n.merge_file(
-- 'appdata',
- input: configure_file(
- input: files('org.gnome.Epiphany.appdata.xml.in.in'),
- output: 'org.gnome.Epiphany.appdata.xml.in',
---
-GitLab
-
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..88eb6d8a8800 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=41.3
+version=42.2
revision=1
build_helper="gir"
build_style=meson
@@ -9,13 +9,13 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ nettle-devel nss-devel webkit2gtk-devel libportal-gtk3-devel libsoup-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
short_desc="Intuitive GNOME web browser"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=92c02cf886d10d2ccff5de658e1a420eab31d20bb50e746d430e9535b485192d
From 5b43d22ea0e615c863b041e48eb6900b2bb7d5b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:31:15 -0700
Subject: [PATCH 534/609] New package: gnome-bluetooth1-3.34.5
---
common/shlibs | 2 +-
srcpkgs/gnome-bluetooth1-devel | 1 +
.../gnome-bluetooth1/patches/meson-0.61.patch | 25 +++++++++++
srcpkgs/gnome-bluetooth1/template | 42 +++++++++++++++++++
srcpkgs/gnome-bluetooth1/update | 2 +
5 files changed, 71 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/gnome-bluetooth1-devel
create mode 100644 srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
create mode 100644 srcpkgs/gnome-bluetooth1/template
create mode 100644 srcpkgs/gnome-bluetooth1/update
diff --git a/common/shlibs b/common/shlibs
index 7a0259426425..fa1bbe96c3fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -686,7 +686,7 @@ libatkmm-1.6.so.1 atkmm-2.22.1_1
libgtkmm-3.0.so.1 gtkmm-2.99.5_1
libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
-libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth1-devel b/srcpkgs/gnome-bluetooth1-devel
new file mode 120000
index 000000000000..61c3fca4c52b
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1-devel
@@ -0,0 +1 @@
+gnome-bluetooth1
\ No newline at end of file
diff --git a/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-bluetooth1/template b/srcpkgs/gnome-bluetooth1/template
new file mode 100644
index 000000000000..a7eb602dcb2c
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/template
@@ -0,0 +1,42 @@
+# Template file for 'gnome-bluetooth1'
+pkgname=gnome-bluetooth1
+version=3.34.5
+revision=1
+wrksrc="gnome-bluetooth-${version}"
+build_helper="gir"
+build_style=meson
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
+hostmakedepends="pkg-config gettext itstool $(vopt_if gir gobject-introspection) glib-devel"
+makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
+short_desc="GNOME Bluetooth Subsystem"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
+distfiles="${GNOME_SITE}/gnome-bluetooth/${version%.*}/gnome-bluetooth-${version}.tar.xz"
+checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+
+build_options="gir"
+build_options_default="gir"
+
+post_install() {
+ # conflicts with gnome-bluetooth
+ rm ${DESTDIR}/usr/bin/bluetooth-sendto
+ rm ${DESTDIR}/usr/share/applications/bluetooth-sendto.desktop
+ rm ${DESTDIR}/usr/share/man/man1/bluetooth-sendto.1
+}
+
+gnome-bluetooth1-devel_package() {
+ depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
diff --git a/srcpkgs/gnome-bluetooth1/update b/srcpkgs/gnome-bluetooth1/update
new file mode 100644
index 000000000000..6b527006d24d
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/update
@@ -0,0 +1,2 @@
+pkgname="gnome-bluetooth"
+pattern="\Q$pkgname\E-\K3\.[0-9.]*[0-9](?=)"
From 123cadb9a2bece4e0594a59b1a9e8e252f9c6100 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 535/609] gnome-bluetooth: update to 42.1
---
common/shlibs | 1 +
.../gnome-bluetooth/patches/meson-0.61.patch | 25 -------------------
srcpkgs/gnome-bluetooth/template | 12 ++++-----
3 files changed, 7 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
diff --git a/common/shlibs b/common/shlibs
index fa1bbe96c3fa..d6a318a81250 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -687,6 +687,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
+libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
deleted file mode 100644
index c6962edd4f05..000000000000
--- a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 7 Jan 2022 12:51:22 +0100
-Subject: [PATCH] build: Fix build for newer versions of meson
-
-sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
----
- sendto/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/sendto/meson.build b/sendto/meson.build
-index 24a4e394..3e233a03 100644
---- a/sendto/meson.build
-+++ b/sendto/meson.build
-@@ -22,7 +22,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
---
-GitLab
-
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..c764e5b760fa 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-bluetooth'
pkgname=gnome-bluetooth
-version=3.34.5
+version=42.1
revision=1
build_helper="gir"
build_style=meson
configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+hostmakedepends="pkg-config gettext itstool $(vopt_if gir gobject-introspection) glib-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
checkdepends="python3-dbus"
short_desc="GNOME Bluetooth Subsystem"
@@ -15,13 +15,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=d9fe5d673f27a40a86a9e23d93cb99367e7b06df51872e8ac5ecc9938e55b5eb
build_options="gir"
build_options_default="gir"
gnome-bluetooth-devel_package() {
- depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}"
+ depends="glib-devel gtk4-devel ${sourcepkg}>=${version}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 21a5946b1ac0b9864e8f9b1e6cf756d749e0b234 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 17:52:37 +0200
Subject: [PATCH 536/609] gnome-flashback: use gnome-bluetooth1
---
srcpkgs/gnome-flashback/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index fce623766e1c..8a8561df00b2 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
version=3.42.1
-revision=1
+revision=2
build_helper=gir
build_style=gnu-configure
configure_args="--with-compiz-session --enable-compile-warnings=minimum"
@@ -9,9 +9,9 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel"
makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel
libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel
- gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel
+ gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel
gsettings-desktop-schemas-devel libXxf86vm-devel"
-depends="gnome-bluetooth gnome-session gnome-settings-daemon
+depends="gnome-bluetooth1 gnome-session gnome-settings-daemon
gnome-panel gnome-themes-extra metacity"
short_desc="GNOME session with similar user experience to the GNOME 2.x series"
maintainer="shizonic <realtiaz@gmail.com>"
From 443928bb9ba7d08fdbbd7d6f1c45699e69e43ed9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:15:58 +0200
Subject: [PATCH 537/609] budgie-control-center: use gnome-bluetooth1
---
srcpkgs/budgie-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index 15d7ee0dca87..416cbf8d584b 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,12 +1,12 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.0.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel
- colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel
+ colord-devel colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel
gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel
libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel
polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel
From 5ff40150fcd3d8ab898ea35428c0fbf5bcf767a6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:15:59 +0200
Subject: [PATCH 538/609] budgie-desktop: use gnome-bluetooth1
---
srcpkgs/budgie-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 02d90c307eaf..f7b5a2b03cd3 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
- upower-devel gtk+3-devel polkit-devel gnome-bluetooth-devel gnome-menus-devel
+ upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
From f24174798e345ac5569034519545b0a98f279069 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:07 +0200
Subject: [PATCH 539/609] gnome-control-center: use gnome-bluetooth1
---
srcpkgs/gnome-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..92b9cb3d2f4a 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
version=41.4
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dcheese=$(vopt_if cheese true false)"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
- colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
+ colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
From d4c485622598a45cbf50b4ac63f60cd2cfcb0b8e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:09 +0200
Subject: [PATCH 540/609] gnome-core: use gnome-bluetooth1
---
srcpkgs/gnome-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..d7a7082b7a60 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=41.0
-revision=1
+revision=2
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="q66 <daniel@octaforge.org>"
@@ -26,7 +26,7 @@ depends="
glib-networking>=2.70.0
gmime3>=3.2.7
gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-bluetooth1>=3.34.5
gnome-color-manager>=3.36.0
gnome-control-center>=41.0
gnome-desktop>=41.0
From a55a0c99b44ebda473b71024a42442083faec6cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:24 +0200
Subject: [PATCH 541/609] gnome-shell: use gnome-bluetooth1
---
srcpkgs/gnome-shell/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index ff60caafa4ec..77450cb127a8 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=41.5
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
@@ -11,7 +11,7 @@ makedepends="gnome-control-center-devel at-spi2-atk-devel
evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
- gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
+ gnome-bluetooth1-devel pipewire-devel gstreamer1-devel"
depends="elogind gnome-control-center gsettings-desktop-schemas upower"
checkdepends="xvfb-run mesa-dri $depends"
short_desc="GNOME core user interface"
From 0d53b7b0de515af29259cebeec30189838477caa Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:05:14 -0700
Subject: [PATCH 542/609] gnome-calculator: update to 42.2.
---
srcpkgs/gnome-calculator/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index b496cf715cc4..28411fde0009 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-calculator'
pkgname=gnome-calculator
-version=41.1
+version=42.2
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="cmake gettext glib-devel itstool pkg-config vala"
-makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel
- libmpc-devel libsoup-devel libhandy1-devel"
+hostmakedepends="cmake gettext glib-devel itstool pkg-config vala
+ gtk-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel
+ libmpc-devel libsoup-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
short_desc="GNOME calculator"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calculator"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-calculator/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34
+checksum=33dab1bca43658d66520958b0f674cb0ad3185cfd30c12e459e7f69481c5c6a0
From 2a40c9a9d5c0573b7d188ef9a9d462ab6c91af12 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:24:55 -0700
Subject: [PATCH 543/609] gnome-contacts: update to 42.0
---
srcpkgs/gnome-contacts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 7805fa837c78..ac49f9c98db4 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel
- libchamplain-devel libnotify-devel vala-devel libhandy1-devel"
+ libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel libportal-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=63e3149b5d1475b7a2698005bb5f750f3c80a735717160e39df8cfdfebfccdf0
+checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
From a2800826a5b6ebcfc157a87272419fe5aadf8404 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:37:11 -0700
Subject: [PATCH 544/609] libdazzle: update to 3.44.0
---
srcpkgs/libdazzle/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 2abd4da3cfbd..590dce06ffe5 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
# Template file for 'libdazzle'
pkgname=libdazzle
-version=3.42.0
+version=3.44.0
revision=1
build_style=meson
build_helper="gir"
@@ -16,11 +16,8 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libdazzle"
changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925
-
-do_check() {
- xvfb-run ninja -C build test
-}
+checksum=3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae
+make_check_pre="xvfb-run"
build_options="gir"
build_options_default="gir"
From f062074770aaaefbdec52299eb8d04baa189fc19 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 545/609] at-spi2-core: update to 2.44.0
---
srcpkgs/at-spi2-core/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..1a9ce8bddcb8 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,6 +1,6 @@
# Template file for 'at-spi2-core'
pkgname=at-spi2-core
-version=2.42.0
+version=2.44.0
revision=1
build_style=meson
build_helper="gir"
@@ -11,21 +11,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
+make_check=no # non-trivial dbus setup
# Package build options
build_options="gir"
build_options_default="gir"
-# non-trivial dbus setup
-do_check() {
- :
-}
-
-post_install() {
- rm -rf ${DESTDIR}/usr/lib/systemd
-}
-
at-spi2-core-devel_package() {
depends="dbus-devel libglib-devel libX11-devel libXtst-devel libXi-devel
${sourcepkg}>=${version}_${revision}"
From 2b57059224ba7a1338e40465e15c341178d34b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 6 Jul 2022 11:19:55 +0200
Subject: [PATCH 546/609] dua-cli: update to 2.17.8.
---
srcpkgs/dua-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index 01e6bb8f26c3..e1f5a167c90b 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
# Template file for 'dua-cli'
pkgname=dua-cli
-version=2.17.7
+version=2.17.8
revision=1
build_style=cargo
short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/Byron/dua-cli"
changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=6ef774e96d256bc450da201f6f69b355c88a5dc0aa8d5ef21acda9394bf18482
+checksum=fc4df99b4445ade9c44eb71c0a5f3f329066af867fcb509abf78dea4c49df8e2
post_install() {
vlicense LICENSE
From b672a3b24a765fbd126281551754420af755310c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
<sigrid@ftrv.se>
Date: Tue, 5 Jul 2022 23:56:53 +0200
Subject: [PATCH 547/609] cmus: update to 2.10.0
---
srcpkgs/cmus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 6dc8d61b8652..0fcb424ce336 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
# Template file for 'cmus'
pkgname=cmus
-version=2.9.1
-revision=2
+version=2.10.0
+revision=1
build_style=configure
configure_args="prefix=/usr LD=$CC"
hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://cmus.github.io"
distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
-checksum=6fb799cae60db9324f03922bbb2e322107fd386ab429c0271996985294e2ef44
+checksum=ff40068574810a7de3990f4f69c9c47ef49e37bd31d298d372e8bcdafb973fff
build_options="elogind"
build_options_default="elogind"
desc_option_elogind="Support MPRIS interface via elogind"
From 2a6a6882cf4e2252cce23c7b4b5e0f4f6525c92d Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Wed, 6 Jul 2022 00:38:18 +0530
Subject: [PATCH 548/609] musikcube: update to 0.98.0
---
.../patches/fix-mpris-detection.patch | 25 -------------------
srcpkgs/musikcube/template | 8 +++---
2 files changed, 4 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch
diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
deleted file mode 100644
index dc7035d06693..000000000000
--- a/srcpkgs/musikcube/patches/fix-mpris-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-In Void linux, elogind provides libsystemd
-
-diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
-index ce0eea9b..5b067671 100644
---- a/.cmake/AddOsSpecificPlugins.cmake
-+++ b/.cmake/AddOsSpecificPlugins.cmake
-@@ -6,7 +6,7 @@ endif()
-
- # systemd / MPRIS detection
- if (NOT ENABLE_MPRIS MATCHES "false")
-- find_library(LIB_SYSTEMD NAMES systemd)
-+ find_library(LIB_SYSTEMD NAMES elogind)
- if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
- message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
- message(STATUS "[mpris] setting ENABLE_MPRIS=true")
-diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
-index fdee62d2..7a941d08 100644
---- a/src/plugins/mpris/CMakeLists.txt
-+++ b/src/plugins/mpris/CMakeLists.txt
-@@ -6,4 +6,4 @@ find_package(PkgConfig)
- pkg_check_modules (SYSTEMD REQUIRED libsystemd)
-
- add_library(mpris SHARED ${mpris_SOURCES})
--target_link_libraries(mpris systemd)
-+target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 01afa616123a..2b75cbd976ea 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,11 +1,10 @@
# Template file for 'musikcube'
pkgname=musikcube
-version=0.97.0
+version=0.98.0
revision=1
build_style=cmake
make_cmd=make
-configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true
- -DENABLE_BUNDLED_TAGLIB=false"
+configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
hostmakedepends="pkg-config"
makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
@@ -16,8 +15,9 @@ short_desc="Terminal-based music player in c++"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="BSD-3-Clause"
homepage="https://musikcube.com/"
+changelog="https://raw.githubusercontent.com/clangen/musikcube/master/CHANGELOG.txt"
distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5
+checksum=a4ae9d6d0fa5ce99de2e7bbc1de75cc8638704a2284b38a51178e23bbe55499c
build_options="elogind"
desc_option_elogind="Support MPRIS interface via elogind"
build_options_default="elogind"
From 54889129f02eb6002ae8183d1c703e5932f094c6 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Wed, 6 Jul 2022 00:26:22 +0530
Subject: [PATCH 549/609] yq: update to 3.0.1 and adopt
---
srcpkgs/yq/patches/fix-test-on-ci.patch | 15 ---------------
srcpkgs/yq/template | 10 +++++-----
2 files changed, 5 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/yq/patches/fix-test-on-ci.patch
diff --git a/srcpkgs/yq/patches/fix-test-on-ci.patch b/srcpkgs/yq/patches/fix-test-on-ci.patch
deleted file mode 100644
index 3ae4d675426d..000000000000
--- a/srcpkgs/yq/patches/fix-test-on-ci.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/kislyuk/yq/issues/114
-
-diff --git a/test/test.py b/test/test.py
-index f25dced..ffa7147 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -77,7 +77,7 @@ class TestYq(unittest.TestCase):
- unusable_tty_input = mock.Mock()
- unusable_tty_input.isatty = mock.Mock(return_value=True)
-
-- self.run_yq("{}", [], expect_exit_codes={0} if sys.stdin.isatty() else {2})
-+ self.run_yq("{}", [], expect_exit_codes={0})
- self.run_yq("{}", ["."])
- self.run_yq(unusable_non_tty_input, [".", test_doc])
- self.run_yq(unusable_non_tty_input, [".", test_doc, test_doc])
diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index a57cdf99617b..b775674672ac 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -1,18 +1,18 @@
# Template file for 'yq'
pkgname=yq
-version=2.12.2
-revision=2
+version=3.0.1
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
makedepends="python3-yaml"
depends="${makedepends} python3-xmltodict python3-toml python3-argcomplete jq"
checkdepends="${depends}"
short_desc="Command-line YAML processor written in Python that wraps around jq"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ishaan Bhimwal <ishaanbhimwal@protonmail.com>"
license="Apache-2.0"
homepage="https://github.com/kislyuk/yq"
distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz"
-checksum=2f156d0724b61487ac8752ed4eaa702a5737b804d5afa46fa55866951cd106d2
+checksum=a5e61078facd7ee4222f4346b5b50c4e9cea5e9d3330f074b5ea2c203bf639b1
do_check() {
python3 test/test.py
From 2ba1410398047aabe321b887c1e68888ce3cd035 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 6 Jul 2022 09:29:19 +0200
Subject: [PATCH 550/609] kotlin-bin: update to 1.7.0.
---
srcpkgs/kotlin-bin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index d56a18e26e88..1a9cf380641b 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
# Template file for 'kotlin-bin'
pkgname=kotlin-bin
-version=1.6.10
+version=1.7.0
revision=1
archs="x86_64"
wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="Apache-2.0"
homepage="https://kotlinlang.org/"
distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=432267996d0d6b4b17ca8de0f878e44d4a099b7e9f1587a98edc4d27e76c215a
+checksum=f5216644ad81571e5db62ec2322fe07468927bda40f51147ed626a2884b55f9a
nostrip=yes
replaces="kotlin>=0"
From 8ba973d8b961b713c2ba10dc8999881a09862ff0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Jul 2022 17:50:17 +0200
Subject: [PATCH 551/609] syncthing: update to 1.20.3.
---
srcpkgs/syncthing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 291724cf0f59..ea9f627b49b6 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.20.2
+version=1.20.3
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
homepage="https://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=6733ae6947497ace959c56f7c491b785ec058c8592cfd9824bc37125d1f342d9
+checksum=2a00c4a4ed64f10221c01809eddbe3bac45a1b0b735c02c6702876ef77b8a702
pre_build() {
GOARCH= go generate \
From 9d1ab2c10bdbb6ec9c076dbbc65510655c004a65 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Jul 2022 18:56:38 +0200
Subject: [PATCH 552/609] scribus: revbump for libpoppler 22.07
missed in f4a78728344493c022e6f78092ca4b9f5b53d756
---
srcpkgs/scribus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 125a7d54e4cf..6dcf42390cc1 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
version=1.5.8
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
-DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"
From b559c577a42671157cad66ac3694af1a59116f8b Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 6 Jul 2022 10:36:49 -0500
Subject: [PATCH 553/609] bemenu: update to 0.6.10.
---
srcpkgs/bemenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index a0515da000a9..6a15fa4b5001 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,6 +1,6 @@
# Template file for 'bemenu'
pkgname=bemenu
-version=0.6.9
+version=0.6.10
revision=1
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -13,7 +13,7 @@ maintainer="Issam Maghni <me@concati.me>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/Cloudef/bemenu"
distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
-checksum=9cca8674ac719104333691a6298838d934bf26c5bf8624e89985c9ba6bec30a4
+checksum=9d47557ed4572fa66e6a80364b95e4dd7a588ca75fe89c68c029b7f240b56a60
bemenu-devel_package() {
depends="bemenu-${version}_${revision}"
From c3f6ca512365723e1546ee48e274a05ee26bf7f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:08:20 -0400
Subject: [PATCH 554/609] openblas: update to 0.3.20.
---
srcpkgs/openblas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index cc44d93a9ac2..e308926c5abd 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,8 +1,8 @@
# Template file for 'openblas'
pkgname=openblas
reverts="0.3.19_1"
-version=0.3.18
-revision=2
+version=0.3.20
+revision=1
wrksrc="OpenBLAS-${version}"
build_style=gnu-makefile
make_build_args="HOSTCC=gcc USE_OPENMP=1"
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
homepage="https://www.openblas.net/"
changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"
-checksum=1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb
+checksum=8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 166dcc46095e9b64da9a7f88fba12d4e660a4b1c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:38:52 -0400
Subject: [PATCH 555/609] superlu: update to 5.3.0.
---
srcpkgs/superlu/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/superlu/template b/srcpkgs/superlu/template
index 41e27d1bf1be..c9cf6ad17cb1 100644
--- a/srcpkgs/superlu/template
+++ b/srcpkgs/superlu/template
@@ -1,6 +1,6 @@
# Template file for 'superlu'
pkgname=superlu
-version=5.2.2
+version=5.3.0
revision=1
build_style=cmake
configure_args="-DUSE_XSDK_DEFAULTS=TRUE"
@@ -11,8 +11,8 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
license="BSD-3-Clause"
homepage="https://portal.nersc.gov/project/sparse/superlu/"
changelog="https://portal.nersc.gov/project/sparse/superlu/changes.html#slu_change"
-distfiles="https://portal.nersc.gov/project/sparse/superlu/superlu_${version}.tar.gz"
-checksum=470334a72ba637578e34057f46948495e601a5988a602604f5576367e606a28c
+distfiles="https://github.com/xiaoyeli/superlu/archive/v${version}.tar.gz"
+checksum=3e464afa77335de200aeb739074a11e96d9bef6d0b519950cfa6684c4be1f350
pre_configure() {
export LDFLAGS="-fPIC"
@@ -27,6 +27,8 @@ superlu-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove "usr/include"
+ vmove "usr/lib/cmake"
+ vmove "usr/lib/pkgconfig"
vmove "usr/lib/libsuperlu.so"
}
}
From 702907fc4e333a8c8a48bf17c3f535cb4b39b4d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:34:13 -0400
Subject: [PATCH 556/609] python3-setuptools: update to 63.1.0.
---
srcpkgs/python3-setuptools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 135a3d51a99c..e92f73a5b9f5 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools'
pkgname=python3-setuptools
-version=62.3.3
+version=63.1.0
revision=1
wrksrc="setuptools-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/pypa/setuptools"
changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=e7d11f3db616cda0751372244c2ba798e8e56a28e096ec4529010b803485f3fe
+checksum=16923d366ced322712c71ccb97164d07472abeecd13f3a6c283f6d5d26722793
provides="python3-distribute-${version}_1"
replaces="python3-distribute>=0"
# Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;
From 6e2f3fef22da83e2d1be4dd37a2ee9ae9dba4e33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:33:39 -0400
Subject: [PATCH 557/609] python-cffi: update to 1.15.1.
---
srcpkgs/python-cffi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 498821b07fa8..5a098995a96f 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -1,6 +1,6 @@
# Template file for 'python-cffi'
pkgname=python-cffi
-version=1.15.0
+version=1.15.1
revision=1
wrksrc="cffi-${version}"
build_style=python-module
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://cffi.readthedocs.io/"
changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954
+checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
do_check() {
# glibc libm.so is a GNU ld script that isn't properly handled
From a08ee8e54b413c10ddb7cff5f13294a42c3e4801 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:43:39 -0400
Subject: [PATCH 558/609] python3-Pillow: update to 9.2.0.
---
srcpkgs/python3-Pillow/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index 4162a5134214..418cb33f2ad2 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
# Template file for 'python3-Pillow'
pkgname=python3-Pillow
-version=9.1.1
+version=9.2.0
revision=1
wrksrc="Pillow-${version}"
build_style=python3-module
@@ -15,7 +15,7 @@ license="custom:PIL"
homepage="https://python-pillow.org"
changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0
+checksum=75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04
post_install() {
vlicense LICENSE
From 06462828ccbf5de355ae02d9edde8271d61c6df7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:45:05 -0400
Subject: [PATCH 559/609] python3-setuptools_scm: update to 7.0.4.
---
srcpkgs/python3-setuptools_scm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-setuptools_scm/template b/srcpkgs/python3-setuptools_scm/template
index 7b4375ef5b2b..11ddc58693c9 100644
--- a/srcpkgs/python3-setuptools_scm/template
+++ b/srcpkgs/python3-setuptools_scm/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools_scm'
pkgname=python3-setuptools_scm
-version=7.0.2
+version=7.0.4
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/pypa/setuptools_scm"
distfiles="${PYPI_SITE}/s/setuptools_scm/setuptools_scm-${version}.tar.gz"
-checksum=53afbaa882f43e5ec8e14f2d93b9c268dc62eb3f6cc8b2790f8cb97903e53c02
+checksum=c27bc1f48593cfc9527251f1f0fc41ce282ea57bbc7fd5a1ea3acb99325fab4c
# Tests seem to fail unless package is installed
make_check=no
From 5ef8b10af855a0fa8b2165b4ae614cffad6c017b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:52:47 -0400
Subject: [PATCH 560/609] python3-setuptools-rust: update to 1.4.1.
---
srcpkgs/python3-setuptools-rust/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 19b7dea26647..017773d42556 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,10 +1,10 @@
# Template file for 'python3-setuptools-rust'
pkgname=python3-setuptools-rust
-version=1.3.0
+version=1.4.1
revision=1
wrksrc="${pkgname#python3-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-semanticversion python3-setuptools python3-typing_extensions"
short_desc="Setuptools plugin for Rust support"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/PyO3/setuptools-rust"
changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=958c5bf4ab6483d59dab888538121871cc5006354a42fb0fbd50acf03caad1de
+checksum=18ff850831f58ee21d5783825c99fad632da21e47645e9427fd7dec048029e76
# Tests have unpackaged dependencies
make_check=no
From e530e65ab5b41d302514236e1bc10cbfe8687c1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:53:23 -0400
Subject: [PATCH 561/609] python3-ultrajson: update to 5.4.0.
---
srcpkgs/python3-ultrajson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 5cf771ad59d7..a14fb97da706 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,19 +1,19 @@
# Template file for 'python3-ultrajson'
pkgname=python3-ultrajson
-version=5.3.0
+version=5.4.0
revision=1
wrksrc="ujson-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
makedepends="python3-devel"
depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest-xdist"
short_desc="Ultra fast JSON encoder and decoder for Python"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://github.com/ultrajson/ultrajson"
distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=ab938777b3ac0372231ee654a7f6a13787e587b1ca268d8aa7e6fb6846e477d0
+checksum=6b953e09441e307504130755e5bd6b15850178d591f66292bba4608c4f7f9b00
export UJSON_BUILD_NO_STRIP=1
From ace974f7936d8df3c96b10eaf826ee98ce918660 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:29:32 -0400
Subject: [PATCH 562/609] python3-cryptography_vectors: update to 37.0.4.
---
srcpkgs/python3-cryptography_vectors/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index e626eebdca96..3c59f21bfde6 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography_vectors'
pkgname=python3-cryptography_vectors
-version=37.0.2
+version=37.0.4
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=7c65d3de51756f418142df605417ec2c6e961c364f70cc8a103030889d5a3219
+checksum=5a61400510e28937a5654b40c6ea4e3e593c5aaf0c2081c5b912f0e7cf883ea8
post_install() {
vlicense LICENSE
From 856487b34ffbb88931e4dcd19f195e5621ec36e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 16:03:43 -0400
Subject: [PATCH 563/609] python3-cryptography: update to 37.0.4.
---
srcpkgs/python3-cryptography/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 887798a162cc..7642394970de 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography'
pkgname=python3-cryptography
-version=37.0.2
+version=37.0.4
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -18,7 +18,7 @@ license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e
+checksum=63f9c17c0e2474ccbebc9302ce2f07b55b3b3fcb211ded18a42d5764f5c10a82
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
From c86fcdde423d131da6e85f1d0749f320637d376f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:26:16 -0400
Subject: [PATCH 564/609] cpp-utilities: update to 5.17.0.
---
srcpkgs/cpp-utilities/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 1a3de9251d4e..6a55fae02b02 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
# Template file for 'cpp-utilities'
pkgname=cpp-utilities
-version=5.16.0
+version=5.17.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/cpp-utilities"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=6bb14ed60e3f84ac53cce4c5a16945d7295f49ee9019a29874a59265db6908c3
+checksum=05663fa9ca188cd7be44dc06f1257cfb39b0721443b158a5bbfdaf6400e66505
cpp-utilities-devel_package() {
short_desc+=" - development files"
From 8809436a3b5bfd33836bef7b4070557a4aa41303 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:26:42 -0400
Subject: [PATCH 565/609] tagparser: update to 11.3.0.
---
srcpkgs/tagparser/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 6849cc503475..ea331454f5b9 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
# Template file for 'tagparser'
pkgname=tagparser
-version=11.2.1
+version=11.3.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/tagparser"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=daa881d2416bdcfac5c086b5e8ce780103477cf6bc11e71d75798f5ba5422c65
+checksum=5c89fae9d87b94225e585acda58072ae24e09f3af87e5af742ec077d78230e9f
tagparser-devel_package() {
short_desc+=" - development files"
From 7086f544f99f66f66b719d20e25c2e6b1ce30336 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:28:25 -0400
Subject: [PATCH 566/609] tageditor: update to 3.7.3.
---
srcpkgs/tageditor/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5e1fe1435f4e..6951a161f585 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
# Template file for 'tageditor'
pkgname=tageditor
-version=3.7.2
+version=3.7.3
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/tageditor"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=cf79b42b03dfc3efeba01781c816dd47aff66df9c0fe8aa773bad2d3f1ca0738
+checksum=8cf16a501dff186c6fee2d2397075269666704e20bf7ce43ecc8fa80e5d2df35
build_options="qt webengine webkit script"
build_options_default="qt"
From 5efe480d1ac9f3387bc47473788a105f675f9679 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:28:57 -0400
Subject: [PATCH 567/609] vkQuake: update to 1.20.2.
---
srcpkgs/vkQuake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 7af2e754d21a..17a28e32a995 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
# Template file for 'vkQuake'
pkgname=vkQuake
-version=1.20.1
+version=1.20.2
revision=1
build_wrksrc="Quake"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/Novum/vkQuake"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=81ec663afba5d88e298d27cfeef5cdf40bc1aeb1d6683f13ae32021701543283
+checksum=d2ce37a4991cd1e59915d40055a86af73c934d7c43dfabeb94d3fd568b73131a
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 607f1cd783d2dab9dd5e99226a0c67ff18af449e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 16:39:42 -0400
Subject: [PATCH 568/609] Revert "python3-setuptools-rust: update to 1.4.1."
This version breaks cross-compilation of python3-cryptography; reverting
until this is figured out.
This reverts commit d8040ec3879320a22530d2728d3bd285377847c8.
---
srcpkgs/python3-setuptools-rust/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 017773d42556..7c91b644872a 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,10 +1,11 @@
# Template file for 'python3-setuptools-rust'
pkgname=python3-setuptools-rust
-version=1.4.1
-revision=1
+reverts="1.4.1_1"
+version=1.3.0
+revision=2
wrksrc="${pkgname#python3-}-${version}"
-build_style=python3-pep517
-hostmakedepends="python3-setuptools_scm python3-wheel"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
depends="python3-semanticversion python3-setuptools python3-typing_extensions"
short_desc="Setuptools plugin for Rust support"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
@@ -12,7 +13,7 @@ license="MIT"
homepage="https://github.com/PyO3/setuptools-rust"
changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=18ff850831f58ee21d5783825c99fad632da21e47645e9427fd7dec048029e76
+checksum=958c5bf4ab6483d59dab888538121871cc5006354a42fb0fbd50acf03caad1de
# Tests have unpackaged dependencies
make_check=no
From d847da4ffd53d20e5e1262fa39a011ca9847cec3 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 569/609] xdg-desktop-portal-gtk: update to 1.14.0
---
srcpkgs/xdg-desktop-portal-gtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..fac85b7eb1a1 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,18 +1,18 @@
# Template file for 'xdg-desktop-portal-gtk'
pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
makedepends="flatpak-devel gtk+3-devel libxslt-devel libglib-devel
- xdg-desktop-portal gnome-desktop-devel"
+ xdg-desktop-portal gsettings-desktop-schemas-devel"
depends="xdg-desktop-portal"
short_desc="Portal backend service for Flatpak using GTK+"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
post_install() {
rm -rf "${DESTDIR}/usr/lib/systemd"
From 3a7fa41ed254d5a74e1336016c51789428a00a98 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 570/609] New package: xdg-desktop-portal-gnome-42.3
---
srcpkgs/xdg-desktop-portal-gnome/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..8002ddcc399c
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,18 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.3
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+short_desc="GNOME portal backend for xdg-desktop-portal"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4ed105a667e46325467103dc7346d2023faec1d5ec153bd17316da938f53ace0
From 86d25c99206308b817a6a29f3e63f57520ae7c30 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 571/609] adwaita-icon-theme: update to 42.0
---
srcpkgs/adwaita-icon-theme/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
From 6824bc224777941fbbc88e3276fb650281836eac Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 572/609] baobab: update to 42.0
---
srcpkgs/baobab/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
# Template file for 'baobab'
pkgname=baobab
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
short_desc="Graphical directory tree analyzer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later"
homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc
From 126b483e31651b89a334a82b36ad096d56d0ec21 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 573/609] gnome-core: update to 42.0
---
srcpkgs/gnome-core/template | 64 ++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index d7a7082b7a60..3e3ba6137b6c 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=41.0
-revision=2
+version=42.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="q66 <daniel@octaforge.org>"
@@ -9,44 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=${version}
+ at-spi2-core>=2.44.0
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.42.0
- folks>=0.14.0
+ evolution-data-server>=3.${version}
+ folks>=0.15.4
font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=${version}
geocode-glib>=3.26.2
gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
- gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth1>=3.34.5
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
+ gmime>=3.2.7
+ gnome-backgrounds>=${version}
+ gnome-bluetooth>=${version}
gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=${version}
+ gnome-desktop>=${version}
+ gnome-initial-setup>=${version}
gnome-keyring>=40.0
- gnome-online-accounts>=3.40.0
+ gnome-online-accounts>=3.44.0
gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
- gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-session>=${version}
+ gnome-settings-daemon>=${version}
+ gnome-shell>=${version}
+ gnome-shell-extensions>=${version}
+ gnome-themes-extra>=3.28
+ gnome-user-docs>=${version}
gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
- gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ gsettings-desktop-schemas>=${version}
+ gvfs>=1.50.0
+ mutter>=${version}
+ nautilus>=${version}
sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
- zenity>=3.41.0"
+ tracker>=3.3.0
+ yelp>=${version}
+ xdg-desktop-portal-gnome>=${version}
+ zenity>=3.${version}"
From 37feec53f428c849a4e62682057ce538803754a4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:03:43 -0700
Subject: [PATCH 574/609] gnome: update to 42.0
---
srcpkgs/gnome/template | 57 +++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 0b2910094713..7860bb3cd09f 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=41.0
-revision=2
+version=42.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -11,69 +11,68 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=${version}
+ cheese>=41.1
eog>=${version}
evince>=${version}
- file-roller>=3.40.0
- gedit>=40.1
+ file-roller>=3.${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
- gnome-clocks>=40.0
+ gnome-clocks>=${version}
gnome-contacts>=${version}
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-screenshot>=40.0
gnome-system-monitor>=${version}
gnome-terminal>=3.${version}
- gnome-tweaks>=40.0
+ gnome-text-editor>=${version}
+ gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.9.1
+ gspell>=1.10.0
mousetweaks>=3.32.0
- network-manager-applet>=1.24.0
orca>=${version}
phodav>=2.5
- simple-scan>=40.5
- totem>=3.38.2"
+ simple-scan>=${version}
+ totem>=${version}"
_apps_depends="
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=41.2
epiphany>=${version}
- evolution>=3.42.0
- ghex>=3.18.4
- gitg>=3.32.1
- gedit-plugins>=40.1
+ evolution>=3.44.0
+ ghex>=${version}
+ gitg>=41
gnome-books>=40.0
gnome-boxes>=${version}
gnome-builder>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
+ gnome-connections>=${version}
gnome-characters>=${version}
- gnome-clocks>=40.0
+ gnome-clocks>=${version}
gnome-dictionary>=40.0
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
gnome-music>=${version}
- gnome-nettool>=3.8.1
- gnome-photos>=40.0
- gnome-recipes>=2.0.2
- gnome-screenshot>=40.0
- gnome-sound-recorder>=40.0
+ gnome-nettool>=${version}
+ gnome-photos>=${version}
+ gnome-recipes>=2.0.4
+ gnome-screenshot>=41.0
+ gnome-sound-recorder>=${version}
gnome-system-monitor>=${version}
- gnome-terminal>=3.41.0
- gnome-todo>=3.28.1
- gnote>=40.2
- nemiver>=0.9.6
+ gnome-terminal>=3.${version}
+ gnome-text-editor>=${version}
+ gnome-todo>=41.0
+ gnote>=${version}
+ network-manager-applet>=1.24.0
polari>=3.38.0
rygel>=0.40.2
- simple-scan>=40.5
+ simple-scan>=${version}
totem>=3.38.2
vino>=3.22.0"
@@ -82,7 +81,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=$version
+ gnome-chess>=${version}
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From e25057cfda4d7aa99fe167be669163a39a2c4a4d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 575/609] libgweather: update to 4.0.0
---
common/shlibs | 2 +-
.../patches/fix-cross-introspection.patch | 14 +++++
...metar-test-dont-use-known-duplicates.patch | 51 +++++++++++++++++++
srcpkgs/libgweather/template | 20 +++++---
srcpkgs/libgweather/update | 1 +
5 files changed, 80 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/fix-cross-introspection.patch
create mode 100644 srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch
diff --git a/common/shlibs b/common/shlibs
index d6a318a81250..7dd4039d1ba3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1129,7 +1129,7 @@ libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
libgnomekbd.so.8 libgnomekbd-3.6.0_1
libgnomekbdui.so.8 libgnomekbd-3.6.0_1
libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
new file mode 100644
index 000000000000..fbec0c3317fa
--- /dev/null
+++ b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
@@ -0,0 +1,14 @@
+diff --git a/libgweather/meson.build b/libgweather/meson.build
+index 08311af4..ef554f2e 100644
+--- a/libgweather/meson.build
++++ b/libgweather/meson.build
+@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4',
+ )
+
+ g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'))
+-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
++build_gir = get_option('introspection') and g_ir_scanner.found()
+
+ enable_vala = get_option('enable_vala')
+ vapigen = find_program('vapigen', required: enable_vala == 'true')
+
diff --git a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch
new file mode 100644
index 000000000000..5646cd24cc21
--- /dev/null
+++ b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch
@@ -0,0 +1,51 @@
+From 8b4fe0ad32bac4da47188207541b0aec3f786498 Mon Sep 17 00:00:00 2001
+From: Pierre Labastie <pierre.labastie@neuf.fr>
+Date: Sun, 10 Apr 2022 22:24:47 +0200
+Subject: [PATCH] metar test: Don't use "known" duplicates
+
+The metar list provided by NOAA contains duplicate ICAO codes.
+Those duplicates may change over time, so it does not make sense
+to use an array of known duplicates. Presently a duplicate is rejected
+when it is known, and inserted if it is not, leading to a difference
+in the number of insertions and the number of keys, so that the test
+fails. If any duplicate is rejected, the number of insertions is
+always equal to the number of keys (unless something goes wrong
+in g_hash_table_insert). And this is the default behavior for known
+duplicates anyway.
+
+Closes: https://gitlab.gnome.org/GNOME/libgweather/-/issues/168
+---
+ libgweather/tests/metar.c | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c
+index 7d6c7c04..a6fa7e79 100644
+--- a/libgweather/tests/metar.c
++++ b/libgweather/tests/metar.c
+@@ -41,20 +41,11 @@ parse_metar_stations (const char *contents)
+ continue;
+ }
+
++ /* If it is a duplicate discard it */
+ if (g_hash_table_lookup (stations_ht, station)) {
+- const char * const known_duplicates[] = {
+- "VOGO",
+- "KHQG",
+- "KOEL",
+- "KTQK",
+- "KX26",
+- NULL
+- };
+- if (g_strv_contains (known_duplicates, station)) {
+- g_free (station);
+- continue;
+- }
+ g_test_message ("Weather station '%s' already defined\n", station);
++ g_free (station);
++ continue;
+ }
+
+ g_hash_table_insert (stations_ht, station, g_strdup (line));
+--
+GitLab
+
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..da1cea0e42c9 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,11 +1,14 @@
# Template file for 'libgweather'
pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
revision=1
build_style=meson
build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
+configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
+ $(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)
+ $(vopt_if gtk_doc gi-docgen)"
makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
@@ -13,15 +16,15 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
-build_options="gir"
-build_options_default="gir"
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
post_patch() {
# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
# And looks like we didn't ship it.
- vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+ vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
}
libgweather-devel_package() {
@@ -35,5 +38,8 @@ libgweather-devel_package() {
vmove usr/share/gir-1.0
vmove usr/share/vala
fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/doc
+ fi
}
}
diff --git a/srcpkgs/libgweather/update b/srcpkgs/libgweather/update
index e69de29bb2d1..496ee53deb13 100644
--- a/srcpkgs/libgweather/update
+++ b/srcpkgs/libgweather/update
@@ -0,0 +1 @@
+ignore="40.*"
From 56b03fee5364e41b3521cd840bf88643dc392862 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 576/609] evolution-data-server: update to 3.44.3
---
srcpkgs/evolution-data-server/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 7d6937d97eaa..65e5fddbf24d 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,13 +1,13 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.42.3
-revision=2
+version=3.44.3
+revision=1
build_style=cmake
build_helper="gir qemu"
configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
$(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
-hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
+hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel
$(vopt_if gir vala)"
makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel
@@ -18,9 +18,9 @@ short_desc="Centralized access to appointments and contacts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=9043ab53f341da10315c550384a6b320430193fc8d7861dd25c4e9b2e0be425b
build_options="gir"
build_options_default="gir"
From 30c7414782d7eb490281b8b3b90428dec10cf0da Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:47:38 -0700
Subject: [PATCH 577/609] evolution: update to 3.44.3.
---
srcpkgs/evolution/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 226c884f3c53..66e9705a2d2e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,25 +1,26 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.42.3
+version=3.44.3
revision=1
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
- -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON"
+ -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
+ -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2"
hostmakedepends="intltool itstool pkg-config glib-devel"
makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
evolution-data-server-devel gspell-devel libcanberra-devel
libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
- gnome-desktop-devel libsoup-devel"
+ gnome-desktop-devel libsoup-devel cmark-devel"
depends="gnome-keyring"
short_desc="Integrated mail, addressbook and calendaring for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44629e6a02288ec100a66fd59413a068b6b9cd624bed3255aa29a166ea26d0b6
+checksum=536b11f4133df6f216f27af9a2481a19ed7ae08be2d4a13b128061c262a36499
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 93f3d5412b5b5d8bc01e801cf3597137970dcd2d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:52:15 -0700
Subject: [PATCH 578/609] evolution-ews: update to 3.44.3.
---
srcpkgs/evolution-ews/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 01b358864598..98f8323511a9 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
-version=3.42.1
+version=3.44.3
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services"
maintainer="Peter Kuchar <masaj@gmx.com>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d
+checksum=85ccaca2887af85bf048e473c7b6c42c5f5641ab05a5bc4cfcea34e2b6f5be17
From 60476090e2f373283f44ef8610a0147f07f56a6f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 579/609] gcr: update to 3.41.0
---
srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
srcpkgs/gcr/template | 10 ++++-----
2 files changed, 28 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch
diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..5ab7455fb539 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,20 +1,20 @@
# Template file for 'gcr'
pkgname=gcr
-version=3.40.0
+version=3.41.0
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
$(vopt_if vala vala)"
depends="desktop-file-utils hicolor-icon-theme gnupg2"
short_desc="GNOME crypto package"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
-homepage="http://www.gnome.org"
+homepage="https://gitlab.gnome.org/GNOME/gcr"
distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
if [ "$CROSS_BUILD" ]; then
configure_args="-Dgtk_doc=false"
From 31d438d7af1322f8fc734279015ae11a6cad13f5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 580/609] gnome-settings-daemon: update to 42.2
---
.../patches/meson-0.61.patch | 38 -------------------
srcpkgs/gnome-settings-daemon/template | 7 ++--
2 files changed, 4 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
deleted file mode 100644
index b7c03ca2da63..000000000000
--- a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Wed, 26 Jan 2022 23:08:58 +0100
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
----
- plugins/power/meson.build | 1 -
- plugins/wacom/meson.build | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/plugins/power/meson.build b/plugins/power/meson.build
-index 69e619f2..014bb6da 100644
---- a/plugins/power/meson.build
-+++ b/plugins/power/meson.build
-@@ -76,7 +76,6 @@ if host_is_linux
- )
-
- i18n.merge_file(
-- policy,
- input: policy_in,
- output: policy,
- po_dir: po_dir,
-diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
-index d8dd0ec7..c00323d4 100644
---- a/plugins/wacom/meson.build
-+++ b/plugins/wacom/meson.build
-@@ -7,7 +7,6 @@ policy_in = configure_file(
- )
-
- i18n.merge_file(
-- policy,
- input: policy_in,
- output: policy,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index c8be36b2a457..24af1a5094b7 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=41.0
-revision=2
+version=42.2
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -18,8 +18,9 @@ short_desc="GNOME settings daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
+changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 2d1cc7c8ac1f72019b75b2b8072d639b07a306e0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 581/609] gnome-control-center: update to 42.3
---
srcpkgs/gnome-control-center/template | 35 +++++++++++----------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 92b9cb3d2f4a..4563cb97e697 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,43 +1,36 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=41.4
-revision=2
+version=42.3
+revision=1
build_style=meson
build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
- libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
+ libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel
libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
- gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
+ gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
-changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
+checksum=ce0ae3650de2af7ebcb0a7e1fc9912eddb6eff8d257f3fe50ff8b29c19341c7e
+make_check=no # needs X11 and requires altered filesystem
-build_options="cheese"
-build_options_default="cheese"
-
-desc_option_cheese="Add support for adding user account images with your webcam"
-
-# needs X11 and requires altered filesystem
-do_check() {
- :
+pre_build() {
+ # q66: racey, included from elsewhere but not dependencies
+ ninja -C build panels/network/cc-network-resources.h
}
-CFLAGS="-fcommon"
-
gnome-control-center-devel_package() {
short_desc+=" - development files"
pkg_install() {
From 2d482366bdf8460912e0f9e5f1137d72138cc9b1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 582/609] gnome-desktop: update to 42.2
---
common/shlibs | 3 +
srcpkgs/gnome-desktop/patches/build.patch | 18 ----
.../patches/optional_introspection.patch | 93 +++++++++++++++++++
.../patches/optionalise-gir.patch | 47 ----------
srcpkgs/gnome-desktop/template | 8 +-
5 files changed, 100 insertions(+), 69 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
create mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch
diff --git a/common/shlibs b/common/shlibs
index 7dd4039d1ba3..a6792b61ffa6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1128,6 +1128,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
libsecret-1.so.0 libsecret-0.10_1
libgweather-4.so.0 libgweather-4.0.0_1
libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed Aug 12 05:26:00 2020 +0200
-
- bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
-
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
-
diff --git a/srcpkgs/gnome-desktop/patches/optional_introspection.patch b/srcpkgs/gnome-desktop/patches/optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt | 4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+ ],
+ )
+
+- libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+- export_packages: 'gnome-desktop-4',
+- namespace: 'GnomeDesktop',
+- nsversion: '4.0',
+- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+- identifier_prefix: 'Gnome',
+- symbol_prefix: 'gnome',
+- install: true,
+- )
++ if get_option('introspection')
++ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++ export_packages: 'gnome-desktop-4',
++ namespace: 'GnomeDesktop',
++ nsversion: '4.0',
++ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++ identifier_prefix: 'Gnome',
++ symbol_prefix: 'gnome',
++ install: true,
++ )
++ endif
+
+ pkg.generate(
+ libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+ ],
+ )
+
+- gnome.generate_gir(libgnome_desktop,
+- sources: introspection_sources + libgnome_desktop_headers,
+- export_packages: 'gnome-desktop-3.0',
+- namespace: 'GnomeDesktop',
+- nsversion: '3.0',
+- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+- identifier_prefix: 'Gnome',
+- symbol_prefix: 'gnome',
+- install: true
+- )
++ if get_option('introspection')
++ gnome.generate_gir(libgnome_desktop,
++ sources: introspection_sources + libgnome_desktop_headers,
++ export_packages: 'gnome-desktop-3.0',
++ namespace: 'GnomeDesktop',
++ nsversion: '3.0',
++ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++ identifier_prefix: 'Gnome',
++ symbol_prefix: 'gnome',
++ install: true
++ )
++ endif
+
+ pkg.generate(
+ libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+ type: 'boolean', value: true, description: 'Build debug tools'
+ )
+
++option('introspection',
++ type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+ type: 'feature', description: 'Udev support'
+ )
+--
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
- link_with: libgnome_desktop
- )
-
--gnome.generate_gir(libgnome_desktop,
-- sources: introspection_sources + libgnome_desktop_headers,
-- export_packages: 'gnome-desktop-3.0',
-- namespace: 'GnomeDesktop',
-- nsversion: '3.0',
-- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-- extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-- identifier_prefix: 'Gnome',
-- symbol_prefix: 'gnome',
-- install: true
--)
-+if get_option('introspection')
-+ gnome.generate_gir(libgnome_desktop,
-+ sources: introspection_sources + libgnome_desktop_headers,
-+ export_packages: 'gnome-desktop-3.0',
-+ namespace: 'GnomeDesktop',
-+ nsversion: '3.0',
-+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+ extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+ identifier_prefix: 'Gnome',
-+ symbol_prefix: 'gnome',
-+ install: true
-+ )
-+endif
-
- desktop_pc = pkg.generate(
- libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
- type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+ type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..50df177b7bd0 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=41.3
+version=42.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -15,9 +15,9 @@ short_desc="GNOME desktop management utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
+changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
-make_check=no # needs X
+checksum=f42b14eac8d1456c2bfc1fbc97ef6afe49c8dd6f57796e8fd5feb39331ed55bd
build_options="gir"
build_options_default="gir"
From c5121a3ba2bb3ee2be21fb99ff92d306f3dd09e3 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 583/609] gnome-session: update to 42.0
---
srcpkgs/gnome-session/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..cce39e931eb8 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=41.3
+version=42.0
revision=1
build_style=meson
configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -14,8 +14,9 @@ short_desc="GNOME session management utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-session"
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/blob/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
post_install() {
rm -rf ${DESTDIR}/tmp
From 6ef816fa4742cb20215e0bcd44d013b939bc2c44 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 14:25:25 -0700
Subject: [PATCH 584/609] gnome-shell: update to 42.3.
---
...-Fix-updating-suggestions-visibility.patch | 37 +++++++++
srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 -------------------
srcpkgs/gnome-shell/template | 15 ++--
3 files changed, 45 insertions(+), 89 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch
delete mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch b/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch
new file mode 100644
index 000000000000..b2e4df1052ae
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch
@@ -0,0 +1,37 @@
+From aca79c027483f86e85043f403321a8d8016ca007 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sun, 3 Jul 2022 16:44:39 +0200
+Subject: [PATCH] keyboard: Fix updating suggestions visibility
+
+Commit 237ba24dbeae added corresponding API to the keyboard actor,
+but ended up calling it on the KeyboardManager.
+
+Add the expected method to KeyboardManager that forwards the request
+to the keyboard.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5630
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2359>
+(cherry picked from commit eff23a87c36a6a96c9abab09ab27a4bb35ab1b1f)
+---
+ js/ui/keyboard.js | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
+index 9e5dbffbb1..e13652bdfe 100644
+--- a/js/ui/keyboard.js
++++ b/js/ui/keyboard.js
+@@ -1273,6 +1273,10 @@ var KeyboardManager = class KeyBoardManager {
+ this._keyboard.resetSuggestions();
+ }
+
++ setSuggestionsVisible(visible) {
++ this._keyboard?.setSuggestionsVisible(visible);
++ }
++
+ maybeHandleEvent(event) {
+ if (!this._keyboard)
+ return false;
+--
+GitLab
+
diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch
deleted file mode 100644
index ad3b7ef3923a..000000000000
--- a/srcpkgs/gnome-shell/patches/meson-0.61.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 23 Dec 2021 17:18:16 +0100
-Subject: [PATCH] build: Drop incorrect positional arg
-
-Unlike other targets that take a name, i18n.merge_file() does not.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
----
- data/meson.build | 2 +-
- src/calendar-server/meson.build | 2 +-
- subprojects/extensions-app/data/meson.build | 2 +-
- subprojects/extensions-app/data/metainfo/meson.build | 2 +-
- subprojects/extensions-tool/src/templates/meson.build | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index f924fdf806..76ae45c93a 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
-
- foreach desktop_file : desktop_files
-- i18n.merge_file('desktop',
-+ i18n.merge_file(
- input: configure_file(
- input: desktop_file + '.in.in',
- output: desktop_file + '.in',
-diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
-index 7363282a59..8b4ef411c8 100644
---- a/src/calendar-server/meson.build
-+++ b/src/calendar-server/meson.build
-@@ -27,7 +27,7 @@ configure_file(
- install_dir: servicedir
- )
-
--i18n.merge_file('evolution-calendar.desktop',
-+i18n.merge_file(
- input: 'evolution-calendar.desktop.in',
- output: 'evolution-calendar.desktop',
- po_dir: po_dir,
-diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
-index d7e7d4001c..4b601e8bd1 100644
---- a/subprojects/extensions-app/data/meson.build
-+++ b/subprojects/extensions-app/data/meson.build
-@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('app_id', app_id)
- desktopconf.set('prgname', prgname)
-
--i18n.merge_file('desktop',
-+i18n.merge_file(
- input: configure_file(
- input: base_id + '.desktop.in.in',
- output: desktop_file + '.in',
-diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
-index c4962c0576..a19bfa80a4 100644
---- a/subprojects/extensions-app/data/metainfo/meson.build
-+++ b/subprojects/extensions-app/data/metainfo/meson.build
-@@ -1,5 +1,5 @@
- metainfo = app_id + '.metainfo.xml'
--i18n.merge_file(metainfo,
-+i18n.merge_file(
- input: base_id + '.metainfo.xml.in',
- output: metainfo,
- po_dir: po_dir,
-diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
-index 670e2bf448..d693bfaddb 100644
---- a/subprojects/extensions-tool/src/templates/meson.build
-+++ b/subprojects/extensions-tool/src/templates/meson.build
-@@ -4,7 +4,7 @@ template_metas = [
- ]
- template_deps = []
- foreach template : template_metas
-- template_deps += i18n.merge_file(template,
-+ template_deps += i18n.merge_file(
- input: template + '.in',
- output: template,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 77450cb127a8..3d2e3c5cd8ec 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,26 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=41.5
-revision=2
+version=42.3
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
- asciidoc perl glib-devel gettext gjs-devel"
+ asciidoc perl glib-devel gettext gjs-devel gtk-update-icon-cache"
makedepends="gnome-control-center-devel at-spi2-atk-devel
evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
- gnome-bluetooth1-devel pipewire-devel gstreamer1-devel"
-depends="elogind gnome-control-center gsettings-desktop-schemas upower"
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
+depends="elogind gnome-control-center gsettings-desktop-schemas upower
+ gstreamer1-pipewire gst-plugins-good1"
checkdepends="xvfb-run mesa-dri $depends"
short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5
+checksum=964f520c28d7f412254298676f9cceed6adf81ff489ff1ded69c42987d4c1888
do_check() {
mkdir /tmp/gnome-shell-xdg
From 9941f65be31a2ed24d5150c10729325688607731 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 585/609] gnome-shell-extensions: update to 42.3.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 3f4be3c068de..414961a95f40 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=41.2
+version=42.3
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -10,6 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
From eae69761ec4895130968b209d833871871f30c00 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 586/609] gnome-backgrounds: update to 42.0
---
srcpkgs/gnome-backgrounds/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends=gettext
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d
From 108ca7cedf0710f3c0fbb540f429761b6f702393 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 14:26:25 -0700
Subject: [PATCH 587/609] mutter: update to 42.3.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6792b61ffa6..ab419c75c49e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2987,10 +2987,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
libcompizconfig.so.0 libcompizconfig-0.8.14_1
libemeraldengine.so.0 emerald-0.8.14_1
libhangul.so.1 libhangul-0.1.0_1
-libmutter-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub.so.0 libgepub-0.4_1
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index e3f7f7bf1ca8..4064972076d9 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=41.5
+version=42.3
revision=1
build_helper="gir"
build_style=meson
@@ -18,11 +18,11 @@ short_desc="Wayland display server, X11 window manager and compositor library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/"
-changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=9da3a63f90282bb59467e7d3dfdc684e70fa055357f6a2dded1db98cdcce10ba
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ pre_build() {
post_install() {
# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
# meant to be called with 'pkg-config --variable'
- vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
- -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+ -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
}
mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-9/*.gir"
+ vmove "usr/lib/mutter-10/*.gir"
vmove "usr/lib/*.so"
}
}
From 8bf02ac346b0561c3f9239aeeb3a627eb8a14ef9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:39:20 -0700
Subject: [PATCH 588/609] gdm: update to 42.0
---
srcpkgs/gdm/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..3686c70b7404 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=41.3
+version=42.0
revision=1
build_helper="gir"
build_style=meson
@@ -14,7 +14,7 @@ configure_args="
hostmakedepends="dconf gettext itstool pkg-config"
makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
conf_files="
/etc/gdm/custom.conf
@@ -47,10 +47,11 @@ fi
post_install() {
vinstall $FILESDIR/Xsession 755 etc/gdm
- vsed -i "s/pam_systemd\.so/pam_elogind.so/" $DESTDIR/etc/pam.d/*
- vsed -i '/pam_tally.so/d' \
- $DESTDIR/etc/pam.d/gdm-smartcard \
- $DESTDIR/etc/pam.d/gdm-fingerprint
+ for f in $DESTDIR/etc/pam.d/*; do
+ if grep -q "pam_systemd.so" "$f"; then
+ vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f"
+ fi
+ done
rm -rf ${DESTDIR}/tmp
# runit service
From 22038b9a4473f2a1d0185d51c6d15afa64f90ccc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 589/609] gnome-initial-setup: update to 42.2
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 6e7931930878..9e8a2c3824f9 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=41.4
+version=42.2
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,12 +10,12 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel"
+ pango-devel libhandy1-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
-changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
From 8e6a9546cba15325924e83095164cc6ef416133d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:03:11 -0700
Subject: [PATCH 590/609] gnome-remote-desktop: update to 42.3.
---
srcpkgs/gnome-remote-desktop/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index 30e9b3b2c21f..b826155a3ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=41.2
+version=42.3
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true -Dnvenc=false
+configure_args="-Drdp=true -Dvnc=true
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config gettext glib-devel"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
- freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel"
+ freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
+ libgudev-devel nv-codec-headers"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=10151e69b648c2247c5e33d9a2ef419f4e037ee5b2bae49e6ed6aca77eb1ba58
+checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
make_check=no # xvfb failed to start
From 724e81baa76b9e9345ba021a37b49153c994cdac Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 14 Apr 2022 21:41:46 -0700
Subject: [PATCH 591/609] gnome-tweaks: update to 42.beta
---
srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 -------------------
srcpkgs/gnome-tweaks/template | 9 +++---
2 files changed, 5 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
deleted file mode 100644
index 80efde38735e..000000000000
--- a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
-From: Mae Dartmann <hello@maedartmann.name>
-Date: Wed, 16 Feb 2022 06:08:41 +0000
-Subject: [PATCH] meson: fix invalid positional argument
-
----
- data/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index fd6d5da..74f7e82 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,5 +1,5 @@
- appdata_file = 'org.gnome.tweaks.appdata.xml'
--i18n.merge_file(appdata_file,
-+i18n.merge_file(
- input: appdata_file + '.in',
- output: appdata_file,
- po_dir: '../po',
-@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
- )
-
- desktop_file = 'org.gnome.tweaks.desktop'
--i18n.merge_file(desktop_file,
-+i18n.merge_file(
- input: desktop_file + '.in',
- output: desktop_file,
- po_dir: '../po',
---
-GitLab
-
diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index e2ef4e83d274..34f1a56b9084 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,16 +1,17 @@
# Template file for 'gnome-tweaks'
pkgname=gnome-tweaks
-version=40.0
-revision=3
+version=42.beta
+revision=1
build_style=meson
-hostmakedepends="gettext"
+hostmakedepends="pkg-config gettext"
+makedepends="libhandy1-devel"
depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy1"
short_desc="GNOME tool to customize advanced options"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later, CC0-1.0"
homepage="https://wiki.gnome.org/Apps/Tweaks"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
+checksum=83f44cc1dc8adc770cdad717b403cb9a6cc3c0de50e38e6f1e678b43401ad868
replaces="gnome-tweak-tool>=0"
gnome-tweak-tool_package() {
From e0a3a684eba7ba0db64f8eefb65f851fbb6862f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 23:45:30 -0700
Subject: [PATCH 592/609] gnome-panel: update to 3.44.0
---
srcpkgs/gnome-panel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 14bb5a03db84..2484b7e4525d 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
-version=3.42.0
+version=3.44.0
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomePanel"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea8c0efc2edba20e97ad4695179cd0a2538e64c2904702cc8c594e8e0898703
+checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa
gnome-panel-devel_package() {
depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From bb3b97f8c4f3c7845742c03ec2b6e82c24a04bea Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 23:45:44 -0700
Subject: [PATCH 593/609] gnome-flashback: update to 3.44.0
---
srcpkgs/gnome-flashback/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 8a8561df00b2..9fc5c992a7db 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
-version=3.42.1
-revision=2
+version=3.44.0
+revision=1
build_helper=gir
build_style=gnu-configure
configure_args="--with-compiz-session --enable-compile-warnings=minimum"
@@ -18,7 +18,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c8029220acf268c520dbb0750834b2ef4df868324d0e0fb6a80354c80ba8844e
+checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a
post_extract() {
vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \
From d3ce82c7c588e055f3293f759205f8bdcfe55566 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 17:26:04 -0700
Subject: [PATCH 594/609] New package: gnome-tour-42.0
---
srcpkgs/gnome-tour/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/gnome-tour/template
diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template
new file mode 100644
index 000000000000..adb289c3e0d4
--- /dev/null
+++ b/srcpkgs/gnome-tour/template
@@ -0,0 +1,15 @@
+# Template file for 'gnome-tour'
+pkgname=gnome-tour
+version=42.0
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="pkg-config cargo rust glib-devel gettext desktop-file-utils"
+makedepends="gtk4-devel libadwaita-devel libglib-devel"
+short_desc="GNOME Tour & Greeter"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/gnome-tour/"
+changelog="https://gitlab.gnome.org/GNOME/gnome-tour/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=fcf1ac689057da86596970ec3da8355521c0a72e95063eb059d5fee4dea82f4f
From 36a45cd0ddcc1e8960c3d388804c6afc58d64b3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 18 Apr 2022 10:50:01 -0700
Subject: [PATCH 595/609] gnome-online-accounts: update to 3.44.0
---
srcpkgs/gnome-online-accounts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index bc01fc1a3081..47085810e534 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.40.1
+version=3.44.0
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -8,9 +8,9 @@ configure_args="$(vopt_enable gir introspection)
--enable-documentation --enable-backend
--enable-google --enable-kerberos --enable-flickr
--enable-facebook --disable-static --enable-exchange --enable-imap-smtp
- --enable-owncloud --enable-windows-live --enable-pocket
+ --enable-owncloud --enable-windows-live
--enable-lastfm --enable-media-server"
-hostmakedepends="docbook-xsl gettext-devel glib-devel
+hostmakedepends="docbook-xsl gettext glib-devel
libxslt pkg-config $(vopt_if gir vala)"
makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel
libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel"
@@ -19,9 +19,9 @@ short_desc="GNOME service to access online accounts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-38/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=955a03128d0e87855d34d7c534e088f6286ed7ac01baa4ef824ef42a2cb39aad
+checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
build_options="gir"
build_options_default="gir"
From e05fcf808cd54a3d4c428c80d1392869927ae54d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:32:55 -0700
Subject: [PATCH 596/609] gnome-nettool: update to 42.0
---
...son-drop-unused-positional-arguments.patch | 36 +++++++++++++++++++
srcpkgs/gnome-nettool/template | 14 +++-----
2 files changed, 41 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch
diff --git a/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch b/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch
new file mode 100644
index 000000000000..332379faea8f
--- /dev/null
+++ b/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch
@@ -0,0 +1,36 @@
+From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Wed, 6 Apr 2022 13:05:25 -0400
+Subject: [PATCH] meson: drop unused positional arguments
+
+This fixes a build error with newer meson
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 585e6d3..ed1e8bb 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in',
+ output: 'gnome-nettool.desktop.in',
+ configuration: desktop_conf)
+
+-i18n.merge_file('desktop',
+- type: 'desktop',
++i18n.merge_file(type: 'desktop',
+ input: desktop_in,
+ output: 'gnome-nettool.desktop',
+ po_dir: po_dir,
+ install: true,
+ install_dir: join_paths(prefix, datadir, 'applications'))
+
+-i18n.merge_file('appdata',
+- type: 'xml',
++i18n.merge_file(type: 'xml',
+ input: 'gnome-nettool.appdata.xml.in',
+ output: 'gnome-nettool.appdata.xml',
+ po_dir: po_dir,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index 89f5705d629c..f578e59d00ee 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-nettool'
pkgname=gnome-nettool
-version=3.8.1
-revision=6
-build_style=gnu-configure
-hostmakedepends="glib-devel intltool itstool pkg-config"
+version=42.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
@@ -13,8 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
+checksum=a54f29eef2038aee69551c8b19ca4f758e5eb9e2090a4bc6b5633dff0188751f
From ceffdfe95f23fdc9ee5814a92a5ad231435d2091 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:27:46 -0700
Subject: [PATCH 597/609] orca: update to 42.2.
---
srcpkgs/orca/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 298009255942..08c21b531629 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,9 +1,9 @@
# Template file for 'orca'
pkgname=orca
-version=41.1
+version=42.2
revision=1
build_style=gnu-configure
-hostmakedepends="intltool itstool pkg-config"
+hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme liblouis
python3-atspi python3-brlapi python3-dbus python3-xdg speech-dispatcher
@@ -12,8 +12,9 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1fd02b99094f09f6e72df779e1a72dce41427ec82e245a4ea83233a97eeda271
+checksum=9971e9fda1aa2bd64a76b33173135c64159a490b2c4bcffbe7b9548fedfc782c
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 53ae525eda0d26f0378ac7489170f828f494edff Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 598/609] gnome-clocks: update to 42.0
---
srcpkgs/gnome-clocks/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..c2f76af5604a 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,19 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=41.0
+version=42.0
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="pkg-config intltool itstool glib-devel vala"
+hostmakedepends="pkg-config gettext itstool glib-devel vala
+ gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
From 037c9c57b6377a5f38f8a679b3f1152d0e8bde7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 599/609] gnome-calendar: update to 42.2
---
srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ----------
srcpkgs/gnome-calendar/template | 11 ++++++-----
2 files changed, 6 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch
deleted file mode 100644
index e2df31e0760e..000000000000
--- a/srcpkgs/gnome-calendar/patches/meson-0.61.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,7 +1,6 @@
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
- appdata = i18n.merge_file(
-- 'appdata',
- input: configure_file(
- input: files('org.gnome.Calendar.appdata.xml.in.in'),
- output: 'org.gnome.Calendar.appdata.xml.in',
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..cd1d201d2dfb 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,20 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=41.2
+version=42.2
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
+hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
+ $(vopt_if gir 'gobject-introspection')"
makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
+ gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
libgweather-devel libical-devel libpeas-devel libsoup-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calendar"
-changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
build_options="gir"
build_options_default="gir"
From f131b0ec051220bc5eacb8a6c547de5e778eef64 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 600/609] gnome-weather: update to 42.0
---
srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ----------
srcpkgs/gnome-weather/template | 8 ++++----
2 files changed, 4 insertions(+), 14 deletions(-)
delete mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch
deleted file mode 100644
index a305b8c54dc4..000000000000
--- a/srcpkgs/gnome-weather/patches/meson-0.61.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -59,7 +59,6 @@ endif
- appdata_conf = configuration_data()
- appdata_conf.set('app_id', weather_id)
- appdata = i18n.merge_file(
-- 'appdata',
- input: configure_file(
- input: '@0@.appdata.xml.in.in'.format(default_id),
- output: '@0@.appdata.xml.in'.format(default_id),
diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-weather'
pkgname=gnome-weather
-version=41.0
+version=42.0
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
short_desc="Access current weather conditions and forecasts for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Weather"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
lib32disabled=yes
From dcf68c57d2d71ed18e89edd451946b35d2d8439c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 601/609] gnome-user-docs: update to 42.0
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 579bb4f407f0..773c9913d74f 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=41.2
+version=42.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
From e33e7bc39dbf253809995f2bf72611964e90fe33 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:01 -0700
Subject: [PATCH 602/609] gnome-terminal: update to 3.44.0
---
.../gnome-terminal/patches/meson-0.61.patch | 47 -------------------
srcpkgs/gnome-terminal/template | 6 +--
2 files changed, 3 insertions(+), 50 deletions(-)
delete mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch
deleted file mode 100644
index 8b6edbb923a2..000000000000
--- a/srcpkgs/gnome-terminal/patches/meson-0.61.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@src.gnome.org>
-Date: Fri, 14 Jan 2022 11:33:32 +0100
-Subject: [PATCH] build: Fix for newer meson
-
----
- data/meson.build | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 79d97e5b..e0bcbb91 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -18,7 +18,6 @@
- metainfodir = gt_datadir / 'metainfo'
-
- i18n.merge_file(
-- gt_dns_name + '.metainfo.xml',
- input: gt_dns_name + '.metainfo.xml.in',
- output: '@BASENAME@',
- po_dir: po_dir,
-@@ -27,7 +26,6 @@ i18n.merge_file(
- )
-
- i18n.merge_file(
-- gt_dns_name + '.Nautilus.metainfo.xml',
- input: gt_dns_name + '.Nautilus.metainfo.xml.in',
- output: '@BASENAME@',
- po_dir: po_dir,
-@@ -40,7 +38,6 @@ i18n.merge_file(
- desktopdatadir = gt_datadir / 'applications'
-
- i18n.merge_file(
-- gt_dns_name + '.desktop',
- input: gt_dns_name + '.desktop.in',
- output: '@BASENAME@',
- type: 'desktop',
-@@ -57,4 +54,4 @@ meson.add_install_script(
-
- # Subdirs
-
--subdir('icons')
-\ No newline at end of file
-+subdir('icons')
---
-GitLab
-
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 4853fb46511a..f12986cc45af 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.42.2
+version=3.44.1
revision=1
build_style=meson
configure_args="-Dnautilus_extension=true -Db_ndebug=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0
+checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -23,7 +23,7 @@ fi
nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
- short_desc="gnome-terminal integration for nautilus"
+ short_desc+=" - nautilus integration"
pkg_install() {
vmove usr/lib/nautilus/extensions-3.0
}
From a92be8fbb71d97407f7f10b477479d899b3128d0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:43:16 -0700
Subject: [PATCH 603/609] gnome-maps: update to 42.3.
---
srcpkgs/gnome-maps/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 414735d1ed3f..2aa746f680de 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
-version=41.4
+version=42.3
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel
- gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel"
-depends="geoclue2 gfbgraph gjs libhandy1"
+ gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel
+ libgweather-devel"
+depends="geoclue2 gfbgraph gjs libhandy1 libgweather"
short_desc="GNOME maps application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
-changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e340b13f46fe0b7d5b0f8f01413291ddcd870c74a5c38fa24cac1f585e70393e
+checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1
From 4de11cb9bcd9ca4f0160edae03f5854188072a56 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:04:46 -0700
Subject: [PATCH 604/609] gnome-font-viewer: update to 42.0
---
.../patches/meson-0.61.patch | 40 -------------------
srcpkgs/gnome-font-viewer/template | 8 ++--
2 files changed, 4 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
deleted file mode 100644
index 072ce27fd0d2..000000000000
--- a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Thu, 30 Dec 2021 17:14:47 +0800
-Subject: [PATCH] Fix meson build with meson 0.60.0+
-
-`i18n.merge_file` has been ignoring positional arguments for a time
-and explicitly rejects with error since meson 0.60.0
----
- data/meson.build | 2 +-
- src/meson.build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index bfc9caa..8e42134 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,6 +1,6 @@
- appdatadir = join_paths(datadir, 'metainfo')
- appdata_file = 'org.gnome.font-viewer.appdata.xml'
--merged_appdata = i18n.merge_file(appdata_file,
-+merged_appdata = i18n.merge_file(
- input: appdata_file + '.in',
- output: appdata_file,
- po_dir: '../po',
-diff --git a/src/meson.build b/src/meson.build
-index f863d45..826c59b 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
- desktop_conf = configuration_data()
- desktop_conf.set('VERSION', meson.project_version())
- desktop_conf.set('APPLICATION_ID', application_id)
--i18n.merge_file(desktop_file,
-+i18n.merge_file(
- input: configure_file(input: desktop_file + '.in.in',
- output: desktop_file + '.in',
- configuration: desktop_conf),
---
-GitLab
-
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f4d7f69436ee..bdc99f9a8d8c 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
-makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel libhandy1-devel"
+makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
+ gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876
+checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
From ca9b75a8ace1513af60aa09d01899561794d60ef Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:33:29 -0700
Subject: [PATCH 605/609] GPaste: update to 42.1
---
common/shlibs | 4 +++-
srcpkgs/GPaste/template | 18 +++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ab419c75c49e..f081d78cde39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1418,7 +1418,9 @@ libCHART-1.6.so.0 fox-1.6.49_1
libchromaprint.so.1 chromaprint-1.5.0_1
libedit.so.0 libedit-20130712.3.1_1
libnet.so.9 libnet-1.2_1
-libgpaste.so.13 libgpaste-3.38.2_1
+libgpaste-2.so.0 libgpaste-42.1_1
+libgpaste-gtk-3.so.0 libgpaste-42.1_1
+libgpaste-gtk4.so.0 libgpaste-42.1_1
libthreadutil.so.6 libupnp-1.6.18_1
libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index d85f71df5abe..17f2e3122ba5 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,32 +1,28 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=3.42.6
+version=42.1
revision=1
-wrksrc="gpaste-${version}"
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gnome_shell gnome-shell)
-Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings
-Dsystemd-user-unit-dir=/usr/lib/systemd"
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
-makedepends="appstream-glib-devel dbus-devel gdk-pixbuf-devel gtk+3-devel
- libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
+makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
+ libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
$(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-distfiles="https://www.imagination-land.org/files/gpaste/gpaste-${version}.tar.xz"
-checksum=1158a66c0dd32289d81eb5a3170c9c7aacd0b90ed7ac2961003d803243c476a1
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
+checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
build_options_default="gnome_shell"
-pre_build() {
- export GIR_EXTRA_LIBS_PATH="${wrksrc}/lib/.libs"
-}
-
post_install() {
vlicense COPYING
}
@@ -46,6 +42,6 @@ GPaste-devel_package() {
libgpaste_package() {
short_desc+=" - gpaste library"
pkg_install() {
- vmove "usr/lib/libgpaste.so.*"
+ vmove "usr/lib/libgpaste-*.so.*"
}
}
From f64bf77ea49d9d74b0aab6391e909b1e183403fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Jul 2022 23:31:44 +0200
Subject: [PATCH 606/609] common/shlibs: add libgnome-bluetooth-ui-3.0.so.13
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index f081d78cde39..3dda6cfafbc1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -688,6 +688,7 @@ libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
From b0a4e316ea8a580be3d82308e6d2099834020f87 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Jul 2022 23:32:00 +0200
Subject: [PATCH 607/609] gnome-control-center: use gnome-bluetooth 42
---
srcpkgs/gnome-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 4563cb97e697..84ff92b93ae8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -7,7 +7,7 @@ build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
- colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-menus-devel
+ colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel
libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
From 9ee190de6cb4594536385702b317d5507e3cf730 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Jul 2022 00:55:02 +0200
Subject: [PATCH 608/609] mutter: fix undefined reference to gettid
Our musl package has a patch that should have made this patch unnecessary,
but it doesn't seem to work properly on armv6l-musl and armv7l-musl.
This should be investigated and properly fixed.
---
srcpkgs/mutter/patches/gettid.patch | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
new file mode 100644
index 000000000000..d8e4e90d0bb4
--- /dev/null
+++ b/srcpkgs/mutter/patches/gettid.patch
@@ -0,0 +1,23 @@
+gettid wasn't implemented in musl until 1.2.2+
+
+diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
+index 2245387..2842593 100644
+--- a/src/backends/native/meta-backend-native.c
++++ b/src/backends/native/meta-backend-native.c
+@@ -39,6 +39,7 @@
+ #include "backends/native/meta-input-thread.h"
+
+ #include <stdlib.h>
++#include <syscall.h>
+
+ #include "backends/meta-cursor-tracker-private.h"
+ #include "backends/meta-idle-manager.h"
+@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
+
+ priority = sched_get_priority_min (SCHED_RR);
+ meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
+- gettid (),
++ (pid_t) syscall (SYS_gettid),
+ priority,
+ NULL,
+ &error);
From b31f7989736be399ee33f528bf67f6613fc1b1f3 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Thu, 7 Jul 2022 02:20:28 +0300
Subject: [PATCH 609/609] remove unnecessary commented-out template options
---
srcpkgs/Junction/template | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
index 2b7c41b2da33..01f57a5d5ef6 100644
--- a/srcpkgs/Junction/template
+++ b/srcpkgs/Junction/template
@@ -3,14 +3,8 @@ pkgname=Junction
version=1.5.0
revision=1
#archs="i686 x86_64"
-#wrksrc=
-#create_wrksrc=yes
build_style=meson
-#configure_args=""
-#make_build_args=""
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
+# build_helper=gir
hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
# makedepends=""
depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
@@ -19,6 +13,5 @@ short_desc="Application/browser chooser"
maintainer="cultab <rroarck@gmail.com>"
license="GPL-3.0-only"
homepage="https://github.com/sonnyp/Junction"
-#changelog=""
distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (3 preceding siblings ...)
2022-07-06 23:24 ` [PR PATCH] [Updated] " cultab
@ 2022-07-06 23:28 ` cultab
2022-07-06 23:29 ` cultab
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-07-06 23:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by cultab against master on the void-packages repository
https://github.com/cultab/void-packages master
https://github.com/void-linux/void-packages/pull/37671
New package: Junction-1.5.0
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
# This is a work in progress.
As of now it builds correctly but when run it seems to be missing a dependency.
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.
#### Made in response to issue #37352.
A patch file from https://github.com/void-linux/void-packages/pull/37671.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37671.patch --]
[-- Type: text/x-diff, Size: 1368965 bytes --]
From e48ab57dd41cc04b9a9c15db0998c9ce56715fc5 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Fri, 24 Jun 2022 21:32:13 +0300
Subject: [PATCH 001/608] New package: Junction-1.5.0
---
srcpkgs/Junction/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/Junction/template
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
new file mode 100644
index 000000000000..2b7c41b2da33
--- /dev/null
+++ b/srcpkgs/Junction/template
@@ -0,0 +1,24 @@
+# Template file for 'Junction'
+pkgname=Junction
+version=1.5.0
+revision=1
+#archs="i686 x86_64"
+#wrksrc=
+#create_wrksrc=yes
+build_style=meson
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
+# makedepends=""
+depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
+# checkdepends="appstream-glib"
+short_desc="Application/browser chooser"
+maintainer="cultab <rroarck@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/sonnyp/Junction"
+#changelog=""
+distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
+checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
From 34a9a66844c06842e458aef89b44a51fd1e116bc Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 16 Jun 2022 18:02:40 -0500
Subject: [PATCH 002/608] Signal-Desktop: update to 5.47.0.
---
srcpkgs/Signal-Desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 8cddd9d86ffd..fd5f31224bee 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=5.45.1
+version=5.47.0
revision=1
# Signal officially only supports x86_64 (also due to Electron)
# discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="akierig <anelki@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=14065fa2e2788a91893364740bfac8bd6c7aea41924fe661a0a231abe6512a7b
+checksum=d563b9be5ea5690ec2579c688db5bedbba3787b9b46428fa4164fc172e0c9322
nostrip_files="signal-desktop"
post_extract() {
From fbc3f176346953a28e75beb729716e3e251672b6 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Thu, 23 Jun 2022 23:35:48 +0700
Subject: [PATCH 003/608] vivaldi: update to 5.3.2679.61
---
srcpkgs/vivaldi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 984736d36ba1..995e269fe80e 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
# Template file for 'vivaldi'
pkgname=vivaldi
-version=5.3.2679.58
+version=5.3.2679.61
revision=1
_release=1
archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
homepage="https://vivaldi.com"
distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
_licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=5c45e446c9885618cd50d556b609effca8441ffb6a7007b62be64e24732db920
+checksum=2ffd4d9b3c6a2b3027b40581128cfb18993cc1b0b967c4acef2d89ad276bba33
repository=nonfree
restricted=yes
nostrip=yes
From 17418aa41943bb37e6efd1e80d2d13c1220a4df7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 23 Jun 2022 16:34:59 -0400
Subject: [PATCH 004/608] watchexec: update to 1.20.0
---
srcpkgs/watchexec/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index a63d43e27d04..6e872efcd8ee 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,16 +1,16 @@
# Template file for 'watchexec'
pkgname=watchexec
-version=1.19.0
+version=1.20.0
revision=1
wrksrc="${pkgname}-cli-v${version}"
-build_wrksrc="cli"
+build_wrksrc="crates/cli"
build_style=cargo
short_desc="Executes commands in response to file modifications"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="Apache-2.0"
homepage="https://github.com/watchexec/watchexec"
distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=6837dff4d14802e1e3714a2f3ef4330f8faadd10449508b128cff7f93d921101
+checksum=69c551090692a04943e7ded2d7f997f8777aa099c674b096a31d94983d02dbf7
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -18,7 +18,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
fi
post_install() {
- vdoc ../README.md
- vman ../doc/watchexec.1
- vcompletion ../completions/zsh zsh
+ vman ${wrksrc}/doc/watchexec.1
+ vcompletion ${wrksrc}/completions/zsh zsh
}
From 6836eedf659fafcb741edc3f3848f7c03be5adf6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 22:03:30 +0300
Subject: [PATCH 005/608] libdeflate: update to 1.12.
---
srcpkgs/libdeflate/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libdeflate/template b/srcpkgs/libdeflate/template
index 2991257fb464..fc3eb24cf513 100644
--- a/srcpkgs/libdeflate/template
+++ b/srcpkgs/libdeflate/template
@@ -1,6 +1,6 @@
# Template file for 'libdeflate'
pkgname=libdeflate
-version=1.11
+version=1.12
revision=1
build_style=gnu-makefile
make_build_args="PROG_SUFFIX=libdeflate"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/ebiggers/libdeflate"
changelog="https://raw.githubusercontent.com/ebiggers/libdeflate/master/NEWS.md"
distfiles="https://github.com/ebiggers/libdeflate/archive/refs/tags/v${version}.tar.gz"
-checksum=c72f691293f41c6aee66d44ca2dcd24092161b312a1c4c3d591d5d25f26b1faf
+checksum=ba89fb167a5ab6bbdfa6ee3b1a71636e8140fa8471cce8a311697584948e4d06
post_install() {
vlicense COPYING
From 0a6c389f59b97a6ae4c8432550ba4048645616b9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 21 Jun 2022 20:09:26 -0400
Subject: [PATCH 006/608] broot: update to 1.13.3
---
srcpkgs/broot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index bfd724e18cbc..b3e5f71efe15 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
# Template file for 'broot'
pkgname=broot
-version=1.13.1
+version=1.13.3
revision=1
build_style=cargo
short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://dystroy.org/broot/"
changelog="https://raw.githubusercontent.com/Canop/broot/master/CHANGELOG.md"
distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=95b4b01c43f23b8d4f06030b57c9b2e47a4fbbc4f6099acaf6e42d1f1697385e
+checksum=a7f9e98ff1371eff065a8dabbe9e31ef42d264b7d93c18f920d6a5399016da33
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 78495afe66e23cbaf9ef16cf986809df60c0fec2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Jun 2022 20:11:32 -0400
Subject: [PATCH 007/608] alsa-lib: update to 1.2.7.1
---
srcpkgs/alsa-lib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index 588169cb9b04..ac9d619a7872 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-lib'
pkgname=alsa-lib
-version=1.2.6.1
+version=1.2.7.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="LGPL-2.1-or-later"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
-checksum=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f
+checksum=046dc42dfcfad269217be05954686137e5e7397f3041372f8c6dcd7d79461e61
alsa-lib-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 21a69a7de866a5225a8c8587d421c6739e1b3fdd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Jun 2022 20:11:45 -0400
Subject: [PATCH 008/608] alsa-utils: update to 1.2.7
---
srcpkgs/alsa-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 41482fdd427c..aee7558c5111 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-utils'
pkgname=alsa-utils
-version=1.2.6
+version=1.2.7
revision=1
build_style=gnu-configure
configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf
@@ -14,7 +14,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-2.0-only"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/utils/${pkgname}-${version}.tar.bz2"
-checksum=6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d
+checksum=e906bf2404ff04c448eaa3d226d283a62b9a283f12e4fd8457fb24bac274e678
post_install() {
# Install required udev rules file.
From 63c4093756978325c7f80c8034c7d15cf27f2174 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Jun 2022 20:12:02 -0400
Subject: [PATCH 009/608] alsa-plugins: update to 1.2.7.1
---
srcpkgs/alsa-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index 0a03eaf9d8f0..0bfa6d9fd264 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,6 +1,6 @@
# Template file for 'alsa-plugins'
pkgname=alsa-plugins
-version=1.2.6
+version=1.2.7.1
revision=1
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/plugins/${pkgname}-${version}.tar.bz2"
-checksum=068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0
+checksum=8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511
post_install() {
rm -rfv ${DESTDIR}/etc/alsa/conf.d
From e81a4beaa3d37b2f72c43d33f869060efe337651 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 17 Jun 2022 20:12:19 -0400
Subject: [PATCH 010/608] alsa-ucm-conf: update to 1.2.7.1
---
srcpkgs/alsa-ucm-conf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alsa-ucm-conf/template b/srcpkgs/alsa-ucm-conf/template
index 43e25c39c650..7ecbab8eef0e 100644
--- a/srcpkgs/alsa-ucm-conf/template
+++ b/srcpkgs/alsa-ucm-conf/template
@@ -1,13 +1,13 @@
# Template file for 'alsa-ucm-conf'
pkgname=alsa-ucm-conf
-version=1.2.6.3
+version=1.2.7.1
revision=1
short_desc="ALSA Use Case Manager topology configurations"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/alsa-project/alsa-ucm-conf"
distfiles="https://github.com/alsa-project/${pkgname}/archive/refs/tags/v${version}.tar.gz"
-checksum=37ce894d5b420660a4483cf503fd3c33937697e0ed6962f47c42d4aed6d24199
+checksum=ab5fc8b04fbb3d351e422267acae6a57698f67fc7b3549ef05127ff0b7203462
do_install() {
vdoc ucm2/README.md
From 25422b47f7af34bc3f6348588009fd5e6f8d4959 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 16 Jun 2022 20:21:59 -0400
Subject: [PATCH 011/608] libnma: update to 1.8.40
---
srcpkgs/libnma/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 9d2a53119d01..13ce6f353dca 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,6 +1,6 @@
# Template file for 'libnma'
pkgname=libnma
-version=1.8.38
+version=1.8.40
revision=1
build_style=meson
build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libnma"
changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4
+checksum=870a75f8d4641ed0d90f836aea6ff511224bde97ffd56d608ade2e9b5acb2b22
replaces="libnm-gtk>=0"
if [ "$CROSS_BUILD" ]; then
From 8b4771ee145add3a559151da90769951d64dc959 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 20:27:10 +0300
Subject: [PATCH 012/608] mpv-mpris: update to 0.8.1.
---
srcpkgs/mpv-mpris/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mpv-mpris/template b/srcpkgs/mpv-mpris/template
index 784b45db60c1..e0d1793457ac 100644
--- a/srcpkgs/mpv-mpris/template
+++ b/srcpkgs/mpv-mpris/template
@@ -1,18 +1,22 @@
# Template file for 'mpv-mpris'
pkgname=mpv-mpris
-version=0.5
-revision=2
+version=0.8.1
+revision=1
build_style=gnu-makefile
+make_use_env=yes
make_build_target=mpris.so
+make_check_target=test
hostmakedepends="pkg-config"
makedepends="libglib-devel mpv-devel"
depends="mpv"
+checkdepends="mpv playerctl sound-theme-freedesktop
+ xvfb-run xauth jq socat dbus"
short_desc="MPRIS plugin for mpv"
maintainer="Alif Rachmawadi <arch@subosito.com>"
license="MIT"
homepage="https://github.com/hoyon/mpv-mpris"
distfiles="https://github.com/hoyon/mpv-mpris/archive/${version}.tar.gz"
-checksum=673aff031e7cc741edea68d7b4b0103d7b031d4a55755abb9e1be5dd4ec4e969
+checksum=a208f42ec9df5444f725a55e1b457e62c86d6b93c9c84215e1808ff047695053
do_install() {
vlicense LICENSE
From c86c2cd1ef86ece4b0ff9ea9c3131ec7e5edc458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 22 Jun 2022 16:49:27 +0200
Subject: [PATCH 013/608] qutebrowser: update to 2.5.2.
---
srcpkgs/qutebrowser/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index d1b4394c4e50..5f5bde24204e 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
# Template file for 'qutebrowser'
pkgname=qutebrowser
-version=2.5.1
+version=2.5.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
homepage="https://qutebrowser.org/"
changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=e6885886a84cd166a6ba633794a58a4c67d871c27188127e5ddbc5276d76edbc
+checksum=a9bfce14ddc403de0deb2eedf983c231ce003e0759995ec7ef4ea34e4974e908
nostrip=yes
# testing requires unpackaged plugins:
# pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
From 31478a5395ba8d43a0cfd2f8861ab452aa343d54 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Mon, 20 Jun 2022 12:31:35 -0700
Subject: [PATCH 014/608] python3-click: update to 8.1.3.
---
srcpkgs/python3-click/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template
index 2583a95cc4ad..921ddbbe0cb2 100644
--- a/srcpkgs/python3-click/template
+++ b/srcpkgs/python3-click/template
@@ -1,17 +1,19 @@
# Template file for 'python3-click'
pkgname=python3-click
-version=7.1.2
-revision=5
+version=8.1.3
+revision=1
wrksrc="click-${version}"
build_style="python3-module"
hostmakedepends="python3-setuptools"
depends="python3"
+checkdepends="python3-pytest"
short_desc="Python3 package for creating beautiful command line interfaces"
maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
license="BSD-3-Clause"
-homepage="http://click.pocoo.org/"
+homepage="https://palletsprojects.com/p/click/"
+changelog="https://raw.githubusercontent.com/pallets/click/main/CHANGES.rst"
distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
-checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
+checksum=7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e
post_install() {
vlicense LICENSE.rst
From b632f6bc5da059bb25628d31058944f272a892cb Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Tue, 21 Jun 2022 22:14:38 -0700
Subject: [PATCH 015/608] fava: update to 1.21.
make_check=no because:
```
=> fava-1.21_1: running do_check ...
ImportError while loading conftest '/builddir/fava-1.21/tests/conftest.py'.
tests/conftest.py:19: in <module>
from fava.application import _load_file
build/lib/fava/application.py:40: in <module>
from fava import __version__ as fava_version
E ImportError: cannot import name '__version__' from 'fava'
(/builddir/fava-1.21/build/lib/fava/__init__.py)
=> ERROR: fava-1.21_1: do_check: 'PYTHONPATH="$PWD/build/lib" python3 -m
pytest tests -k 'not cli and not static_url'' exited with 4
=> ERROR: in do_check() at srcpkgs/fava/template:20
```
---
srcpkgs/fava/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index 9b0f83e540b9..48542321d2f3 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,24 +1,20 @@
# Template file for 'fava'
pkgname=fava
-version=1.18
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+version=1.21
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
python3-Jinja2 beancount python3-click python3-markdown2 python3-ply
- python3-simplejson python3-Werkzeug python3-aiohttp"
+ python3-simplejson python3-Werkzeug python3-aiohttp python3-wheel"
checkdepends="$depends"
short_desc="Web interface for Beancount"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="MIT"
homepage="https://beancount.github.io/fava/"
distfiles="${PYPI_SITE}/f/fava/fava-${version}.tar.gz"
-checksum=21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5
-
-do_check() {
- # CLI test expects fava on $PATH. Not sure why static_url fails.
- PYTHONPATH="$PWD/build/lib" python3 -m pytest tests -k 'not cli and not static_url'
-}
+checksum=d1a1422848e65e7eb275d80d322f6de2bcea1dc37b5412e8cf72c483d6a998d6
+make_check=no # "ImportError: cannot import name '__version__' from 'fava'"
post_install() {
vlicense LICENSE
From 5b5430aacf273b6b98fa7635d8b986534a60cb97 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Thu, 23 Jun 2022 19:33:26 -0700
Subject: [PATCH 016/608] python3-click-threading: update to 0.5.0.
---
srcpkgs/python3-click-threading/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
index 66bd90de3fd8..07744a6f6f70 100644
--- a/srcpkgs/python3-click-threading/template
+++ b/srcpkgs/python3-click-threading/template
@@ -1,7 +1,7 @@
# Template file for 'python3-click-threading'
pkgname=python3-click-threading
-version=0.4.4
-revision=5
+version=0.5.0
+revision=1
wrksrc="click-threading-${version}"
build_style="python3-module"
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
license="MIT"
homepage="https://github.com/click-contrib/click-threading"
distfiles="${PYPI_SITE}/c/click-threading/click-threading-${version}.tar.gz"
-checksum=b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7
+checksum=adcfe623c02a595c107c314072f67a2278fe4eb40b72c0d1a2c903cc78af3439
post_install() {
vlicense LICENSE
From e99752c3c1919226505bdcba50b0e9217c8b6344 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Feb 2022 19:58:13 +0100
Subject: [PATCH 017/608] libunistring: update to 1.0.
---
srcpkgs/libunistring/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libunistring/template b/srcpkgs/libunistring/template
index d25099d67eba..296c327fd895 100644
--- a/srcpkgs/libunistring/template
+++ b/srcpkgs/libunistring/template
@@ -1,6 +1,6 @@
# Template file for 'libunistring'
pkgname=libunistring
-version=0.9.10
+version=1.0
revision=1
build_style=gnu-configure
short_desc="Library for manipulating Unicode strings and C strings"
@@ -8,10 +8,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="https://www.gnu.org/software/libunistring"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b
+checksum=3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544
libunistring-devel_package() {
- short_desc+=" - development files)"
+ short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 89309a07542f419dbe4060d4951b317ea66775b4 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Tue, 3 May 2022 16:34:40 +1000
Subject: [PATCH 018/608] kubernetes: update to 1.23.7
---
srcpkgs/kubernetes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 1cf5ba118164..604938bc7edd 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
# Template file for 'kubernetes'
pkgname=kubernetes
-version=1.23.3
+version=1.23.7
revision=1
archs="x86_64* ppc64le*"
build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="http://kubernetes.io"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=cd9b217b7b82e885533f9c315ac7365cc8d2c0760bfb1da281a249f061908457
+checksum=fa366d6e1013e83fc54329c9ce7f2b170734e7aeee6ffc8e337b9e2d3de46c3f
nocross=yes
system_accounts="kube"
make_dirs="/var/lib/kubelet 0755 kube kube"
From 6f3d5928e69c470fc87f1537b9c075be5fce581f Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 14 Jun 2022 09:25:33 -0500
Subject: [PATCH 019/608] xsm: update to 1.0.5.
---
srcpkgs/xsm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xsm/template b/srcpkgs/xsm/template
index 830de263e1d1..b5f29364fb39 100644
--- a/srcpkgs/xsm/template
+++ b/srcpkgs/xsm/template
@@ -1,6 +1,6 @@
# Template file for 'xsm'
pkgname=xsm
-version=1.0.4
+version=1.0.5
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="X Session Manager"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=9934b6893a4e52cf7435368fc8d425c371b5e32d96e420ead30166eb82d64425
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=9c30fdaa3fc132e4ff201cfc478669056e6e15502e77df88df11fb94e4e6fb2d
post_install() {
vlicense COPYING
From 93620a5a85596a08ab9b8d650838de33fd1973b4 Mon Sep 17 00:00:00 2001
From: "amy.sh" <amy5.sh@protonmail.com>
Date: Fri, 11 Feb 2022 20:00:46 -0800
Subject: [PATCH 020/608] new package: bdfresize-1.5
---
srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch | 13 +++++++++++++
srcpkgs/bdfresize/patches/02-minus-sign.patch | 14 ++++++++++++++
srcpkgs/bdfresize/template | 15 +++++++++++++++
3 files changed, 42 insertions(+)
create mode 100644 srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch
create mode 100644 srcpkgs/bdfresize/patches/02-minus-sign.patch
create mode 100644 srcpkgs/bdfresize/template
diff --git a/srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch b/srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch
new file mode 100644
index 000000000000..b69bc4b3d5a4
--- /dev/null
+++ b/srcpkgs/bdfresize/patches/01-ftbfs-gcc4.patch
@@ -0,0 +1,13 @@
+Description: Fix FTBFS with gcc 4.0
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=258509#5
+Bug-Debian: http://bugs.debian.org/258509
+
+--- bdfresize-1.5/charresize.c 2000-12-12 20:18:14.000000000 +0900
++++ bdfresize-1.5-3.1/charresize.c 2008-05-11 23:01:11.000000000 +0900
+@@ -46,7 +46,6 @@
+ void
+ processChar(void)
+ {
+- char *malloc();
+ char *srcimage;
+ int *dstgray;
diff --git a/srcpkgs/bdfresize/patches/02-minus-sign.patch b/srcpkgs/bdfresize/patches/02-minus-sign.patch
new file mode 100644
index 000000000000..54d69a09bebd
--- /dev/null
+++ b/srcpkgs/bdfresize/patches/02-minus-sign.patch
@@ -0,0 +1,14 @@
+Description: The - sign escapes, changes in debian/1.5-4
+Author: Frank Lichtenheld <djpig@debian.org>
+
+--- bdfresize-1.5/bdfresize.1 2000-12-11 17:18:15.000000000 +0900
++++ bdfresize-1.5-4/bdfresize.1 2008-05-11 23:01:11.000000000 +0900
+@@ -2,7 +2,7 @@
+ .SH NAME
+ bdfresize \- Resize BDF Format Font
+ .SH SYNOPSIS
+-bdfresize [-v] [-b \fInumber\fP] [-[whf] \fIfactor\fP] [\fIbdf-file\fP]
++bdfresize [\-v] [\-b \fInumber\fP] [\-[whf] \fIfactor\fP] [\fIbdf-file\fP]
+ .SH DESCRIPTION
+ .I Bdfresize
+ is a command to magnify or reduce fonts which are described with
diff --git a/srcpkgs/bdfresize/template b/srcpkgs/bdfresize/template
new file mode 100644
index 000000000000..90f223ccad33
--- /dev/null
+++ b/srcpkgs/bdfresize/template
@@ -0,0 +1,15 @@
+# Template file for 'bdfresize'
+pkgname=bdfresize
+version=1.5
+revision=1
+build_style=gnu-configure
+short_desc="Tool for resizing BDF format font"
+maintainer="amy.sh <amy5.sh@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/"
+distfiles="${homepage}/bdfresize-${version}.tar.gz"
+checksum=440cfc0620a0237e46352c14a0774caa3f3059759b0a20defefc94e8490897a6
+
+post_install() {
+ vdoc README
+}
From 504e5395ccbaacb687e5315ae404600ce040d36b Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 22 Jun 2022 19:14:40 +0200
Subject: [PATCH 021/608] gopls: update to 0.8.4.
---
srcpkgs/gopls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 963253e7b4ee..c6164f56decd 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
# Template file for 'gopls'
pkgname=gopls
-version=0.8.2
+version=0.8.4
revision=1
wrksrc=tools-gopls-v${version}
build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
license="MIT"
homepage="https://github.com/golang/tools"
distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=761aa768e82a958e6f803db39215c995fe0f263df825ed1cbb9f6b2989f0cd00
+checksum=815060abeb22755352414ef62ffb265b2f0f9d38786c164595f85c9c25c8a7cb
post_install() {
vlicense ../LICENSE
From 7db578a628d7f2c5f49e80f6c78fadfc30a5358c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 26 Mar 2022 12:31:02 +0100
Subject: [PATCH 022/608] tokei: enable additional output formats
---
srcpkgs/tokei/template | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template
index 32aeea5e1a2a..8e5da7ab3923 100644
--- a/srcpkgs/tokei/template
+++ b/srcpkgs/tokei/template
@@ -1,8 +1,9 @@
# Template file for 'tokei'
pkgname=tokei
version=12.1.2
-revision=1
+revision=2
build_style=cargo
+configure_args="--features all"
short_desc="Count lines of code"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
@@ -10,6 +11,12 @@ homepage="https://github.com/XAMPPRocky/tokei"
distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}.tar.gz"
checksum=81ef14ab8eaa70a68249a299f26f26eba22f342fb8e22fca463b08080f436e50
+# on i686 LLVM has problems with compiling doctests
+case "$XBPS_TARGET_MACHINE" in
+ i686) make_check_args+=" --tests";;
+ *) ;;
+esac
+
post_install() {
vlicense LICENCE-MIT
}
From 98075e6f605755463215af992240c1e0b4c910d7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 20 Jun 2022 13:12:02 -0700
Subject: [PATCH 023/608] glib: update to 2.72.2
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index d301dadb8990..b69e5bbda63a 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
# Template file for 'glib'
pkgname=glib
-version=2.72.0
+version=2.72.2
revision=1
build_style=meson
# static version is necessary for qemu-user-static;
@@ -17,7 +17,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
+checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
From 263e46b89b2ab3aa42c640580a03edea480fec87 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 20 Jun 2022 19:19:10 -0300
Subject: [PATCH 024/608] rust-analyzer: update to 2022.06.20.
---
srcpkgs/rust-analyzer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index f59223bc5740..d6babaaf3b56 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
# Template file for 'rust-analyzer'
pkgname=rust-analyzer
-version=2022.06.13
+version=2022.06.20
revision=1
_ver=${version//./-}
wrksrc="${pkgname}-${_ver}"
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
license="Apache-2.0, MIT"
homepage="https://rust-analyzer.github.io/"
distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
-checksum=7cc67e054330a63d3c8ca7c2cd8d0a8067f5ab0a45f5297df64bec1ce91ab072
+checksum=195f0f19ef0254e030f5806021f19dbb099a340bcb7874287583f0b534d71078
# tests require Rust source code
make_check=no
From 1315457dabb5b0fed447d02fde209289b0be9cb6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 10 May 2022 08:37:46 -0400
Subject: [PATCH 025/608] python3-phonenumbers: update to 8.12.50.
---
srcpkgs/python3-phonenumbers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 5b4179baaacf..b9773a67edfe 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.12.47
+version=8.12.50
revision=1
wrksrc="phonenumbers-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://github.com/daviddrysdale/python-phonenumbers"
changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522
+checksum=f00d67f20875804f4fade4803a9438294029982ac929c6ba303e1f0290cf5d45
From d2a3796f6f0db40526c9e224c16ac8fd022066cb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 20 Jun 2022 09:03:54 -0400
Subject: [PATCH 026/608] python3-canonicaljson: update to 1.6.2.
---
srcpkgs/python3-canonicaljson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index 2124a48c545b..2da9cde02ccb 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
# Template file for 'python3-canonicaljson'
pkgname=python3-canonicaljson
-version=1.6.1
+version=1.6.2
revision=1
wrksrc="canonicaljson-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="Apache-2.0"
homepage="https://github.com/matrix-org/python-canonicaljson"
distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824
+checksum=af00be8ce9c589857df176bb94594f0d43b0e027f027a8d7cf8978fdb819024a
From da15729b28e6d86d0b975bf082c734920940748c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 17 May 2022 08:23:47 -0400
Subject: [PATCH 027/608] synapse: update to 1.61.0.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 5e23260063e5..ce748cc3a452 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.58.0
+version=1.61.0
revision=1
build_style=python3-pep517
make_check_target=tests
@@ -22,7 +22,7 @@ license="Apache-2.0"
homepage="https://github.com/matrix-org/synapse"
changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
+checksum=3602b4a01688edae8365973877220a0511cb3970ff4e32eec759ca070066a684
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
From e90fd63c42362154a08c599a8013e0af439a4463 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Tue, 21 Jun 2022 18:53:24 +0700
Subject: [PATCH 028/608] phoronix-test-suite: update to 10.8.3
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index eae4ccbe8171..7b1b90a927f5 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,6 +1,6 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
-version=10.2.0
+version=10.8.3
revision=1
wrksrc="$pkgname"
depends="php"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.phoronix-test-suite.com/"
changelog="https://raw.githubusercontent.com/phoronix-test-suite/phoronix-test-suite/master/ChangeLog"
distfiles="https://phoronix-test-suite.com/releases/${pkgname}-${version}.tar.gz"
-checksum=7a828781b4b2384930ce48b9c16b9994e0266658f138c5dcced03f83c4edbad4
+checksum=4b742e28a9542fe2b57aacb691159d69d3e1c77d95da6d24b7867889ce84ba80
do_install() {
vsed -e "s/^\texport PTS_DIR=.*/\texport PTS_DIR=\/usr\/share\/webapps\/${pkgname}/g" -i phoronix-test-suite
From 7271b9be9e533c94ea3cb7ca2c3c9d4328727ee4 Mon Sep 17 00:00:00 2001
From: Quad <contact@quad.moe>
Date: Wed, 22 Jun 2022 19:11:56 +0200
Subject: [PATCH 029/608] radeontop: update to 1.4
---
srcpkgs/radeontop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/radeontop/template b/srcpkgs/radeontop/template
index 4f36a8d6b032..097d40bd05f4 100644
--- a/srcpkgs/radeontop/template
+++ b/srcpkgs/radeontop/template
@@ -1,6 +1,6 @@
# Template file for 'radeontop'
pkgname=radeontop
-version=1.3
+version=1.4
revision=1
archs="i686* x86_64*"
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-only"
homepage="https://github.com/clbr/radeontop"
distfiles="https://github.com/clbr/radeontop/archive/v${version}.tar.gz"
-checksum=0e6abacafa3c795ee783be18b736f6dfc7ff93c6e3c3237cc7c1684863e08100
+checksum=2c1e2aace1a749d8e4530047ce245004e0f7d1d32a99037917e03d83e60f7ad1
do_build() {
make CC="$CC" amdgpu=1
From 2bb364857eb09c6bfa2f001ad1236f4f36a0a26a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 17 Jun 2022 21:27:59 +0300
Subject: [PATCH 030/608] opera: update to 88.0.4412.40.
---
srcpkgs/opera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 75d8c0a1c0ba..35645b527cae 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
# Template file for 'opera'
pkgname=opera
-version=88.0.4412.27
+version=88.0.4412.40
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
homepage="https://www.opera.com/computer"
distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=3112a9549764d3ba28873a0710256509886cdf68d6ce2b11b7013479c48fbfef
+checksum=9f825b3040bc2c3d8b10f5d45313b2006736562f0bf86fa86345c0cea9e6bacf
repository="nonfree"
nostrip=yes
From 243acd6b3bbd93836e30cee6eadd3a668085e3d5 Mon Sep 17 00:00:00 2001
From: Barbaross <cullenrss@gmail.com>
Date: Fri, 17 Jun 2022 17:40:56 -0400
Subject: [PATCH 031/608] mpdscribble: update to 0.24
---
srcpkgs/mpdscribble/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mpdscribble/template b/srcpkgs/mpdscribble/template
index 7a33d2bb607a..652b5e46076e 100644
--- a/srcpkgs/mpdscribble/template
+++ b/srcpkgs/mpdscribble/template
@@ -1,6 +1,6 @@
# Template file for 'mpdscribble'
pkgname=mpdscribble
-version=0.23
+version=0.24
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/MusicPlayerDaemon/mpdscribble"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/mpdscribble/master/NEWS"
distfiles="https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"
-checksum=a3387ed9140eb2fca1ccaf9f9d2d9b5a6326a72c9bcd4119429790c534fec668
+checksum=f6b4cba748b3b87e705270b4923c8e23e94c2e00fedd50beb1468dbe2fb2a8e7
conf_files="/etc/${pkgname}.conf"
make_dirs="/var/cache/mpdscribble/ 0755 root root"
From 3b7f8b6e4f087a8d764998e6528b6c814218f9c1 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Fri, 17 Jun 2022 06:32:39 -0400
Subject: [PATCH 032/608] font-iosevka: update to 15.5.0.
---
srcpkgs/font-iosevka/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index bfde8e7c10cc..4cb4acfbeb3a 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
# Template file for 'font-iosevka'
pkgname=font-iosevka
-version=15.3.1
+version=15.5.0
revision=1
create_wrksrc=yes
depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 553b3e1da4a35396993a755b952b573ec466c4f47a6b4efa07e0636cd65b2600
- e67d51a5a7a40f0cd267f0503af32c9892aee53a131e7c836ed7138ca664dffe"
+ aa0c7af1f7dca595bcb137fa1aa009385705bda19e04272a5ddad749610f6624
+ b1f53a77a8fbd44a9a19f2e8fbd1057c697add7c56d933c699aba8d73f1d124e"
font_dirs="/usr/share/fonts/TTF"
From 26719ecc2609bbb93286805eb2d293a9356cf189 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Wed, 18 May 2022 12:16:20 -0400
Subject: [PATCH 033/608] direnv: update to 2.32.0.
---
srcpkgs/direnv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 7c19c9030396..1cd5f6966e97 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,6 +1,6 @@
# Template file for 'direnv'
pkgname=direnv
-version=2.30.3
+version=2.32.0
revision=1
build_style=go
go_import_path=github.com/direnv/direnv/v2
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://direnv.net/"
changelog="https://raw.githubusercontent.com/direnv/direnv/master/CHANGELOG.md"
distfiles="https://github.com/direnv/direnv/archive/v${version}.tar.gz"
-checksum=7fb5431b98d57fb8c70218b4a0fab4b08f102790e7a92486f588bf3d5751ac3b
+checksum=d9bd6a78b57257306b45a64473d3302b0f274a3d2499e870d29f7a22a730f11c
post_install() {
vlicense LICENSE
From 98ba68df049604286a5e07132f8d57620d978299 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 17 Jun 2022 20:24:53 +0400
Subject: [PATCH 034/608] calibre: update to 5.44.0.
---
srcpkgs/calibre/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 2c096a3c5ccf..1ecfaacf8f63 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
# Template file for 'calibre'
pkgname=calibre
-version=5.43.0
-revision=2
+version=5.44.0
+revision=1
build_style=python3-module
pycompile_dirs="/usr/lib/calibre/"
hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
homepage="https://calibre-ebook.com"
changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=834bfae52c26f9293c00cb4d4f51260defe198ef076619194016c51f87df12e0
+checksum=6ffaa3eafd36a24355e5957f0f838db6db6d3456cfa17cb4d139fd94ebaf88ec
python_version=3
lib32disabled=yes
nocross=yes
From a329cba4d9f048d5d5dbe9d519cb77a62a5639e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
<sigrid@ftrv.se>
Date: Mon, 13 Jun 2022 18:50:15 +0200
Subject: [PATCH 035/608] chuck: update to 1.4.1.1, adopt
---
srcpkgs/chuck/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/chuck/template b/srcpkgs/chuck/template
index 9c6c8be9364a..5e9510c4b162 100644
--- a/srcpkgs/chuck/template
+++ b/srcpkgs/chuck/template
@@ -1,6 +1,6 @@
# Template file for 'chuck'
pkgname=chuck
-version=1.4.1.0
+version=1.4.1.1
revision=1
build_wrksrc=src
build_style=gnu-makefile
@@ -9,12 +9,12 @@ make_build_target="linux-jack"
hostmakedepends="bison flex"
makedepends="jack-devel libsndfile-devel liblo-devel"
short_desc="Concurrent, on-the-fly audio programming language"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>"
license="GPL-2.0-or-later"
homepage="http://chuck.cs.princeton.edu"
changelog="https://chuck.cs.princeton.edu/release/VERSIONS"
distfiles="http://chuck.cs.princeton.edu/release/files/$pkgname-$version.tgz"
-checksum=74bf99ad515e3113c55b833152936fad02a3cf006a54105ff11777c473194928
+checksum=4459ee6f151da72dcde1525e0afe05329d61086356b168ecfc0bc3a570290f63
post_extract() {
From 781b4eb9496954bfa8bbb4feaffaca81cce0353f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jun 2022 21:42:37 +0200
Subject: [PATCH 036/608] rosegarden: update to 22.06
---
srcpkgs/rosegarden/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template
index e909cd4173b5..d9bf2c26cd76 100644
--- a/srcpkgs/rosegarden/template
+++ b/srcpkgs/rosegarden/template
@@ -1,6 +1,6 @@
# Template file for 'rosegarden'
pkgname=rosegarden
-version=21.12
+version=22.06
revision=1
build_style=cmake
hostmakedepends="pkg-config shared-mime-info"
@@ -12,7 +12,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="http://rosegardenmusic.com/"
distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2"
-checksum=dc3ed3db064e754de9fe830b69df40a53dc7157fbfa8a206ca82e5e41c262809
+checksum=9024825155ebb1be8b4af567f3502026957398fdefd086e23fe399f1d033fadb
if [ -n "${CROSS_BUILD}" ]; then
hostmakedepends+=" qt5-devel qt5-host-tools"
From 11471e43ba48fd0c5740f6c976086b5a85f491a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 18 Jun 2022 08:51:05 +0200
Subject: [PATCH 037/608] maxima: enable sbcl option only on supported archs
---
srcpkgs/maxima/template | 12 ++++++++++--
srcpkgs/sbcl/template | 1 +
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index 69af367ca11d..69e85ec833e8 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,7 +1,7 @@
# Template file for 'maxima'
pkgname=maxima
version=5.45.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
hostmakedepends="python3 perl emacs texinfo patchelf"
@@ -28,7 +28,15 @@ build_options="clisp sbcl ecl"
desc_option_clisp="Build with CLISP"
desc_option_sbcl="Build with SBCL"
desc_option_ecl="Build with ECL"
-build_options_default="sbcl ecl"
+build_options_default="ecl"
+
+# sbcl is only available for these architectures
+case "$XBPS_TARGET_MACHINE" in
+ i686|x86_64*|armv7l|aarch64|ppc64le*)
+ build_options_default+=" sbcl"
+ ;;
+esac
+
vopt_conflict clisp sbcl
post_configure() {
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index cd2e813dc7f8..43e3045f5fc9 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -2,6 +2,7 @@
pkgname=sbcl
version=2.2.5
revision=1
+# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
hostmakedepends="iana-etc texinfo"
makedepends="zlib-devel"
From e7733a7bef391363c7f30c20ce04430d5cf78d6a Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Fri, 24 Jun 2022 23:48:56 +0200
Subject: [PATCH 038/608] python3-spotipy: update to 2.20.0.
---
srcpkgs/python3-spotipy/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-spotipy/template b/srcpkgs/python3-spotipy/template
index a0a2aba69d93..6ea9e629df06 100644
--- a/srcpkgs/python3-spotipy/template
+++ b/srcpkgs/python3-spotipy/template
@@ -1,18 +1,18 @@
# Template file for 'python3-spotipy'
pkgname=python3-spotipy
-version=2.19.0
-revision=2
+version=2.20.0
+revision=1
wrksrc="spotipy-${version}"
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="python3-devel"
depends="python3-requests python3-six python3-urllib3"
short_desc="Light weight Python library for the Spotify Web API"
-maintainer="Eloi Torrents <eloitorrentsj@gmail.com>"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
license="MIT"
homepage="https://github.com/plamere/spotipy"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36c94b4b3beaa7979721272d84837ee4df3adb8ca6d32c5675b91b3823b4df12
+checksum=5f14c44945520b5fc0c5bf985ea7767d2b86f5f666a69191d12a376919cf95ed
make_check=no # Requires Spotify API Key
post_install() {
From 219fc3189a6617293dce830f3648d86955dbd317 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 23 Jun 2022 12:22:44 +0200
Subject: [PATCH 039/608] bindfs: update to 1.16.0.
---
srcpkgs/bindfs/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index 71836f4985c6..beb18d37dcc1 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,6 +1,6 @@
# Template file for 'bindfs'
pkgname=bindfs
-version=1.15.1
+version=1.16.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -9,7 +9,8 @@ short_desc="FUSE filesystem for mounting a directory to another location"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://bindfs.org"
+changelog="https://bindfs.org/docs/ChangeLog.utf8.txt"
distfiles="https://bindfs.org/downloads/bindfs-${version}.tar.gz"
-checksum=04dd3584a6cdf9af4344d403c62185ca9fab31ce3ae5a25d0101bc10936c68ab
+checksum=02ebefaaa64e1b044fc5c743c5829aad21ed6f7145f4db0723bcc45f085781f6
#cannot mount
make_check=no
From e9faf9f988e0a85906476cc44bef4946ce322051 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 22 Jun 2022 19:12:50 +0200
Subject: [PATCH 040/608] golangci-lint: update to 1.46.2.
---
srcpkgs/golangci-lint/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index ec240a602f1d..3993c339613f 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,6 +1,6 @@
# Template file for 'golangci-lint'
pkgname=golangci-lint
-version=1.43.0
+version=1.46.2
revision=1
build_style=go
go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
-checksum=1fea2ae146e9578931ade7dfd4a0ae3335079dd49bbb396c1fef2333a6524632
+checksum=2f4b6592161565fdd0ee5fea7719dbd6ef593f7ad0e1975fd82e4fb745d487a8
# fix: collect2: fatal error: cannot find 'ld'
export LDFLAGS="-fuse-ld=bfd"
From c5ea1941f4cc044e48618ddadc6a54264f08cfa5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 11 Jun 2022 09:53:45 -0700
Subject: [PATCH 041/608] fuse-overlayfs: update to 1.9
---
srcpkgs/fuse-overlayfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template
index 0fb2a3a56503..4d65edb76ae6 100644
--- a/srcpkgs/fuse-overlayfs/template
+++ b/srcpkgs/fuse-overlayfs/template
@@ -1,6 +1,6 @@
# Template file for 'fuse-overlayfs'
pkgname=fuse-overlayfs
-version=1.8.2
+version=1.9
revision=1
build_style=gnu-configure
hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/containers/fuse-overlayfs"
distfiles="https://github.com/containers/fuse-overlayfs/archive/v${version}.tar.gz"
-checksum=dfcadb2d7e1d109db42cca250fbe3341bbd463ac25f5950b2b56bd7618c0fc0f
+checksum=6a2ff4cb3d32bdedb7986bcb0430ce8e5c44f0e3e71b8c7be558451032fc27f4
pre_configure() {
./autogen.sh
From f8b32b2e14edfd02ede7eefc4e23f3801ef33f5c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 11 Jun 2022 10:53:38 +0300
Subject: [PATCH 042/608] qmmp: update to 1.6.1.
---
srcpkgs/qmmp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index df7b57da7ed6..26c661ed16be 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,6 +1,6 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.5.1
+version=1.6.1
revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=f3dc676039b5f190e6a87377a6b2bd2bcca122d1659b5f22668c7a284bb91f43
+checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
qmmp-devel_package() {
short_desc+=" - development files"
From 62ceae0f640decc9d3344058bb49e613d2f43102 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 6 Jun 2022 16:17:55 +0200
Subject: [PATCH 043/608] duplicity: update to 0.8.23, split subpkg, update
homepage
---
srcpkgs/duplicity-doc | 1 +
srcpkgs/duplicity/template | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
create mode 120000 srcpkgs/duplicity-doc
diff --git a/srcpkgs/duplicity-doc b/srcpkgs/duplicity-doc
new file mode 120000
index 000000000000..3c49d7bc8b8b
--- /dev/null
+++ b/srcpkgs/duplicity-doc
@@ -0,0 +1 @@
+duplicity
\ No newline at end of file
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index 7098a587a79d..afb1eeabaf66 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,7 +1,7 @@
# Template file for 'duplicity'
pkgname=duplicity
-version=0.8.20
-revision=2
+version=0.8.23
+revision=1
build_style=python3-module
hostmakedepends="gettext python3-setuptools_scm"
makedepends="python3-devel librsync-devel"
@@ -11,12 +11,15 @@ checkdepends="$depends python3-pytest python3-mock python3-pexpect
short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://duplicity.nongnu.org/"
-changelog="http://duplicity.nongnu.org/vers8/CHANGELOG.md"
-distfiles="http://launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz"
-checksum=bbe4679d37cc5523c2302d6d7933d32f365f7c9aea7ffc7827c45e3b7b2d2234
+homepage="https://duplicity.gitlab.io"
+changelog="${homepage}/vers8/CHANGELOG.html"
+distfiles="https://launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz"
+checksum=b24aec0df4849a71de64b743fe9957f09bb80259898e455bdc612c78bdb374e2
-post_install() {
- # drop doc
- rm -rf ${DESTDIR}/usr/share/doc
+duplicity-doc_package() {
+ short_desc+=" - documentation"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/share/doc
+ }
}
From d334277f2af10c5ed9c8f70ee02eed7600f96887 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 29 May 2022 18:54:53 +0200
Subject: [PATCH 044/608] trash-cli: update to 0.22.4.16.
---
srcpkgs/trash-cli/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/trash-cli/template b/srcpkgs/trash-cli/template
index d093cfcd1a25..ef4ab4ecb102 100644
--- a/srcpkgs/trash-cli/template
+++ b/srcpkgs/trash-cli/template
@@ -1,9 +1,9 @@
# Template file for 'trash-cli'
pkgname=trash-cli
-version=0.20.12.26
-revision=2
+version=0.22.4.16
+revision=1
build_style=python3-module
-hostmakedepends="python3"
+hostmakedepends="python3 python3-setuptools"
depends="python3-psutil"
checkdepends="$depends python3-pytest python3-six python3-mock"
short_desc="Command line interface to the freedesktop.org trashcan"
@@ -11,4 +11,6 @@ maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-2.0-or-later"
homepage="https://github.com/andreafrancia/trash-cli"
distfiles="https://github.com/andreafrancia/trash-cli/archive/${version}.tar.gz"
-checksum=06173eaca9b7fbda661ac7d84f900c7f4d17db5dd6ee4b3617bcf2182cde0f31
+checksum=6f2d306abbb0cb857d6fc6697a65e006758458ad85793cc0b62f64be993f9c68
+# Can not be run as root
+make_check=ci-skip
From 9fcd9d75083559124136e60e8b7b23514d422a2b Mon Sep 17 00:00:00 2001
From: Bogdan Drozd <python.bogdan@gmail.com>
Date: Tue, 24 May 2022 17:13:53 +0300
Subject: [PATCH 045/608] reuse: update to 1.0.0.
---
srcpkgs/reuse/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
index 156b73ea9dbe..9da8deb6dcb8 100644
--- a/srcpkgs/reuse/template
+++ b/srcpkgs/reuse/template
@@ -1,18 +1,20 @@
# Template file for 'reuse'
pkgname=reuse
-version=0.13.0
-revision=2
+version=1.0.0
+revision=1
build_style=python3-module
+# These tests pass on local machine but don't pass in CI.
make_check_args="--deselect tests/test_lint.py::test_lint_read_errors
+ --deselect tests/test_main_addheader.py::test_addheader_to_read_only_file_does_not_traceback
--deselect tests/test_report.py::test_generate_project_report_read_error"
hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
- python3-license-expression python3-requests"
-checkdepends="python3-pytest $depends"
+ python3-license-expression python3-requests python3-setuptools"
+checkdepends="python3-pytest $depends git mercurial"
short_desc="Helper tool for compliance with REUSE Specification"
maintainer="k4leg <python.bogdan@gmail.com>"
-license="GPL-3.0-or-later, CC0-1.0, Apache-2.0"
+license="GPL-3.0-or-later, CC0-1.0, Apache-2.0, CC-BY-SA-4.0"
homepage="https://reuse.software"
changelog="https://raw.githubusercontent.com/fsfe/reuse-tool/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
-checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
+checksum=db3022be2d87f69c8f508b928023de3026f454ce17d01e22f770f7147ac1e8d4
From 29426e98dad01c4cf19e31544187309d2bd5a38a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 22 May 2022 12:04:28 +0200
Subject: [PATCH 046/608] bfs: update to 2.6.
---
srcpkgs/bfs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index 799cd1d86bb6..de85ef0a52fe 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
# Template file for 'bfs'
pkgname=bfs
-version=2.5
+version=2.6
revision=1
build_style=gnu-makefile
makedepends="acl-devel libcap-devel oniguruma-devel"
@@ -9,9 +9,9 @@ short_desc="Breadth-first version of the UNIX find command"
maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="0BSD"
homepage="https://github.com/tavianator/bfs"
-changelog="https://raw.githubusercontent.com/tavianator/bfs/main/RELEASES.md"
+changelog="https://raw.githubusercontent.com/tavianator/bfs/main/docs/CHANGELOG.md"
distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=410be5de74bfc5dece213731d3a8462310789118d299fb14f02bd9b0fdd66875
+checksum=5812a4c62004c851eb02e23c0b6698dbb40061ce1c4069bb33c5b14f5361d81b
post_install() {
vlicense LICENSE
From 174f279869c2580b5783b8fddfd2d42f806e9eff Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 May 2022 16:28:12 +0300
Subject: [PATCH 047/608] seabios: update to 1.16.0.
Also:
- fix xlint warnings.
---
srcpkgs/seabios/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/seabios/template b/srcpkgs/seabios/template
index bec0dcd92f2d..4a99299fae7e 100644
--- a/srcpkgs/seabios/template
+++ b/srcpkgs/seabios/template
@@ -1,16 +1,16 @@
# Template file for 'seabios'
pkgname=seabios
-version=1.14.0
+version=1.16.0
revision=1
+archs="i686* x86_64*"
build_style=gnu-makefile
hostmakedepends="python3"
-archs="i686* x86_64*"
short_desc="OSS implementation of a 16-bit x86 BIOS"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="https://www.seabios.org/"
distfiles="https://www.seabios.org/downloads/${pkgname}-${version}.tar.gz"
-checksum=eb70cc62b29aa83e10a653233acebf4bb154d00d0c87dc2a2c6e2da75e5e81fd
+checksum=d44d8e97ad56f3fd23ed3076077a770d37a5e7bae22daa59656ff41c3334fb34
CFLAGS="-Wno-error -Wno-array-bounds"
From b29e73e21b084cece7ba94d787ad5e0804548c51 Mon Sep 17 00:00:00 2001
From: obunden <56209614+obunden@users.noreply.github.com>
Date: Fri, 20 May 2022 18:15:49 +0200
Subject: [PATCH 048/608] retroarch: update to 1.10.3.
---
srcpkgs/retroarch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index bafac5d513a0..ad22866768fa 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.10.2
+version=1.10.3
revision=1
wrksrc="RetroArch-$version"
build_style=configure
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
homepage="https://www.retroarch.com/"
changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=c7d371208292aa58b295d639e550efbe412671e09a3d609540796709b17b9b8b
+checksum=2af44294e55f5636262284d650cb5fff55c9070ac3a700d4fa55c1f152dcb3f2
build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"
From c10ce210277fe9d88650a53f127014ff68074cbe Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Mon, 20 Jun 2022 12:28:26 +0700
Subject: [PATCH 049/608] cadence: update to 0.9.2
Closes: #37618 [via git-merge-pr]
---
srcpkgs/cadence/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cadence/template b/srcpkgs/cadence/template
index 35ec773b9f11..5fe361c13921 100644
--- a/srcpkgs/cadence/template
+++ b/srcpkgs/cadence/template
@@ -1,10 +1,9 @@
# Template file for 'cadence'
pkgname=cadence
-version=0.9.1
-revision=2
+version=0.9.2
+revision=1
wrksrc="Cadence-${version}"
build_style=gnu-makefile
-python_version=3
pycompile_dirs="usr/share/cadence/src"
hostmakedepends="pkg-config qt5-host-tools python3-PyQt5-devel-tools"
makedepends="jack-devel ladish-devel pulseaudio-devel qt5-devel"
@@ -13,9 +12,10 @@ depends="a2jmidid desktop-file-utils hicolor-icon-theme jack python3-PyQt5-dbus
short_desc="Set of tools useful for audio production"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-only"
-homepage="http://kxstudio.linuxaudio.org/Applications:Cadence"
+homepage="https://kx.studio/Applications:Cadence"
distfiles="https://github.com/falkTX/Cadence/archive/v${version}.tar.gz"
-checksum=e530787ded0d53a3004c7a8260114ddb970c2aea43875d62eccd599ac96e1fd1
+checksum=a07fe845e55c1785d3e1a091b77efd3bb01a88648bd11215461f9fa6a797ae87
+python_version=3
post_extract() {
case "$XBPS_TARGET_MACHINE" in
From 5cdc8db4585a6f001d4c303e90c00558ec721528 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 May 2022 19:00:20 +0300
Subject: [PATCH 050/608] pasystray: update to 0.8.0.
---
srcpkgs/pasystray/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pasystray/template b/srcpkgs/pasystray/template
index fc553ddc05fe..1343c482c7df 100644
--- a/srcpkgs/pasystray/template
+++ b/srcpkgs/pasystray/template
@@ -1,8 +1,7 @@
# Template file for 'pasystray'
pkgname=pasystray
-version=0.7.1
-revision=2
-wrksrc="${pkgname}-${pkgname}-${version}"
+version=0.8.0
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool automake"
makedepends="gtk+3-devel pulseaudio-devel libnotify-devel"
@@ -10,8 +9,8 @@ short_desc="PulseAudio System Tray"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/christophgysin/pasystray"
-distfiles="${homepage}/archive/${pkgname}-${version}.tar.gz"
-checksum=efa5e762c7a60e1017474b87fec78d55cc0420dba3dae7f04f74b64160bd56a6
+distfiles="https://github.com/christophgysin/pasystray/archive/refs/tags/${version}.tar.gz"
+checksum=98624a709c1195a5c2a22a65ffde5e55702bb6999aba7aca8c78dd459a884fdf
pre_configure() {
autoreconf -fi
From 394baac3a8eb69bcb9840bb0ff5182cc7b61cee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 25 Jun 2022 10:59:47 +0700
Subject: [PATCH 051/608] zulucrypt-gui: libcryptsetup always present
Fix: #37633
---
.../patches/20-disable-auto-update.patch | 4 ++--
.../{fix-cflags.patch => 30-fix-cflags.patch} | 4 ----
...40-libcryptsetup-is-always-available.patch | 24 +++++++++++++++++++
srcpkgs/zulucrypt/template | 2 +-
4 files changed, 27 insertions(+), 7 deletions(-)
rename srcpkgs/zulucrypt/patches/{fix-cflags.patch => 30-fix-cflags.patch} (76%)
create mode 100644 srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch
diff --git a/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch b/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch
index f02fa84bb02f..b944c8898600 100644
--- a/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch
+++ b/srcpkgs/zulucrypt/patches/20-disable-auto-update.patch
@@ -2,7 +2,7 @@
--- a/zuluCrypt-gui/zulucrypt.ui
+++ b/zuluCrypt-gui/zulucrypt.ui
-@@ -493,6 +493,9 @@
+@@ -501,6 +501,9 @@
</property>
</action>
<action name="actionCheck_For_Update">
@@ -10,5 +10,5 @@
+ <bool>false</bool>
+ </property>
<property name="text">
- <string>Check For Update</string>
+ <string>C&heck For Update</string>
</property>
diff --git a/srcpkgs/zulucrypt/patches/fix-cflags.patch b/srcpkgs/zulucrypt/patches/30-fix-cflags.patch
similarity index 76%
rename from srcpkgs/zulucrypt/patches/fix-cflags.patch
rename to srcpkgs/zulucrypt/patches/30-fix-cflags.patch
index 665bdf62d558..4629bf4417d2 100644
--- a/srcpkgs/zulucrypt/patches/fix-cflags.patch
+++ b/srcpkgs/zulucrypt/patches/30-fix-cflags.patch
@@ -1,5 +1,3 @@
-Index: external_libraries/tcplay/CMakeLists.txt
-===================================================================
--- a/external_libraries/tcplay/CMakeLists.txt
+++ b/external_libraries/tcplay/CMakeLists.txt
@@ -13,7 +13,7 @@ set (SRCS_LINUX crypto-gcrypt.c)
@@ -11,8 +9,6 @@ Index: external_libraries/tcplay/CMakeLists.txt
set (CFLAGS_VER "-DMAJ_VER=${VERSION_MAJOR} -DMIN_VER=${VERSION_MINOR}")
set (CFLAGS_COMMON "-std=c99 -fPIC ${CFLAGS_LINUX} ${CFLAGS_WARN} ${CFLAGS_VER}")
if ($ENV{DEBUG})
-Index: external_libraries/tcplay/Makefile.classic
-===================================================================
--- a/external_libraries/tcplay/Makefile.classic
+++ b/external_libraries/tcplay/Makefile.classic
@@ -47,8 +47,6 @@ COMMON_CFLAGS= $(WARNFLAGS) -fPIC $(VER_
diff --git a/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch b/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch
new file mode 100644
index 000000000000..5f7412d921d7
--- /dev/null
+++ b/srcpkgs/zulucrypt/patches/40-libcryptsetup-is-always-available.patch
@@ -0,0 +1,24 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,7 +152,7 @@ else( NOT CRYPTSETUP_FOUND )
+
+ get_filename_component(libcrypsetupFullPath ${cryptsetup_lib} REALPATH)
+ MESSAGE( STATUS "commiting to cryptsetup library path of: ${libcrypsetupFullPath}" )
+- file( WRITE ${PROJECT_BINARY_DIR}/cryptsetup_library_path.h "\n#define CRYPTSETUP_LIBRARY_PATH \"${libcrypsetupFullPath}\"" )
++ file( WRITE ${PROJECT_BINARY_DIR}/cryptsetup_library_path.h "\n" )
+
+ endif( NOT CRYPTSETUP_FOUND )
+
+--- a/zuluCrypt-gui/utility.cpp
++++ b/zuluCrypt-gui/utility.cpp
+@@ -3174,5 +3174,9 @@ bool utility::canShowKeySlotProperties()
+
+ bool utility::libCryptSetupLibraryNotFound()
+ {
+- return !utility::pathExists( CRYPTSETUP_LIBRARY_PATH ) ;
++ /*
++ * always present in Void Linux because
++ * zulucrypt-gui depends on zulucrypt which depends on libcryptsetup
++ */
++ return false;
+ }
diff --git a/srcpkgs/zulucrypt/template b/srcpkgs/zulucrypt/template
index cc596dc63dc2..a314ddd38e48 100644
--- a/srcpkgs/zulucrypt/template
+++ b/srcpkgs/zulucrypt/template
@@ -1,7 +1,7 @@
# Template file for 'zulucrypt'
pkgname=zulucrypt
version=6.0.0
-revision=1
+revision=2
wrksrc="zuluCrypt-${version}"
build_style=cmake
configure_args="-DINTERNAL_ZULUPLAY=true -DQT5=true
From dd2c5560f96e4db0db8be6344670d9aa48503624 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 07:11:09 +0200
Subject: [PATCH 052/608] vkd3d: remove package
It was only used for wine and is now bundled with it
---
srcpkgs/vkd3d-devel | 1 -
srcpkgs/vkd3d/template | 24 ------------------------
2 files changed, 25 deletions(-)
delete mode 120000 srcpkgs/vkd3d-devel
delete mode 100644 srcpkgs/vkd3d/template
diff --git a/srcpkgs/vkd3d-devel b/srcpkgs/vkd3d-devel
deleted file mode 120000
index 7dbdf667c5c4..000000000000
--- a/srcpkgs/vkd3d-devel
+++ /dev/null
@@ -1 +0,0 @@
-vkd3d
\ No newline at end of file
diff --git a/srcpkgs/vkd3d/template b/srcpkgs/vkd3d/template
deleted file mode 100644
index c1d1e7f4e436..000000000000
--- a/srcpkgs/vkd3d/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'vkd3d'
-pkgname=vkd3d
-version=1.3
-revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config flex"
-makedepends="Vulkan-Headers SPIRV-Headers vulkan-loader"
-short_desc="Direct3D 12 to Vulkan translation library"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="LGPL-2.1-or-later"
-homepage="https://www.winehq.org"
-distfiles="https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"
-checksum=134b347806d34a4d2b39ea29ff1c2b38443793803a3adc50800855bb929fb8b2
-
-vkd3d-devel_package() {
- short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove "usr/lib/*.a"
- }
-}
From 36d2e081fea80ab7bee0d5561476216cf8faaa19 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 07:14:25 +0200
Subject: [PATCH 053/608] shlibs: remove vkd3d
---
common/shlibs | 3 ---
1 file changed, 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 93c350e14ac0..8231f48d36a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3592,9 +3592,6 @@ libuhd.so.4.0.0 uhd-4.0.0.0_1
libeditline.so.1 editline-1.16.0_1
libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
-libvkd3d-utils.so.1 vkd3d-1.1_1
-libvkd3d-shader.so.1 vkd3d-1.3_1
-libvkd3d.so.1 vkd3d-1.1_1
libgamemode.so.0 libgamemode-1.6.1_1
libgamemodeauto.so.0 libgamemode-1.6.1_1
libgaminggear.so.0 libgaminggear-0.15.1_1
From e82898ff2f3df0a4571c2eefb1853a447f8e2e38 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 07:14:40 +0200
Subject: [PATCH 054/608] removed-packages: add vkd3d
---
srcpkgs/removed-packages/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a6d94cc051d6..f8cb33ef4098 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=69
+revision=70
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -420,6 +420,7 @@ replaces="
zuluplay-devel<=1.1_1
zuluplay<=1.1_1
bgc<=1.0.1_1
+ vkd3d<=1.3_1
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From b28caf23d510c8b6eb6d1f2f7d4a2457ec400de2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 07:21:16 +0200
Subject: [PATCH 055/608] linux5.4: update to 5.4.200.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 701eaefe8da3..c0f59b5ea1c0 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.199
+version=5.4.200
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=484c09f387656ddb6a1174c7ae6a1df81c02daba831911ad9240aa9582c16c58
+checksum=eae97c9bbf0228bef165be60283ec42cfc9531cea5c641aa3ba131f2125525b8
python_version=3
nodebug=yes # -dbg package is generated below manually
From 2a8660ce8a4aa5bd57081cafe5c2d7724f67333c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 25 Jun 2022 00:47:10 +0530
Subject: [PATCH 056/608] papis: update to 0.12.
---
srcpkgs/papis/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index c97d9c49ddcb..f693def810ea 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,22 +1,26 @@
# Template file for 'papis'
pkgname=papis
-version=0.11.1
-revision=2
+version=0.12
+revision=1
build_style=python3-module
+make_check_args="--deselect=tests/downloaders/test_project_euclid.py::test_1"
+make_check_target="papis tests"
hostmakedepends="python3-setuptools"
depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4
python3-colorama python3-click python3-slugify python3-prompt_toolkit
python3-tqdm python3-Pygments python3-stevedore python3-parsing
python3-filetype python3-bibtexparser python3-habanero python3-arxiv2bib
- python3-isbnlib python3 python3-setuptools python3-lxml
- python3-typing_extensions python3-doi"
+ python3-isbnlib python3-lxml python3-doi python3-Whoosh"
+checkdepends="${depends} python3-pytest-cov"
short_desc="Command-line based document and bibliography manager"
maintainer="xaltsc <xaltsc@protonmail.ch>"
license="GPL-3.0-or-later"
homepage="https://github.com/papis/papis"
+changelog="https://github.com/papis/papis/blob/master/CHANGELOG.md"
distfiles="https://github.com/papis/papis/archive/v${version}.tar.gz"
-checksum=8ebb2f6f50e2e92e16a37ffc1a054983f6b50c6a56d3629d9f612f4197d7a7da
+checksum=75a91f827927a79ac648fbd810aacb1d2a0ba475f69f2f61c421c8b1dbf10cc9
-pre_build() {
- sed -i '/configparser/d' setup.py
+pre_check() {
+ # Required to generate egg_info so that tests can use entry points
+ python3 setup.py egg_info
}
From 500fa577525183e001c50ef0c947d6ea855fce73 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 25 Jun 2022 12:32:03 +0200
Subject: [PATCH 057/608] digikam: update to 7.7.0.
---
srcpkgs/digikam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template
index 54e0216a11f0..1a08760e0f56 100644
--- a/srcpkgs/digikam/template
+++ b/srcpkgs/digikam/template
@@ -1,6 +1,6 @@
# Template file for 'digikam'
pkgname=digikam
-version=7.6.0
+version=7.7.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -21,7 +21,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.digikam.org"
distfiles="${KDE_SITE}/digikam/${version}/digiKam-${version}.tar.xz"
-checksum=d8e1ee7321d3fc313916f515756e3029ac4187dc453b6933848d4de5314b6641
+checksum=c0c6dd2ea8a07514acbf2462f3a54518e7e8099b3337f881336168cff63d771c
CXXFLAGS="-Wl,-lpthread"
From 6bbe30c9cc81247d835ad2916824fa6696fc95aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:08:50 +0200
Subject: [PATCH 058/608] netpbm: update to 10.99.00.
---
srcpkgs/netpbm/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 91c85332c50a..d3b12e78ea92 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
# Template file for 'netpbm'
pkgname=netpbm
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.98.02
+version=10.99.00
revision=1
-_githash=5991a720c260e171c145d035014609f18cb2eaf3
-_githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
+_githash=5bcb369386d617631627a4fb086ff6ab80ffa157
+_githash_guide=7539a285f1cb2b7ed65f79b51cd24e1287cea478
create_wrksrc=yes
build_wrksrc="netpbm-mirror-${_githash}"
hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
homepage="http://netpbm.sourceforge.net/"
distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="7ed7fdfc8cae0a11f15ace63715296917a4a1f61017c06f3d09ead2d39d83320
- 30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
+checksum="47a12475e5ced6ca305e53ec8f0e8e12795309b04ff9e636e24462c9e538ae0f
+ c8eca14c896a9cc2b786445cdaee106dc829c22ceb71219ad471020372ae3704"
post_extract() {
cd $build_wrksrc
From 4f916df07d8c4ea6d1458c707bcb0574495ef98d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:12:55 +0200
Subject: [PATCH 059/608] python3-ropgadget: update to 6.8.
---
srcpkgs/python3-ropgadget/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template
index df108c7351ab..9d32b853ddf3 100644
--- a/srcpkgs/python3-ropgadget/template
+++ b/srcpkgs/python3-ropgadget/template
@@ -1,15 +1,16 @@
# Template file for 'python3-ropgadget'
pkgname=python3-ropgadget
-version=6.7
+version=6.8
revision=1
wrksrc="ROPGadget-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
depends="capstone-python3 python3"
+checkdepends="python3-wheel python3-pip"
short_desc="Search gadgets in binaries to facilitate ROP exploitation"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/JonathanSalwan/ROPgadget"
distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz"
-checksum=a048f2e51c397b902e4586997bd4fe62af97984e207567cb63e67d86e8e09c8e
+checksum=8ce1164d64cb524e07bb67b8e03e57eea1535432b712de9b7efc98829de8ea05
From 3d59a4e643627ad6d781622e95e1dfe4cd9579ce Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 25 Jun 2022 11:57:04 +0530
Subject: [PATCH 060/608] black: update to 22.3.0.
---
srcpkgs/black/template | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index b17749777fb0..c197da7cc670 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,30 +1,28 @@
# Template file for 'black'
pkgname=black
-version=21.9b0
-revision=2
+version=22.3.0
+revision=1
build_style=python3-module
-# Disable tests that require `black` in the search path for commands.
-make_check_args="--deselect tests/test_primer.py::PrimerLibTests::test_gen_check_output
- --deselect tests/test_primer.py::PrimerLibTests::test_process_queue
- --deselect tests/test_primer.py::PrimerCLITests::test_async_main"
hostmakedepends="python3-setuptools python3-setuptools_scm"
-depends="python3-click python3-platformdirs python3-tomli
- python3-mypy_extensions python3-pathspec python3-regex
- python3-typing_extensions"
-checkdepends="python3-typed-ast python3-aiohttp python3-aiohttp-cors
- python3-pytest python3-parameterized python3-ipython python3-tokenize-rt
- $depends"
+depends="python3-click python3-platformdirs python3-tomli python3-pathspec python3-mypy_extensions"
+checkdepends="${depends} python3-pytest-xdist python3-aiohttp python3-colorama python3-uvloop
+ python3-ipython python3-tokenize-rt"
short_desc="Uncompromising Python code formatter"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/psf/black"
changelog="https://raw.githubusercontent.com/psf/black/main/CHANGES.md"
distfiles="${PYPI_SITE}/b/black/black-${version}.tar.gz"
-checksum=7de4cfc7eb6b710de325712d40125689101d21d25283eed7e9998722cf10eb91
+checksum=35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79
-pre_build() {
- # <https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-python/black/black-21.8_beta0.ebuild#n45>.
- vsed -i '/setuptools_scm/s:~=:>=:' setup.cfg
+do_check() {
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional jupyter \
+ -m jupyter --deselect=tests/test_ipynb.py::test_set_input
+
+ pyver=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+ mv ${XBPS_MASTERDIR}/usr/lib/python${pyver}/site-packages/IPython ${XBPS_MASTERDIR}/tmp/IPython.bak
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional no_jupyter
+ mv ${XBPS_MASTERDIR}/tmp/IPython.bak ${XBPS_MASTERDIR}/usr/lib/python${pyver}/site-packages/IPython
}
post_install() {
From b46af7e7b8f119258ddadec7676aa83a75afa52c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:18:56 +0200
Subject: [PATCH 061/608] linux5.18: update to 5.18.7.
---
srcpkgs/linux5.18/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index 44b7162ebc70..be6582401d64 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.18'
pkgname=linux5.18
-version=5.18.4
+version=5.18.7
revision=1
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee
- 63b32158ca369f104a80543b9b8e553c761c49f93da40eae91c8675af01b560b"
+ 783de8b66193fd9bd2acabad8fdc7a14ac74aca35b7e606b10ac94ced77b430e"
skip_extraction="patch-${version}.xz"
python_version=3
From 8edd0e5402e9f54068d126a9a84637f4299e5ee2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:21:58 +0200
Subject: [PATCH 062/608] linux5.15: update to 5.15.50.
---
srcpkgs/linux5.15/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a3d4cc99dbd2..a54741bf8478 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.15'
pkgname=linux5.15
-version=5.15.47
+version=5.15.50
revision=1
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 1a9a61db4b613190278cc1a4ba77bd597feaae8c4276e0c6103fcacc78b09c5a"
+ 16bfe772c0ac272bc4b5be68b3e1aead51eebdab2d61b360a0d18126f52c50a8"
skip_extraction="patch-${version}.xz"
python_version=3
From 5a37b288b32983efd05215b0bcdc2c0989d6bc8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 25 Jun 2022 17:23:07 +0200
Subject: [PATCH 063/608] linux5.10: update to 5.10.125.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 144424658757..781879543adc 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.122
+version=5.10.125
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=920bb3110a881b132a8960db8311689dec3c984634d3d93bbaa4b57047740f40
+checksum=b9356ea02532c063f0b19a82e67c2afbd7c5460184fce7011222cf8667568f60
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From aae8b2f1466eee90ecee431e09f3ed69f465f829 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 14:28:06 +0300
Subject: [PATCH 064/608] New package: font-awesome6-6.1.1
---
srcpkgs/font-awesome6/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/font-awesome6/template
diff --git a/srcpkgs/font-awesome6/template b/srcpkgs/font-awesome6/template
new file mode 100644
index 000000000000..d004b2b31579
--- /dev/null
+++ b/srcpkgs/font-awesome6/template
@@ -0,0 +1,18 @@
+# Template file for 'font-awesome6'
+pkgname=font-awesome6
+version=6.1.1
+revision=1
+wrksrc="fontawesome-free-${version}-desktop"
+hostmakedepends="font-util"
+short_desc="Iconic SVG, font, and CSS toolkit - desktop fonts"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="OFL-1.1"
+homepage="https://fontawesome.com/"
+changelog="https://fontawesome.com/docs/changelog/"
+distfiles="https://github.com/FortAwesome/Font-Awesome/releases/download/${version}/fontawesome-free-${version}-desktop.zip"
+checksum=73366012c82155f4ba78e842d15f5e49597bb21320d85c63ea984d788791b267
+font_dirs="/usr/share/fonts/OTF"
+
+do_install() {
+ install -Dm644 otfs/*.otf -t ${DESTDIR}/usr/share/fonts/OTF
+}
From 49d87a25cff01283478183e070486bd0ed8e808f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 6 Jun 2022 21:51:25 +0300
Subject: [PATCH 065/608] font-awesome5: remove conflict with font-awesome.
- suggested by @classabbyamp
---
srcpkgs/font-awesome5/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..638813c8450b 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,7 +1,7 @@
# Template file for 'font-awesome5'
pkgname=font-awesome5
version=5.15.4
-revision=1
+revision=2
wrksrc="Font-Awesome-${version}"
depends="font-util"
short_desc="Iconic font (version 5)"
@@ -11,7 +11,6 @@ homepage="https://fontawesome.com"
changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
-conflicts="font-awesome>=0"
font_dirs="/usr/share/fonts/OTF"
do_install() {
From 8192721f72e3c1aa40a579973eb109a93d05f64d Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Sun, 13 Mar 2022 23:28:29 +0100
Subject: [PATCH 066/608] New package: bkt-0.5.3
---
srcpkgs/bkt/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/bkt/template
diff --git a/srcpkgs/bkt/template b/srcpkgs/bkt/template
new file mode 100644
index 000000000000..3906e3e849bb
--- /dev/null
+++ b/srcpkgs/bkt/template
@@ -0,0 +1,18 @@
+# Template file for 'bkt'
+pkgname=bkt
+version=0.5.4
+revision=1
+build_style=cargo
+# disable flaky test: https://github.com/dimo414/bkt/issues/14
+make_check_args=" -- --skip cli::discard_failures_in_background"
+short_desc="Subprocess caching utility"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://www.bkt.rs/"
+distfiles="https://github.com/dimo414/bkt/archive/${version}.tar.gz"
+checksum=172c413709dc81ced9dfa2750aaa398864e904d1ed213bd19e51d45d1ff0a8ff
+
+post_install() {
+ vlicense LICENSE
+ vdoc README.md
+}
From c4c9ca704961da4059ec45dc10083d5d61e8c2e9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jun 2022 23:49:56 +0200
Subject: [PATCH 067/608] broot: broken on big endian
---
srcpkgs/broot/template | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index b3e5f71efe15..d57eb2f7b588 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -11,6 +11,10 @@ changelog="https://raw.githubusercontent.com/Canop/broot/master/CHANGELOG.md"
distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
checksum=a7f9e98ff1371eff065a8dabbe9e31ef42d264b7d93c18f920d6a5399016da33
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+ broken="exr crate errors on big endian"
+fi
+
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*|mips*) broken="unresolved import 'std::sync::atomic::AtomicU64'";;
From 8b1b30d9d906dec419443cf5a255fe059084de6f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 22 Jun 2022 20:08:38 +0200
Subject: [PATCH 068/608] chromium: update to 103.0.5060.53.
---
.../files/musl-patches/musl-tid-caching.patch | 81 ++++++++
.../musl-patches/quiche-arena-size.patch | 11 +
srcpkgs/chromium/patches/9d080c0.patch | 196 ------------------
srcpkgs/chromium/patches/9d080c0.patch.args | 1 -
...omium-102-fenced_frame_utils-include.patch | 25 ---
.../chromium-102-regex_pattern-array.patch | 14 --
.../patches/chromium-libxml-unbundle.patch | 10 -
srcpkgs/chromium/patches/sndio.patch | 6 +-
.../chromium/patches/xxx-ppc64le-libvpx.patch | 71 ++-----
.../patches/xxx-ppc64le-support.patch | 118 -----------
srcpkgs/chromium/template | 4 +-
11 files changed, 113 insertions(+), 424 deletions(-)
create mode 100644 srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
create mode 100644 srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
diff --git a/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
new file mode 100644
index 000000000000..cec0ffd551f3
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
@@ -0,0 +1,81 @@
+--- ./sandbox/linux/services/namespace_sandbox.cc.orig
++++ ./sandbox/linux/services/namespace_sandbox.cc
+@@ -209,6 +209,70 @@
+ return base::LaunchProcess(argv, launch_options_copy);
+ }
+
++#if defined(__aarch64__) || defined(__arm__) || defined(__powerpc__)
++#define TLS_ABOVE_TP
++#endif
++
++struct musl_pthread
++{
++ /* Part 1 -- these fields may be external or
++ * internal (accessed via asm) ABI. Do not change. */
++ struct pthread *self;
++#ifndef TLS_ABOVE_TP
++ uintptr_t *dtv;
++#endif
++ struct pthread *prev, *next; /* non-ABI */
++ uintptr_t sysinfo;
++#ifndef TLS_ABOVE_TP
++#ifdef CANARY_PAD
++ uintptr_t canary_pad;
++#endif
++ uintptr_t canary;
++#endif
++
++/* Part 2 -- implementation details, non-ABI. */
++ int tid;
++ int errno_val;
++ volatile int detach_state;
++ volatile int cancel;
++ volatile unsigned char canceldisable, cancelasync;
++ unsigned char tsd_used:1;
++ unsigned char dlerror_flag:1;
++ unsigned char *map_base;
++ size_t map_size;
++ void *stack;
++ size_t stack_size;
++ size_t guard_size;
++ void *result;
++ struct __ptcb *cancelbuf;
++ void **tsd;
++ struct {
++ volatile void *volatile head;
++ long off;
++ volatile void *volatile pending;
++ } robust_list;
++ int h_errno_val;
++ volatile int timer_id;
++ locale_t locale;
++ volatile int killlock[1];
++ char *dlerror_buf;
++ void *stdio_locks;
++
++ /* Part 3 -- the positions of these fields relative to
++ * the end of the structure is external and internal ABI. */
++#ifdef TLS_ABOVE_TP
++ uintptr_t canary;
++ uintptr_t *dtv;
++#endif
++};
++
++void MaybeUpdateMuslTidCache()
++{
++ pid_t real_tid = sys_gettid();
++ pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
++ *cached_tid_location = real_tid;
++}
++
+ // static
+ pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
+ const pid_t pid =
+@@ -226,6 +290,7 @@
+ #if defined(LIBC_GLIBC)
+ MaybeUpdateGlibcTidCache();
+ #endif
++ MaybeUpdateMuslTidCache();
+ return 0;
+ }
+
diff --git a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
new file mode 100644
index 000000000000..1c9182dbc810
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
@@ -0,0 +1,11 @@
+--- ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
++++ ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
+@@ -69,7 +69,7 @@
+
+ // QuicConnections currently use around 1KB of polymorphic types which would
+ // ordinarily be on the heap. Instead, store them inline in an arena.
+-using QuicConnectionArena = QuicOneBlockArena<1248>;
++using QuicConnectionArena = QuicOneBlockArena<1504>;
+
+ } // namespace quic
+
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
deleted file mode 100644
index 885ab5a1b82a..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
-From: Dylan Cutler <dylancutler@google.com>
-Date: Wed, 26 May 2021 16:39:52 +0000
-Subject: [PATCH] Reland "Replace 'blacklist' with 'ignorelist' in
- ./tools/msan/."
-
-This is a reland of 3b6263f2eece1264b052dfdcbc03b851d5abfb48
-
-Relanding now that https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2897974 is merged
-
-Original change's description:
-> Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
->
-> Bug: 1097272, 1097268
-> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
-> Commit-Queue: Dylan Cutler <dylancutler@google.com>
-> Reviewed-by: Nico Weber <thakis@chromium.org>
-> Reviewed-by: Jonathan Metzman <metzman@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#883035}
-
-Bug: 1097272
-Bug: 1097268
-Change-Id: I11a5bc8972680c95fb1dab95ed3b707ed76f4667
-Cq-Include-Trybots: luci.chromium.try:chromeos-amd64-generic-cfi-thin-lto-rel
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911096
-Commit-Queue: Dylan Cutler <dylancutler@google.com>
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#886773}
----
- build/config/sanitizers/BUILD.gn | 44 ++++++++++----------
- build_overrides/build.gni | 14 +++----
- tools/msan/{blacklist.txt => ignorelist.txt} | 0
- 3 files changed, 29 insertions(+), 29 deletions(-)
- rename tools/msan/{blacklist.txt => ignorelist.txt} (100%)
-
-diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn
-index aaaad023474d1..55b388a437439 100644
---- a/build/config/sanitizers/BUILD.gn
-+++ b/build/config/sanitizers/BUILD.gn
-@@ -272,11 +272,11 @@ config("asan_flags") {
- if (is_asan) {
- cflags += [ "-fsanitize=address" ]
- if (is_win) {
-- if (!defined(asan_win_blacklist_path)) {
-- asan_win_blacklist_path =
-+ if (!defined(asan_win_blocklist_path)) {
-+ asan_win_blocklist_path =
- rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
- }
-- cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
-+ cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
- }
- }
- }
-@@ -306,13 +306,13 @@ config("link_shared_library") {
- config("cfi_flags") {
- cflags = []
- if (is_cfi && current_toolchain == default_toolchain) {
-- if (!defined(cfi_blacklist_path)) {
-- cfi_blacklist_path =
-+ if (!defined(cfi_ignorelist_path)) {
-+ cfi_ignorelist_path =
- rebase_path("//tools/cfi/ignores.txt", root_build_dir)
- }
- cflags += [
- "-fsanitize=cfi-vcall",
-- "-fsanitize-blacklist=$cfi_blacklist_path",
-+ "-fsanitize-ignorelist=$cfi_ignorelist_path",
- ]
-
- if (use_cfi_cast) {
-@@ -409,14 +409,14 @@ config("msan_flags") {
- if (is_msan) {
- assert(is_linux || is_chromeos,
- "msan only supported on linux x86_64/ChromeOS")
-- if (!defined(msan_blacklist_path)) {
-- msan_blacklist_path =
-- rebase_path("//tools/msan/blacklist.txt", root_build_dir)
-+ if (!defined(msan_ignorelist_path)) {
-+ msan_ignorelist_path =
-+ rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
- }
- cflags = [
- "-fsanitize=memory",
- "-fsanitize-memory-track-origins=$msan_track_origins",
-- "-fsanitize-blacklist=$msan_blacklist_path",
-+ "-fsanitize-ignorelist=$msan_ignorelist_path",
- ]
- }
- }
-@@ -424,13 +424,13 @@ config("msan_flags") {
- config("tsan_flags") {
- if (is_tsan) {
- assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
-- if (!defined(tsan_blacklist_path)) {
-- tsan_blacklist_path =
-+ if (!defined(tsan_ignorelist_path)) {
-+ tsan_ignorelist_path =
- rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
- }
- cflags = [
- "-fsanitize=thread",
-- "-fsanitize-blacklist=$tsan_blacklist_path",
-+ "-fsanitize-ignorelist=$tsan_ignorelist_path",
- ]
- }
- }
-@@ -438,8 +438,8 @@ config("tsan_flags") {
- config("ubsan_flags") {
- cflags = []
- if (is_ubsan) {
-- if (!defined(ubsan_blacklist_path)) {
-- ubsan_blacklist_path =
-+ if (!defined(ubsan_ignorelist_path)) {
-+ ubsan_ignorelist_path =
- rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
- }
- cflags += [
-@@ -456,7 +456,7 @@ config("ubsan_flags") {
- "-fsanitize=signed-integer-overflow",
- "-fsanitize=unreachable",
- "-fsanitize=vla-bound",
-- "-fsanitize-blacklist=$ubsan_blacklist_path",
-+ "-fsanitize-ignorelist=$ubsan_ignorelist_path",
- ]
-
- # Chromecast ubsan builds fail to compile with these
-@@ -486,8 +486,8 @@ config("ubsan_no_recover") {
-
- config("ubsan_security_flags") {
- if (is_ubsan_security) {
-- if (!defined(ubsan_security_blacklist_path)) {
-- ubsan_security_blacklist_path =
-+ if (!defined(ubsan_security_ignorelist_path)) {
-+ ubsan_security_ignorelist_path =
- rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
- }
- cflags = [
-@@ -495,7 +495,7 @@ config("ubsan_security_flags") {
- "-fsanitize=shift",
- "-fsanitize=signed-integer-overflow",
- "-fsanitize=vla-bound",
-- "-fsanitize-blacklist=$ubsan_security_blacklist_path",
-+ "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
- ]
- }
- }
-@@ -508,13 +508,13 @@ config("ubsan_null_flags") {
-
- config("ubsan_vptr_flags") {
- if (is_ubsan_vptr) {
-- if (!defined(ubsan_vptr_blacklist_path)) {
-- ubsan_vptr_blacklist_path =
-+ if (!defined(ubsan_vptr_ignorelist_path)) {
-+ ubsan_vptr_ignorelist_path =
- rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
- }
- cflags = [
- "-fsanitize=vptr",
-- "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
-+ "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
- ]
- }
- }
-diff --git a/build_overrides/build.gni b/build_overrides/build.gni
-index 82627b03653f1..f3e563ab701bf 100644
---- a/build_overrides/build.gni
-+++ b/build_overrides/build.gni
-@@ -42,15 +42,15 @@ declare_args() {
- # Allows different projects to specify their own suppression/ignore lists for
- # sanitizer tools.
- # asan_suppressions_file = "path/to/asan_suppressions.cc"
--# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
-+# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
- # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
- # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
--# tsan_blacklist_path = "path/to/tsan/ignores.txt"
--# msan_blacklist_path = "path/to/msan/blacklist.txt"
--# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
--# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
--# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
--# cfi_blacklist_path = "path/to/cfi/ignores.txt"
-+# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
-+# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
-+# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
-+# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
-+# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
-+# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
-
- declare_args() {
- # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
-diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt
-similarity index 100%
-rename from tools/msan/blacklist.txt
-rename to tools/msan/ignorelist.txt
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
deleted file mode 100644
index 8bbbbe948363..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch b/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
deleted file mode 100644
index 61f904bad6a4..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 Apr 2022 16:01:01 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
-
----
- third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-index 9e2d3ad..68f4823 100644
---- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-@@ -4,6 +4,8 @@
-
- #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
-
-+#include <cstring>
-+
- #include "base/guid.h"
- #include "base/strings/string_util.h"
-
---
-2.35.1
-
diff --git a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch b/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
deleted file mode 100644
index 18058b1faa45..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/components/autofill/core/browser/BUILD.gn
-+++ b/components/autofill/core/browser/BUILD.gn
-@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
- }
-
- static_library("browser") {
-+ if (is_clang) {
-+ cflags = [
-+ "-fbracket-depth=1000",
-+ ]
-+ }
- sources = [
- "address_normalization_manager.cc",
- "address_normalization_manager.h",
diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
deleted file mode 100644
index 5699bc8f8eaf..000000000000
--- a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
- ":xml_reader",
- ":xml_writer",
- "//base/test:test_support",
-+ "//services/data_decoder:lib",
- "//services/data_decoder:xml_parser_fuzzer_deps",
- ]
- sources = [
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index bac8a63bc24f..df668d13b2a3 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -865,13 +865,13 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-
diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
--- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200
+++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200
-@@ -119,6 +119,9 @@
+@@ -125,6 +125,9 @@
# Enables runtime selection of ALSA library for audio.
use_alsa = false
+ # Enable runtime selection of sndio(7)
+ use_sndio = false
+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+ # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS
+ # video builds).
if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
index 6d423d4091c5..05384cd360ba 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
@@ -1,72 +1,33 @@
-Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
-and add --enable-vsx, and change generic to ppc for the rtcd header.
+commit 981437bc846fcdb854062e89fd3d86f112e5f426
+Author: q66 <daniel@octaforge.org>
+Date: Sat Jun 25 12:35:37 2022 +0200
-From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Sep 2020 19:08:25 +0200
-Subject: [PATCH] enable generation of ppc64 libvpx bits
+ Use generic target for now.
+
+ This is because the source tree is missing vsx optimizations that
+ then do not get included and result in failed linking such as:
+
+ ld.lld: error: undefined symbol: vpx_mse16x16_vsx
-this doesn't update the gni file, that's done from
-the template by running the appropriate scripts
----
- third_party/libvpx/BUILD.gn | 4 ++++
- third_party/libvpx/generate_gni.sh | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
-index 7198e59..3300485 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -336,6 +336,8 @@ static_library("libvpx") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_ppc64
- }
-
- configs -= [ "//build/config/compiler:chromium_code" ]
-diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
-index bcf84b0..8a3f4f1 100755
+diff --git a/third_party/libvpx/generate_gni.sh b/third_party/libvpx/generate_gni.sh
+index 7429080..43ee29a 100755
--- a/third_party/libvpx/generate_gni.sh
+++ b/third_party/libvpx/generate_gni.sh
-@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
+@@ -374,7 +374,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
-+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+-gen_config_files linux/ppc64 "--target=ppc64le-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu ${all_platforms}"
gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
-@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd
- lint_config linux/arm64-highbd
- lint_config linux/mipsel
- lint_config linux/mips64el
-+lint_config linux/ppc64
- lint_config linux/generic
- lint_config win/arm64
- lint_config win/ia32
-@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
+@@ -430,7 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
gen_rtcd_header linux/arm64-highbd armv8
gen_rtcd_header linux/mipsel mipsel
gen_rtcd_header linux/mips64el mips64el
+-gen_rtcd_header linux/ppc64 ppc
+gen_rtcd_header linux/ppc64 generic
gen_rtcd_header linux/generic generic
gen_rtcd_header win/arm64 armv8
gen_rtcd_header win/ia32 x86 "${require_sse2}"
-@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then
-
- echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
-
-+ echo "Generate ppc64 source list."
-+ config=$(print_config_basic linux/ppc64)
-+ make_clean
-+ make libvpx_srcs.txt target=libs $config > /dev/null
-+ convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
-+
- echo "Generate NaCl source list."
- config=$(print_config_basic nacl)
- make_clean
---
-2.28.0
-
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index e626f8130d43..d9a2724e1e22 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3275,58 +3275,6 @@ index 30a2ab21d..60509f21d 100644
#endif
}
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 6b4566fc3..c07f732ad 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -184,6 +184,8 @@ static_library("dav1d_8bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -212,6 +214,8 @@ static_library("dav1d_10bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
- defines = [ "PREFIX" ]
- }
-
-+ cflags = dav1d_copts
-+ }
-+} else if (current_cpu == "ppc64") {
-+ static_library("dav1d_ppc") {
-+ sources = [
-+ "libdav1d/src/ppc/cpu.c",
-+ "libdav1d/src/ppc/cpu.h",
-+ ]
-+
-+ configs -= [ "//build/config/compiler:chromium_code" ]
-+ configs += [
-+ "//build/config/compiler:no_chromium_code",
-+ ":dav1d_config",
-+ ]
-+
- cflags = dav1d_copts
- }
- }
-@@ -292,5 +311,7 @@ static_library("dav1d") {
- }
- } else if (current_cpu == "arm" || current_cpu == "arm64") {
- deps += [ ":dav1d_arm" ]
-+ } else if (current_cpu == "ppc64") {
-+ deps += [ ":dav1d_ppc" ]
- }
- }
diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h
new file mode 100644
index 000000000..9fbbf75cc
@@ -3372,33 +3320,6 @@ index 000000000..9fbbf75cc
+
+#define HAVE_UNISTD_H 1
+
-diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni
-index c59cb0821..3060284a8 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -82,6 +82,11 @@ arm_template_sources = [
- "libdav1d/src/arm/mc_init_tmpl.c",
- ]
-
-+ppc64_template_sources = [
-+ "libdav1d/src/ppc/cdef_init_tmpl.c",
-+ "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
- "libdav1d/src/cdef_apply_tmpl.c",
- "libdav1d/src/cdef_tmpl.c",
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -61,6 +61,8 @@
- _Glob("libdav1d/src/arm/64/*_tmpl.S") + ["libdav1d/src/arm/64/util.S"])
- _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
-
-+ _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
-+
- template_sources = _Glob("libdav1d/src/*_tmpl.c")
- _WriteArray(fd, "template_sources", template_sources)
-
diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
index 0b4bd72f0..a0caa5e71 100644
--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
@@ -3450,17 +3371,6 @@ index 9b065bd..df3af02 100644
} else {
cpu_arch_full = current_cpu
}
-diff --git a/third_party/libgav1/options.gni b/third_party/libgav1/options.gni
-index 11af801..4b13d05 100644
---- a/third_party/libgav1/options.gni
-+++ b/third_party/libgav1/options.gni
-@@ -12,5 +12,5 @@ declare_args() {
- is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
- use_libgav1_parser =
- (is_chromeos || is_linux || is_win) &&
-- (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
-+ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
- }
diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
index e4ac22644..1c57015db 100644
--- a/third_party/lss/linux_syscall_support.h
@@ -3585,34 +3495,6 @@ index 245070d4f..b25164e95 100644
# define SQLITE_BYTEORDER 1234
# elif defined(sparc) || defined(__ppc__) || \
defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-index 4f0c5430c..54ee0829e 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
-
- if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
-- // For ARM and MIPS processors, always use C version.
-- // TODO(hclam): Implement a NEON version.
-- diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = GetCPUInfo(kSSE2) != 0;
- // For x86 processors, check if SSE2 is supported.
- if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- } else {
- diff_proc = &VectorDifference_C;
- }
-+#else
-+ // For other processors, always use C version.
-+ // TODO(hclam): Implement a NEON version.
-+ diff_proc = &VectorDifference_C;
- #endif
- }
-
diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h
index be2367b85..be4ee4233 100644
--- a/third_party/webrtc/rtc_base/system/arch.h
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 1f385fd186df..b546c7f3918f 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=102.0.5005.115
+version=103.0.5060.53
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
+checksum=0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
lib32disabled=yes
From 1ad77aa6d4368d8c443d73c19f01767207643048 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Thu, 23 Jun 2022 22:00:47 -0700
Subject: [PATCH 069/608] python3-pycryptodomex: update to 3.15.0.
---
srcpkgs/python3-pycryptodomex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index c6e0618f9640..622501a2e2ab 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pycryptodomex'
pkgname=python3-pycryptodomex
-version=3.14.1
+version=3.15.0
revision=1
wrksrc="pycryptodomex-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Public Domain, BSD-2-Clause"
homepage="https://www.pycryptodome.org/"
changelog="https://www.pycryptodome.org/en/latest/src/changelog.html"
distfiles="${PYPI_SITE}/p/pycryptodomex/pycryptodomex-${version}.tar.gz"
-checksum=2ce76ed0081fd6ac8c74edc75b9d14eca2064173af79843c24fa62573263c1f2
+checksum=7341f1bb2dadb0d1a0047f34c3a58208a92423cdbd3244d998e4b28df5eac0ed
post_install() {
vlicense LICENSE.rst
From 9202628d4d8d3357771ef1d6ac5f5c0e45d88b46 Mon Sep 17 00:00:00 2001
From: Chloris <chloris@freedommail.ch>
Date: Tue, 21 Jun 2022 17:38:52 +0200
Subject: [PATCH 070/608] New package: hunspell-sl_SI-2020.12.31
---
srcpkgs/hunspell-sl_SI/template | 18 ++++++++++++++++++
srcpkgs/hunspell-sl_SI/update | 1 +
2 files changed, 19 insertions(+)
create mode 100644 srcpkgs/hunspell-sl_SI/template
create mode 100644 srcpkgs/hunspell-sl_SI/update
diff --git a/srcpkgs/hunspell-sl_SI/template b/srcpkgs/hunspell-sl_SI/template
new file mode 100644
index 000000000000..26f2fb319c7e
--- /dev/null
+++ b/srcpkgs/hunspell-sl_SI/template
@@ -0,0 +1,18 @@
+# Template file for 'hunspell-sl_SI'
+pkgname=hunspell-sl_SI
+version=2020.12.31
+revision=1
+create_wrksrc=yes
+hostmakedepends="unzip"
+short_desc="Slovenian dictionary for hunspell"
+maintainer="Chloris <chloris@freedommail.ch>"
+license="MPL-2.0"
+homepage="https://extensions.libreoffice.org/en/extensions/show/slovenian-dictionary-pack"
+distfiles="https://extensions.libreoffice.org/assets/downloads/752/pack-sl.oxt>pack-sl.zip"
+checksum="0183eb7472a7da234be9dab8f89c0eb93b2fdf660b5ff2f80718ab4281189d00"
+
+do_install() {
+ vinstall sl_SI.aff 644 usr/share/hunspell
+ vinstall sl_SI.dic 644 usr/share/hunspell
+ vdoc README_sl_SI.txt
+}
diff --git a/srcpkgs/hunspell-sl_SI/update b/srcpkgs/hunspell-sl_SI/update
new file mode 100644
index 000000000000..2f02bd37cbe7
--- /dev/null
+++ b/srcpkgs/hunspell-sl_SI/update
@@ -0,0 +1 @@
+pattern='<span>\K[\d.]+(?=</span>)'
From 7ba78570f56096ae6f200ddcb08b66b01aa67a8e Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 13:45:48 +0300
Subject: [PATCH 071/608] nerdctl: update to 0.18.0.
---
srcpkgs/nerdctl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index 4c52d4a26b25..b3e47cf76e3e 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,6 +1,6 @@
# Template file for 'nerdctl'
pkgname=nerdctl
-version=0.16.1
+version=0.18.0
revision=1
build_style=go
go_import_path=github.com/containerd/nerdctl
@@ -10,4 +10,4 @@ maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
license="Apache-2.0"
homepage="https://github.com/containerd/nerdctl"
distfiles="https://github.com/containerd/nerdctl/archive/refs/tags/v$version.tar.gz"
-checksum=be19ceed51703a71f847bfff3afcf25e0efd4c012fd8ec1ff02c545d6773989d
+checksum=d6f858d649271b323a42dcf876b1d80f262416aa03236e30ca9d648cd80536bf
From e54ea1c8c6be534a164ebcdfe4a1ab73629c69a0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 3 Jan 2022 09:57:05 +0100
Subject: [PATCH 072/608] atlantis: update to 0.19.2.
---
srcpkgs/atlantis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index 66ff39e0ef15..84512cabbfc4 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,6 +1,6 @@
# Template file for 'atlantis'
pkgname=atlantis
-version=0.17.6
+version=0.19.2
revision=1
build_style=go
go_import_path=github.com/runatlantis/atlantis
@@ -10,4 +10,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
homepage="https://runatlantis.io"
distfiles="https://github.com/runatlantis/atlantis/archive/v${version}.tar.gz"
-checksum=79124d4df5d2d1bfa7ae8367cdb413fd752b6521812154dfafb74d7cab02b73a
+checksum=5c0da4efc288a2cd3f0456619e3048922542a421798ebb834b8800fc4dcf124c
From 7df2959daf59d69083bba93986107da81ba1ddc4 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Thu, 23 Jun 2022 22:15:37 +0100
Subject: [PATCH 073/608] usql: update to 0.10.0.
---
srcpkgs/usql/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index 45687345c30c..943f3c55768b 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,15 +1,16 @@
# Template file for 'usql'
pkgname=usql
-version=0.9.5
+version=0.10.0
revision=1
build_style=go
go_import_path=github.com/xo/usql
+go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"
short_desc="Universal command-line interface for SQL databases"
maintainer="Alan Brown <adbrown@rocketmail.com>"
license="MIT"
homepage="https://github.com/xo/usql"
distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=10de92f1d7d8a85c4c8173296e928f24fc933c733c1a71b5b8e33b832bd95b4d
+checksum=d0f012b0937a5b75f08207efce644b96a49780f1312f20fa9c7ea1f4e662037f
post_install() {
vlicense LICENSE
From 0fe9189d1e96f6ee09d55fcc38424acc40bbcd0a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 26 Jun 2022 08:43:40 +0200
Subject: [PATCH 074/608] linux5.4: update to 5.4.201.
---
srcpkgs/linux5.4/files/arm-dotconfig | 2 +-
srcpkgs/linux5.4/files/arm64-dotconfig | 2 +-
srcpkgs/linux5.4/files/i386-dotconfig | 2 +-
srcpkgs/linux5.4/files/ppc-dotconfig | 2 +-
srcpkgs/linux5.4/files/ppc64-dotconfig | 2 +-
srcpkgs/linux5.4/files/ppc64le-dotconfig | 2 +-
srcpkgs/linux5.4/files/x86_64-dotconfig | 2 +-
srcpkgs/linux5.4/template | 4 ++--
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/linux5.4/files/arm-dotconfig b/srcpkgs/linux5.4/files/arm-dotconfig
index 80ab5329caa4..1ed2792085e7 100644
--- a/srcpkgs/linux5.4/files/arm-dotconfig
+++ b/srcpkgs/linux5.4/files/arm-dotconfig
@@ -3285,7 +3285,7 @@ CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set
# end of Character devices
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 21f6ee83333d..fa817bd05fa2 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -4333,7 +4333,7 @@ CONFIG_XILLYBUS_PCIE=m
CONFIG_XILLYBUS_OF=m
# end of Character devices
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig
index fa6a30fd7091..9ad39afed993 100644
--- a/srcpkgs/linux5.4/files/i386-dotconfig
+++ b/srcpkgs/linux5.4/files/i386-dotconfig
@@ -3911,7 +3911,7 @@ CONFIG_XILLYBUS_PCIE=m
# end of Character devices
# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index 05ea4272d4d2..272515f2ced8 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -3426,7 +3426,7 @@ CONFIG_DEVPORT=y
# end of Character devices
CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/ppc64-dotconfig b/srcpkgs/linux5.4/files/ppc64-dotconfig
index 99d0ad4c1e7d..e5734d6c40b3 100644
--- a/srcpkgs/linux5.4/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64-dotconfig
@@ -4010,7 +4010,7 @@ CONFIG_XILLYBUS_OF=m
# end of Character devices
# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/ppc64le-dotconfig b/srcpkgs/linux5.4/files/ppc64le-dotconfig
index efbb130dc1c1..3fcbaec21dfd 100644
--- a/srcpkgs/linux5.4/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64le-dotconfig
@@ -3846,7 +3846,7 @@ CONFIG_XILLYBUS_OF=m
# end of Character devices
# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig
index 0ecfe841959e..71a859468c44 100644
--- a/srcpkgs/linux5.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.4/files/x86_64-dotconfig
@@ -3984,7 +3984,7 @@ CONFIG_XILLYBUS_PCIE=m
# end of Character devices
# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index c0f59b5ea1c0..538c74794441 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.200
+version=5.4.201
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=eae97c9bbf0228bef165be60283ec42cfc9531cea5c641aa3ba131f2125525b8
+checksum=813dd73120c1f72e69feda9c029902450ebfbac6323fe4cf3c5547a298c36e61
python_version=3
nodebug=yes # -dbg package is generated below manually
From 8742ea35022668ef83cfd6efc2cdeecd26b590fc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 26 Jun 2022 08:59:13 +0200
Subject: [PATCH 075/608] linux4.19: update to 4.19.249.
---
srcpkgs/linux4.19/files/arm-dotconfig | 4 ++--
srcpkgs/linux4.19/files/arm64-dotconfig | 4 ++--
srcpkgs/linux4.19/files/i386-dotconfig | 5 +++--
srcpkgs/linux4.19/files/ppc-dotconfig | 5 +++--
srcpkgs/linux4.19/files/ppc64-dotconfig | 4 +++-
srcpkgs/linux4.19/files/ppc64le-dotconfig | 3 ++-
srcpkgs/linux4.19/files/x86_64-dotconfig | 5 +++--
srcpkgs/linux4.19/template | 4 ++--
8 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/linux4.19/files/arm-dotconfig b/srcpkgs/linux4.19/files/arm-dotconfig
index 3ec21e84f6f0..23c73f8374f5 100644
--- a/srcpkgs/linux4.19/files/arm-dotconfig
+++ b/srcpkgs/linux4.19/files/arm-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.230 Kernel Configuration
+# Linux/arm 4.19.249 Kernel Configuration
#
#
@@ -2768,7 +2768,6 @@ CONFIG_MISDN_W6692=m
# CONFIG_MISDN_NETJET is not set
CONFIG_MISDN_IPAC=m
CONFIG_MISDN_ISAR=m
-# CONFIG_NVM is not set
#
# Input device support
@@ -3094,6 +3093,7 @@ CONFIG_HW_RANDOM_OMAP=m
# CONFIG_TCG_TPM is not set
CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig
index 8268b16af7fc..6a5079c3fcec 100644
--- a/srcpkgs/linux4.19/files/arm64-dotconfig
+++ b/srcpkgs/linux4.19/files/arm64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.236 Kernel Configuration
+# Linux/arm64 4.19.249 Kernel Configuration
#
#
@@ -3177,7 +3177,6 @@ CONFIG_IEEE802154_HWSIM=m
# CONFIG_NETDEVSIM is not set
CONFIG_NET_FAILOVER=m
# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
#
# Input device support
@@ -3605,6 +3604,7 @@ CONFIG_TCG_ATMEL=m
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/i386-dotconfig b/srcpkgs/linux4.19/files/i386-dotconfig
index 4552d18061c8..ed13503b7af5 100644
--- a/srcpkgs/linux4.19/files/i386-dotconfig
+++ b/srcpkgs/linux4.19/files/i386-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.19.241 Kernel Configuration
+# Linux/i386 4.19.249 Kernel Configuration
#
#
@@ -19,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
CONFIG_HAVE_KERNEL_GZIP=y
@@ -3681,6 +3681,7 @@ CONFIG_DEVPORT=y
CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index b5025b4536cf..915a218b0e95 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.241 Kernel Configuration
+# Linux/powerpc 4.19.249 Kernel Configuration
#
#
@@ -2101,6 +2101,7 @@ CONFIG_MACINTOSH_DRIVERS=y
CONFIG_ADB=y
CONFIG_ADB_CUDA=y
CONFIG_ADB_PMU=y
+CONFIG_ADB_PMU_EVENT=y
CONFIG_ADB_PMU_LED=y
# CONFIG_ADB_PMU_LED_DISK is not set
CONFIG_PMAC_APM_EMU=m
@@ -3290,7 +3291,7 @@ CONFIG_IPWIRELESS=m
# CONFIG_TCG_TPM is not set
CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set
-CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig
index ca44b106df42..87827b692bae 100644
--- a/srcpkgs/linux4.19/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.241 Kernel Configuration
+# Linux/powerpc 4.19.249 Kernel Configuration
#
#
@@ -2484,6 +2484,7 @@ CONFIG_FIREWIRE_NET=m
CONFIG_FIREWIRE_NOSY=m
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_ADB_PMU=y
+CONFIG_ADB_PMU_EVENT=y
CONFIG_ADB_PMU_LED=y
CONFIG_ADB_PMU_LED_DISK=y
CONFIG_PMAC_SMU=y
@@ -3791,6 +3792,7 @@ CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
CONFIG_XILLYBUS_OF=m
# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/ppc64le-dotconfig b/srcpkgs/linux4.19/files/ppc64le-dotconfig
index 0c14831463ab..9f61fbb57682 100644
--- a/srcpkgs/linux4.19/files/ppc64le-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.241 Kernel Configuration
+# Linux/powerpc 4.19.249 Kernel Configuration
#
#
@@ -3634,6 +3634,7 @@ CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
CONFIG_XILLYBUS_OF=m
# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/files/x86_64-dotconfig b/srcpkgs/linux4.19/files/x86_64-dotconfig
index 0bcdb8d876cb..d488ad4e7ff3 100644
--- a/srcpkgs/linux4.19/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.19/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.19.241 Kernel Configuration
+# Linux/x86_64 4.19.249 Kernel Configuration
#
#
@@ -19,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
CONFIG_HAVE_KERNEL_GZIP=y
@@ -3750,6 +3750,7 @@ CONFIG_DEVPORT=y
CONFIG_XILLYBUS=m
CONFIG_XILLYBUS_PCIE=m
# CONFIG_RANDOM_TRUST_CPU is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
#
# I2C support
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 56ffecea4c26..29b67f43ea24 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.19'
pkgname=linux4.19
-version=4.19.248
+version=4.19.249
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c40fd171bbe33c996e12303be71773ceaef5e585f372c502a77a046aa6a3ae31
+checksum=ce4bbd420271bb9b6c09842c0d7201c7ba9d136f7025cf0fd7500c95e3f55191
python_version=3
nodebug=yes # -dbg package is generated below manually
From 1d4a41c78d32b3a625d07182f64e3057435958bf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 26 Jun 2022 09:42:16 +0200
Subject: [PATCH 076/608] linux5.4: no longer broken on aarch64*
---
srcpkgs/linux5.4/template | 4 ----
1 file changed, 4 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 538c74794441..cda95ec80d98 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -25,10 +25,6 @@ _kernver="${version}_${revision}"
triggers="kernel-hooks"
kernel_hooks_version="${_kernver}"
-case "$XBPS_TARGET_MACHINE" in
- aarch64*) broken="https://build.voidlinux.org/builders/aarch64_builder/builds/37218/steps/shell_3/logs/stdio";;
-esac
-
# These files could be modified when an external module is built.
mutable_files="
From 8cdd9d2212f7a8b5ad088f9fc59f1a5cecb12506 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Jun 2022 17:18:14 +0200
Subject: [PATCH 077/608] bzip3: update to 1.1.4.
---
srcpkgs/bzip3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bzip3/template b/srcpkgs/bzip3/template
index b7de15d1c2ec..10cd3adcadfe 100644
--- a/srcpkgs/bzip3/template
+++ b/srcpkgs/bzip3/template
@@ -1,6 +1,6 @@
# Template file for 'bzip3'
pkgname=bzip3
-version=1.1.3
+version=1.1.4
revision=1
build_style=gnu-configure
short_desc="Better and stronger spiritual successor to bzip2"
@@ -9,7 +9,7 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/kspalaiologos/bzip3"
#changelog=""
distfiles="https://github.com/kspalaiologos/bzip3/releases/download/${version}/bzip3-${version}.tar.xz"
-checksum=9ee90e5b07a81e581515a89e263917f1738d8d28dbec05b3ded4524c79977c3c
+checksum=4948c4cd62a995346a03087fc35183d7b9289a9cade491b6bb005d1dd80ab108
bzip3-devel_package() {
short_desc+=" - development files"
From 5a2fb78f454547a3b635d7abab923822bb811bc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Jun 2022 17:19:37 +0200
Subject: [PATCH 078/608] skaffold: update to 1.39.1.
---
srcpkgs/skaffold/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index af2d37f0aeb6..81555a927f40 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
# Template file for 'skaffold'
pkgname=skaffold
-version=1.38.0
+version=1.39.1
revision=1
build_style=go
go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://skaffold.dev/"
changelog="https://github.com/GoogleContainerTools/skaffold/releases"
distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=42f8f8a6f8f55f8031c87de3c3d35334f2e1f71c2a2120d3cc1a15f8ed71ba31
+checksum=f285e554257c914c5ab247a0a1a2e28e66926c6cda8959365869328b2af61c51
From a460a1e370e940bcf950bec0defb90711011d9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 26 Jun 2022 16:21:51 +0200
Subject: [PATCH 079/608] dasel: update to 1.25.0.
---
srcpkgs/dasel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index 1f4e0d9fb800..c6e2e67cce19 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,6 +1,6 @@
# Template file for 'dasel'
pkgname=dasel
-version=1.24.3
+version=1.25.0
revision=1
build_style=go
go_import_path=github.com/tomwright/dasel
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://daseldocs.tomwright.me/"
changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
-checksum=86d497e7dcfe63901ef0aeddb31e3989959d60d785a04f98fc6a88b6f497980a
+checksum=49f7a34b31c87d27ef5c5a32b87a603ac6d7d4d1a52533942676429b747e1f7e
post_install() {
vlicense LICENSE
From 0e0382f56cc2531bbbc26d88cf8d36a977b4155d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 25 Jun 2022 21:43:24 +0700
Subject: [PATCH 080/608] nss: update to 3.80.
---
srcpkgs/nss/patches/native-nsinstall-cflags.patch | 9 ++++-----
srcpkgs/nss/template | 8 +++++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/nss/patches/native-nsinstall-cflags.patch b/srcpkgs/nss/patches/native-nsinstall-cflags.patch
index e2734e700d4d..249d281becf4 100644
--- a/srcpkgs/nss/patches/native-nsinstall-cflags.patch
+++ b/srcpkgs/nss/patches/native-nsinstall-cflags.patch
@@ -1,11 +1,10 @@
---- nss-3.68.orig/nss/coreconf/nsinstall/Makefile
-+++ nss-3.68/nss/coreconf/nsinstall/Makefile
-@@ -32,6 +32,8 @@ endif
+--- nss-3.80.orig/nss/coreconf/nsinstall/Makefile
++++ nss-3.80/nss/coreconf/nsinstall/Makefile
+@@ -32,6 +32,7 @@ endif
ifdef NATIVE_FLAGS
OS_CFLAGS=$(NATIVE_FLAGS)
+XCFLAGS = $(NATIVE_FLAGS)
-+LDFLAGS = $(LDFLAGS_FOR_BUILD)
endif
- include $(DEPTH)/coreconf/rules.mk
+ ifdef NATIVE_LDFLAGS
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 7ea39f1c3182..0d9c200fe637 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
_nsprver=4.34
pkgname=nss
-version=3.79
+version=3.80
revision=1
hostmakedepends="perl which"
makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=ebdf2d6a96613b6fe70ad579e9f983e0e94e0110171cfb2999db633d3394a514
+checksum=c0bf1fd2c7e29a6b02b309622baafc443eec90c8934bb155da4bb98988784b6a
export NS_USE_GCC=1
export LIBRUNPATH=
@@ -60,7 +60,9 @@ do_build() {
export XCFLAGS="${CFLAGS}"
make -C nss ${makejobs} \
${CROSS_BUILD:+CROSS_COMPILE=1} OS_TEST="${_ARCH}" \
- NATIVE_CC="${BUILD_CC}" NATIVE_FLAGS="${BUILD_CFLAGS}" \
+ NATIVE_CC="${CC_FOR_BUILD}" \
+ NATIVE_FLAGS="${CFLAGS_FOR_BUILD}" \
+ NATIVE_LDFLAGS="${LDFLAGS_FOR_BUILD}" \
CCC="$CXX" ${_use64} \
all
}
From cdc077147576818b621fc4fa8d3caec9e8aca9ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Jun 2022 07:54:38 +0700
Subject: [PATCH 081/608] ca-certificates: update to 20211016+3.80.
Close: #37682
---
srcpkgs/ca-certificates/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index eaa70fc7a22b..ca95efa092d7 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,6 +1,6 @@
# Template file for 'ca-certificates'
pkgname=ca-certificates
-version=20211016+3.77
+version=20211016+3.80
revision=1
_nss_version=${version#*+}
bootstrap=yes
@@ -8,7 +8,7 @@ conf_files="/etc/ca-certificates.conf"
create_wrksrc=yes
build_wrksrc="work"
hostmakedepends="openssl"
-depends="openssl<=2.0_1 run-parts"
+depends="openssl run-parts"
short_desc="Common CA certificates for SSL/TLS from Mozilla"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, MPL-2.0"
@@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs"
distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88
- 825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd"
+ c0bf1fd2c7e29a6b02b309622baafc443eec90c8934bb155da4bb98988784b6a"
post_extract() {
cp ${FILESDIR}/* $build_wrksrc/mozilla
From f6952865c65d1b5243601bc6ca877667e9aa83bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
<sigrid@ftrv.se>
Date: Sun, 26 Jun 2022 18:48:22 +0200
Subject: [PATCH 082/608] bindfs: update to 1.16.1, adopt
---
srcpkgs/bindfs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index beb18d37dcc1..e810fd4335a2 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,16 +1,16 @@
# Template file for 'bindfs'
pkgname=bindfs
-version=1.16.0
+version=1.16.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="fuse3-devel"
short_desc="FUSE filesystem for mounting a directory to another location"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>"
license="GPL-2.0-or-later"
homepage="https://bindfs.org"
changelog="https://bindfs.org/docs/ChangeLog.utf8.txt"
distfiles="https://bindfs.org/downloads/bindfs-${version}.tar.gz"
-checksum=02ebefaaa64e1b044fc5c743c5829aad21ed6f7145f4db0723bcc45f085781f6
+checksum=55ea3d2aa8e48d0bea23b7c0b03950cfeb492355bfd8dbb8a173a1e383f228bc
#cannot mount
make_check=no
From 3fa2ca369449ae4071934837c65d735e088e8577 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Wed, 9 Mar 2022 07:56:03 +0700
Subject: [PATCH 083/608] New package: hblock-3.4.0
---
srcpkgs/hblock/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/hblock/template
diff --git a/srcpkgs/hblock/template b/srcpkgs/hblock/template
new file mode 100644
index 000000000000..c067f59f9aba
--- /dev/null
+++ b/srcpkgs/hblock/template
@@ -0,0 +1,18 @@
+# Template file for 'hblock'
+pkgname=hblock
+version=3.4.0
+revision=1
+build_style=gnu-makefile
+depends="curl"
+short_desc="Adblocker that creates a hosts file from multiple sources"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
+license="MIT"
+homepage="https://github.com/hectorm/hblock"
+distfiles="https://github.com/hectorm/${pkgname}/archive/v${version}.tar.gz"
+checksum=762dbe5f2a0ea84078b194190f4fb51b9fe3e6ef043c1899fdda6a083328225f
+
+do_install() {
+ make DESTDIR=$DESTDIR prefix=/usr install
+
+ vlicense LICENSE.md
+}
From 3e6bde43d1a3bab7d090f76c9678f567d01d9576 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 26 Jun 2022 11:32:37 +0400
Subject: [PATCH 084/608] nghttp2: update to 1.48.0.
---
srcpkgs/nghttp2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index fe824a39cd44..146badf0ca36 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,6 +1,6 @@
# Template file for 'nghttp2'
pkgname=nghttp2
-version=1.47.0
+version=1.48.0
revision=1
build_style=gnu-configure
# build system errors out if python isn't available
@@ -14,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://nghttp2.org"
distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
-checksum=68271951324554c34501b85190f22f2221056db69f493afc3bbac8e7be21e7cc
+checksum=47d8f30ee4f1bc621566d10362ca1b3ac83a335c63da7144947c806772d016e4
python_version=3
post_install() {
From c912ef924a7a8a68dd7f5e45274637d540c56a46 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 26 Jun 2022 00:14:49 -0300
Subject: [PATCH 085/608] oil: update to 0.11.0
---
srcpkgs/oil/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 8866e01d7f94..6648b5255576 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
# Template file for 'oil'
pkgname=oil
-version=0.10.0
+version=0.11.0
revision=1
build_style=configure
configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,8 +11,8 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=cf7da9494ba9f0f101d27f0d0b5e248f8a54721ddeec13dd54652c9528580296
-register_shell="/usr/bin/osh"
+checksum=e5e00ae776852c41233efc0a310219968523485680714d2dcec500af63d00208
+register_shell="/usr/bin/osh /usr/bin/oil"
nocross="Build systems gets confused with host and cross toolchains/headers"
nostrip=yes
@@ -27,8 +27,9 @@ pre_build() {
do_install() {
# Install binaries
vbin _bin/oil.ovm
- # Symlink osh, oshc to oil.ovm.
+ vman doc/osh.1
+ # Symlink osh, oil to oil.ovm.
cd "${DESTDIR}"/usr/bin
ln -s oil.ovm osh
- ln -s oil.ovm oshc
+ ln -s oil.ovm oil
}
From 0563edfc4ecae64f4b99354a097384e86ceda607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 26 Mar 2022 17:37:06 +0100
Subject: [PATCH 086/608] New package: prs-0.3.4
---
srcpkgs/prs-gtk3 | 1 +
srcpkgs/prs/template | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 120000 srcpkgs/prs-gtk3
create mode 100644 srcpkgs/prs/template
diff --git a/srcpkgs/prs-gtk3 b/srcpkgs/prs-gtk3
new file mode 120000
index 000000000000..c38bf7a251b6
--- /dev/null
+++ b/srcpkgs/prs-gtk3
@@ -0,0 +1 @@
+prs
\ No newline at end of file
diff --git a/srcpkgs/prs/template b/srcpkgs/prs/template
new file mode 100644
index 000000000000..bdaf183af206
--- /dev/null
+++ b/srcpkgs/prs/template
@@ -0,0 +1,22 @@
+# Template file for 'prs'
+pkgname=prs
+version=0.3.4
+revision=1
+build_style=cargo
+make_install_args="--path ./cli"
+hostmakedepends="pkg-config gnupg git python3"
+makedepends="glib-devel cairo-devel pango-devel atk-devel gdk-pixbuf-devel gtk+3-devel"
+depends="gnupg git"
+short_desc="Pass compatible password manager written in Rust"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-only"
+homepage="https://timvisee.com/projects/prs/"
+distfiles="https://github.com/timvisee/prs/archive/refs/tags/v${version}.tar.gz"
+checksum=a0fb15751263a60c398169aeeb6b92799652f1079875b0ae2e832764070cbddc
+
+prs-gtk3_package() {
+ short_desc="GTK3 frontend for prs"
+ pkg_install() {
+ vbin target/${RUST_TARGET}/release/prs-gtk3-copy prs-gtk3
+ }
+}
From 77d2f98976611d1920cc5e525128c24b35526581 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 14 May 2022 22:49:26 +0200
Subject: [PATCH 087/608] winetricks: update to 20220411
---
srcpkgs/winetricks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template
index 8db89c6a521d..a9cc9c3cd8a9 100644
--- a/srcpkgs/winetricks/template
+++ b/srcpkgs/winetricks/template
@@ -1,6 +1,6 @@
# Template file for 'winetricks'
pkgname=winetricks
-version=20210825
+version=20220411
revision=1
build_style=gnu-makefile
depends="cabextract unzip xmessage" # actually it depends on wine
@@ -9,5 +9,5 @@ maintainer="mater11234 <mater11234@riseup.net>"
license="LGPL-3.0-or-later"
homepage="http://wiki.winehq.org/winetricks"
distfiles="https://github.com/Winetricks/winetricks/archive/$version.tar.gz"
-checksum=bac77918ef4d58c6465a1043fd996d09c3ee2c5a07f56ed089c4c65a71881277
+checksum=c16e09ee4e5fda48a49ae9515a9c6d175713792be1b85ea92624d93e37effbd0
make_check=no # Needs python3-bashate
From 2051594a2b2a70802cbeced2eb7516b6865554bb Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Mon, 23 May 2022 00:30:25 -0500
Subject: [PATCH 088/608] libnfs: Update to 5.0.1
---
common/shlibs | 2 +-
srcpkgs/libnfs/patches/fix-musl.patch | 6 +++---
srcpkgs/libnfs/template | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8231f48d36a3..a7540ef7b2db 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1199,7 +1199,7 @@ librlog.so.5 librlog-1.4_1
libtinyxml.so.0 tinyxml-2.6.2_1
libtinyxml2.so.9 tinyxml2-9.0.0_1
libbluray.so.2 libbluray-1.0.0_1
-libnfs.so.13 libnfs-4.0.0_1
+libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
diff --git a/srcpkgs/libnfs/patches/fix-musl.patch b/srcpkgs/libnfs/patches/fix-musl.patch
index 18a3657c649c..6d599b49e431 100644
--- a/srcpkgs/libnfs/patches/fix-musl.patch
+++ b/srcpkgs/libnfs/patches/fix-musl.patch
@@ -1,10 +1,10 @@
--- a/include/nfsc/libnfs.h
+++ b/include/nfsc/libnfs.h
-@@ -24,6 +24,7 @@
- #define _LIBNFS_H_
+@@ -28,6 +28,7 @@
+ #endif
#include <stdint.h>
+#include <sys/time.h>
- #if defined(__ANDROID__) || defined(AROS) \
+ #if defined(__ANDROID__) || defined(AROS) || defined(__PPU__) \
|| ( defined(__APPLE__) && defined(__MACH__) )
#include <sys/time.h>
diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template
index f1e27dd15f57..1946fdceb307 100644
--- a/srcpkgs/libnfs/template
+++ b/srcpkgs/libnfs/template
@@ -1,6 +1,6 @@
# Template file for 'libnfs'
pkgname=libnfs
-version=4.0.0
+version=5.0.1
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/sahlberg/libnfs"
distfiles="https://github.com/sahlberg/libnfs/archive/${pkgname}-${version}.tar.gz"
-checksum=6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d
+checksum=7ef445410b42f36b9bad426608b53ccb9ccca4101e545c383f564c11db672ca8
pre_configure() {
autoreconf -fi
From a04c4c79d17e969bc8e3da1238f3218d2a2ee22d Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Sat, 25 Jun 2022 17:36:30 -0500
Subject: [PATCH 089/608] mpd: rebuild for libnfs-5.0.1
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 7249957f2113..bf6aa8c73770 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.7
-revision=2
+revision=3
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From b95d033e9ad5b77c8569f3cc7ee2d68e0a05ec8c Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Sat, 25 Jun 2022 17:36:51 -0500
Subject: [PATCH 090/608] kodi: rebuild for libnfs-5.0.1
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index b4eeacdab624..d3e9a13afdd5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=2
+revision=3
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From 96f4e4c33e8346044a24e991efa92fef956bdffd Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Sat, 25 Jun 2022 17:37:21 -0500
Subject: [PATCH 091/608] gvfs: rebuild for libnfs-5.0.1
---
srcpkgs/gvfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 71be065310ef..6adb51e279bd 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
# Template file for 'gvfs'
pkgname=gvfs
version=1.48.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
-Dman=true"
From 6eb31b857e70ff06ef1d2327c9c97ccee8645faa Mon Sep 17 00:00:00 2001
From: Rina Spinne <rina@spinne.systems>
Date: Sat, 25 Jun 2022 17:37:40 -0500
Subject: [PATCH 092/608] qemu: rebuild for libnfs-5.0.1
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 17655fdbdda8..042ba79299e1 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=6.2.0
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From c185cd9d90989e3083c2c69b3b5bbe51242fa341 Mon Sep 17 00:00:00 2001
From: wael <40663@proton.me>
Date: Sat, 25 Jun 2022 06:02:34 +0300
Subject: [PATCH 093/608] New package: ps_mem-3.14
---
srcpkgs/ps_mem/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/ps_mem/template
diff --git a/srcpkgs/ps_mem/template b/srcpkgs/ps_mem/template
new file mode 100644
index 000000000000..8766b8338f3c
--- /dev/null
+++ b/srcpkgs/ps_mem/template
@@ -0,0 +1,12 @@
+# Template file for 'ps_mem'
+pkgname=ps_mem
+version=3.14
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Utility to accurately report the core memory usage for a program"
+maintainer="wael <40663@proton.me>"
+license="LGPL-2.1-only"
+homepage="https://github.com/pixelb/ps_mem"
+distfiles="https://github.com/pixelb/ps_mem/archive/refs/tags/v${version}.tar.gz"
+checksum=ad8bf87f9b9acd9b0b4997445bd99a8eeace4d816b207d56b03c5a83fec00514
From dca11ce27f71d0d44b21ea3d085750fb203b55de Mon Sep 17 00:00:00 2001
From: xolophreny <xolophreny@protonmail.ch>
Date: Sun, 27 Feb 2022 20:34:20 +0500
Subject: [PATCH 094/608] vkBasalt: update to 0.3.2.5
---
srcpkgs/vkBasalt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vkBasalt/template b/srcpkgs/vkBasalt/template
index b7f93dd8803e..d00eb3d4a376 100644
--- a/srcpkgs/vkBasalt/template
+++ b/srcpkgs/vkBasalt/template
@@ -1,6 +1,6 @@
# Template file for 'vkBasalt'
pkgname=vkBasalt
-version=0.3.2.4
+version=0.3.2.5
revision=1
build_style=meson
hostmakedepends="glslang pkg-config"
@@ -10,4 +10,4 @@ maintainer="xolophreny <xolophreny@protonmail.ch>"
license="Zlib"
homepage="https://github.com/DadSchoorse/vkBasalt"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f45d513d9f212e9a1e1ec49448e72c5f2510d62303c38fdb5015b9a3afd42b26
+checksum=837cf63737302de7ab9c4a190a1ed3b8a1174630d3753f7a8478b140294b3b39
From 1519808d45a9b06d2e182aac827ca4fe15be99c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 27 Apr 2022 22:10:40 +0200
Subject: [PATCH 095/608] tectonic: update to 0.9.0.
---
srcpkgs/tectonic/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 920576d17e60..19c18335fb2a 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
# Template file for 'tectonic'
pkgname=tectonic
-version=0.8.2
-revision=2
+version=0.9.0
+revision=1
wrksrc="tectonic-tectonic-${version}"
build_style=cargo
configure_args="--features=external-harfbuzz"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://tectonic-typesetting.github.io"
changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/release/CHANGELOG.md"
distfiles="https://github.com/tectonic-typesetting/tectonic/archive/tectonic@${version}.tar.gz"
-checksum=1f92a5ff25725a9a4c0eefd4ea306da1e63f57c40d4ceb0972c7e5bb73297b4f
+checksum=a239ca85bff1955792b2842fabfa201ba9576d916ece281278781f42c7547b9f
post_install() {
vlicense LICENSE
From 2f2562f44eb5581bcd53d5f53d49c81536fdc51c Mon Sep 17 00:00:00 2001
From: bitofhope <bitofhope@kapsi.fi>
Date: Sun, 26 Jun 2022 20:58:03 +0300
Subject: [PATCH 096/608] man-db: update to 2.10.2.
---
.../add-missing-stdlib_h-include.patch | 10 ---
.../patches/guard-glibc-iconv-ext.patch | 63 ++++++++++---------
srcpkgs/man-db/template | 8 +--
3 files changed, 36 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch
diff --git a/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch b/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch
deleted file mode 100644
index 8687d550b0bb..000000000000
--- a/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libdb/db_btree.c
-+++ b/libdb/db_btree.c
-@@ -29,6 +29,7 @@
- #ifdef BTREE
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-
diff --git a/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch b/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch
index 8e47da8a2192..d8857cfd6b85 100644
--- a/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch
+++ b/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch
@@ -1,19 +1,38 @@
+ src/convert.c | 4 ++++
src/manconv.c | 7 ++++++-
src/manconv_client.c | 4 ++++
- src/whatis.c | 4 ++++
3 files changed, 14 insertions(+), 1 deletion(-)
-diff --git src/manconv.c src/manconv.c
-index b9ac8d3a..8f5bdaee 100644
+diff --git a/src/convert.c b/src/convert.c
+index 447240c6..231f5c14 100644
+--- a/src/convert.c
++++ b/src/convert.c
+@@ -55,10 +55,14 @@ static void close_conv_to_locale (void *ignored MAYBE_UNUSED)
+ char * ATTRIBUTE_MALLOC convert_to_locale (char *string)
+ {
+ if (!conv_to_locale_initialized) {
++#ifdef __GLIBC__
+ char *locale_charset = xasprintf
+ ("%s//IGNORE", get_locale_charset ());
+ conv_to_locale = iconv_open (locale_charset, "UTF-8");
+ free (locale_charset);
++#else /* __GLIBC__ */
++ conv_to_locale = iconv_open (get_locale_charset (), "UTF-8");
++#endif /* ! __GLIBC__ */
+ if (conv_to_locale != (iconv_t) -1)
+ push_cleanup (close_conv_to_locale, NULL, 0);
+ conv_to_locale_initialized = true;
+diff --git a/src/manconv.c b/src/manconv.c
+index 18ae307a..e2e6aa33 100644
--- a/src/manconv.c
+++ b/src/manconv.c
-@@ -111,9 +111,14 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to,
+@@ -301,9 +301,14 @@ static tried_iconv try_iconv (decompress *decomp, const char *try_from_code,
iconv_t cd_utf8, cd = NULL;
bool to_utf8 = STREQ (try_to_code, "UTF-8") ||
STRNEQ (try_to_code, "UTF-8//", 7);
- const char *utf8_target = last ? "UTF-8//IGNORE" : "UTF-8";
bool ignore_errors = (strstr (try_to_code, "//IGNORE") != NULL);
- int ret = 0;
+ tried_iconv ret = TRIED_ICONV_OK;
+#ifdef __GLIBC__
+ const char *utf8_target = last ? "UTF-8//IGNORE" : "UTF-8";
+#else /* __GLIBC__ */
@@ -23,37 +42,19 @@ index b9ac8d3a..8f5bdaee 100644
debug ("trying encoding %s -> %s\n", try_from_code, try_to_code);
-diff --git src/manconv_client.c src/manconv_client.c
-index 0c41bec6..2a7f1398 100644
+diff --git a/src/manconv_client.c b/src/manconv_client.c
+index 55289ff4..6e7861f5 100644
--- a/src/manconv_client.c
+++ b/src/manconv_client.c
-@@ -102,7 +102,11 @@ void add_manconv (pipeline *p, const char *source, const char *target)
- gl_list_add_last (codes->from, xstrdup (source));
- name = appendstr (name, "UTF-8:", source, (void *) 0);
+@@ -111,7 +111,11 @@ void add_manconv (pipeline *p,
+ gl_list_add_last (codes->from, xstrdup (source_encoding));
+ name = appendstr (name, "UTF-8:", source_encoding, (void *) 0);
}
-+#ifdef __GLIBC__
- codes->to = xasprintf ("%s//IGNORE", target);
++#ifdef __GBLIBC__
+ codes->to = xasprintf ("%s//IGNORE", target_encoding);
+#else /* __GLIBC__ */
-+ codes->to = xasprintf ("%s", target);
++ codes->to = xasprintf ("%s", target_encoding);
+#endif /* ! __GLIBC__ */
/* informational only; no shell quoting concerns */
name = appendstr (name, " -t ", codes->to, (void *) 0);
if (quiet >= 2)
-diff --git src/whatis.c src/whatis.c
-index d2559169..ec80c117 100644
---- a/src/whatis.c
-+++ b/src/whatis.c
-@@ -945,9 +945,13 @@ int main (int argc, char *argv[])
- display_seen = new_string_set (GL_HASH_SET);
-
- #ifdef HAVE_ICONV
-+#ifdef __GLIBC__
- locale_charset = xasprintf ("%s//IGNORE", get_locale_charset ());
- conv_to_locale = iconv_open (locale_charset, "UTF-8");
- free (locale_charset);
-+#else /* __GLIBC__ */
-+ conv_to_locale = iconv_open(get_locale_charset (), "UTF-8");
-+#endif /* ! __GLIBC__ */
- #endif /* HAVE_ICONV */
-
- if (regex_opt) {
diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index c8b873771d27..3d60f4e91878 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,6 +1,6 @@
# Template file for 'man-db'
pkgname=man-db
-version=2.9.4
+version=2.10.2
revision=1
build_style=gnu-configure
configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
@@ -16,11 +16,11 @@ depends="bzip2 coreutils grep groff gzip less"
conf_files="/etc/man_db.conf"
short_desc="On-line manual database"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
+license="GPL-3.0-or-later"
homepage="https://www.nongnu.org/man-db/"
-changelog="https://git.savannah.gnu.org/cgit/man-db.git/plain/NEWS"
+changelog="https://gitlab.com/cjwatson/man-db/-/raw/main/NEWS.md"
distfiles="${NONGNU_SITE}/man-db/man-db-${version}.tar.xz"
-checksum=b66c99edfad16ad928c889f87cf76380263c1609323c280b3a9e6963fdb16756
+checksum=ee97954d492a13731903c9d0727b9b01e5089edbd695f0cdb58d405a5af5514d
provides="man-0_1"
lib32disabled=yes
system_accounts="_man"
From 7fd5fe7cc5c4fd1db8e354f0f2472ca090487bfd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 26 Jun 2022 23:45:26 +0200
Subject: [PATCH 097/608] diffutils: update to 3.8.
---
srcpkgs/diffutils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template
index 80186106e7d9..b5954a0db2ce 100644
--- a/srcpkgs/diffutils/template
+++ b/srcpkgs/diffutils/template
@@ -1,6 +1,6 @@
# Template file for 'diffutils'
pkgname=diffutils
-version=3.7
+version=3.8
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/diffutils"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26
+checksum=a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec
if [ "$XBPS_TARGET_LIBC" = musl ]; then
export ac_cv_lib_error_at_line=no
From e82002cc5b72c0f7a398d00714b14c273de4c100 Mon Sep 17 00:00:00 2001
From: jgart <47760695+jgarte@users.noreply.github.com>
Date: Thu, 17 Feb 2022 01:12:29 -0500
Subject: [PATCH 098/608] roswell: Reword short description.
---
srcpkgs/roswell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/roswell/template b/srcpkgs/roswell/template
index c656f94fb1cc..03f45af726ad 100644
--- a/srcpkgs/roswell/template
+++ b/srcpkgs/roswell/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="automake libcurl"
makedepends="libcurl-devel"
-short_desc="Lisp installer and launcher for major environment that just works"
+short_desc="Installer and launcher for a major lisp environment that just works"
maintainer="Liam Howley <liam.howley@hotmail.com>"
license="MIT"
homepage="https://github.com/roswell/roswell"
From ca8525cb132c3862795b4863a50d74dd5cf36929 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sat, 16 Apr 2022 07:56:48 -0400
Subject: [PATCH 099/608] New package: gst-rtsp-server-1.20.1
Closes: #36722 [via git-merge-pr]
---
srcpkgs/gst-rtsp-server/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/gst-rtsp-server/template
diff --git a/srcpkgs/gst-rtsp-server/template b/srcpkgs/gst-rtsp-server/template
new file mode 100644
index 000000000000..7fc2d57201f5
--- /dev/null
+++ b/srcpkgs/gst-rtsp-server/template
@@ -0,0 +1,14 @@
+# Template file for 'gst-rtsp-server'
+pkgname=gst-rtsp-server
+version=1.20.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config python3"
+makedepends="glib-devel gst-plugins-bad1-devel gobject-introspection
+ libcgroup-devel ffmpeg-devel gst-plugins-good1 python3-gobject-devel"
+short_desc="GStreamer multimedia graph framework - rtsp server"
+maintainer="1is7ac3 <isaac.qa13@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gstreamer.freedesktop.org"
+distfiles="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${version}.tar.xz"
+checksum=4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509
From 35e83bd657443850fc86c518c7dff58b22ca1d87 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 May 2022 22:28:10 +0300
Subject: [PATCH 100/608] sudo: update to 1.9.10.
---
srcpkgs/sudo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 659e78a013ca..46a20f757d5f 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
# Template file for 'sudo'
pkgname=sudo
-version=1.9.8p2
+version=1.9.10
revision=1
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://www.sudo.ws/"
changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=9e3b8b8da7def43b6e60c257abe80467205670fd0f7c081de1423c414b680f2d
+checksum=44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4
conf_files="/etc/pam.d/sudo /etc/sudoers"
lib32disabled=yes
@@ -33,7 +33,7 @@ pre_install() {
post_install() {
vinstall ${FILESDIR}/sudo.pam 644 etc/pam.d sudo
- vlicense doc/LICENSE
+ vlicense LICENSE.md
# remove unused stuff.
rm -rf ${DESTDIR}/usr/share/doc
rm -rf ${DESTDIR}/usr/include
From 03d834a1ccdd89327b97558dcf134eb5a664687b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Nov 2021 06:00:47 +1100
Subject: [PATCH 101/608] binwalk: fix checks
---
srcpkgs/binwalk/patches/fix-2.3.3-test.patch | 14 ++++++++++++++
srcpkgs/binwalk/template | 9 +++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/binwalk/patches/fix-2.3.3-test.patch
diff --git a/srcpkgs/binwalk/patches/fix-2.3.3-test.patch b/srcpkgs/binwalk/patches/fix-2.3.3-test.patch
new file mode 100644
index 000000000000..bce5ed7c8f39
--- /dev/null
+++ b/srcpkgs/binwalk/patches/fix-2.3.3-test.patch
@@ -0,0 +1,14 @@
+https://github.com/ReFirmLabs/binwalk/issues/566
+https://github.com/ReFirmLabs/binwalk/issues/569
+
+--- a/testing/tests/test_firmware_zip.py
++++ b/testing/tests/test_firmware_zip.py
+@@ -10,6 +10,8 @@
+ '''
+ expected_results = [
+ [0, 'Zip archive data, at least v1.0 to extract, name: dir655_revB_FW_203NA/'],
++ [51, 'Zip archive data, at least v2.0 to extract, compressed size: 6395868, uncompressed size: 6422554, name: dir655_revB_FW_203NA/DIR655B1_FW203NAB02.bin'],
++ [6395993, 'Zip archive data, at least v2.0 to extract, compressed size: 14243, uncompressed size: 61440, name: dir655_revB_FW_203NA/dir655_revB_release_notes_203NA.doc'],
+ [6410581, 'End of Zip archive, footer length: 22'],
+
+ ]
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index 739c0c2ccc44..f3838109bfb2 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -3,10 +3,9 @@ pkgname=binwalk
version=2.3.3
revision=1
build_style=python3-module
-pycompile_module="binwalk"
hostmakedepends="python3"
depends="python3"
-checkdepends="python3-coverage python3-nose"
+checkdepends="python3-coverage python3-nose tar"
short_desc="Easy tool for analyzing/reversing/extracting firmware images"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
@@ -16,6 +15,12 @@ checksum=7e32b94dc77632b51d18732b5456e2a3ef85e4521d7d4a54410e36f93859501f
post_extract() {
vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py
+
+ if [ $(id -u) -eq 0 ]; then
+ # CI container has different privileges than expected in tests.
+ # Append " **{'run-as' : 'root'}," to "binwalk.scan(input_vector_file,".
+ vsed -i -e "/binwalk.scan(input_vector_file,/ s/$/ **{'run-as' : 'root'},/" testing/tests/test_*.py
+ fi
}
do_check() {
From b6b48672059125536995e730372c8a032919059d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 26 Jun 2022 20:10:39 -0400
Subject: [PATCH 102/608] supercat: update to 0.5.8
---
srcpkgs/supercat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/supercat/template b/srcpkgs/supercat/template
index b323db335498..a155c840a076 100644
--- a/srcpkgs/supercat/template
+++ b/srcpkgs/supercat/template
@@ -1,6 +1,6 @@
# Template file for 'supercat'
pkgname=supercat
-version=0.5.7
+version=0.5.8
revision=1
build_style=gnu-configure
short_desc="Colorizes text based on matching regular expressions/strings/characters"
@@ -8,4 +8,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://supercat.nosredna.net"
distfiles="http://supercat.nosredna.net/supercat-${version}.tar.gz"
-checksum=ecc0f34117733bdac617e0ad6623622c68ef791059899750bd1d90012a058a50
+checksum=3c017bb42d9d599302a78953abfabdd4d4d91e371292507cd44020f0c8cb6b2a
From 8ac6e992c753da1b795012bf0767477e87ee0469 Mon Sep 17 00:00:00 2001
From: Yuriy Chumak <yuriy.chumak@mail.com>
Date: Mon, 13 Jun 2022 19:09:03 +0300
Subject: [PATCH 103/608] ol: update to 2.3.5.
---
srcpkgs/ol/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ol/template b/srcpkgs/ol/template
index e3c29a71f176..40317b4324c7 100644
--- a/srcpkgs/ol/template
+++ b/srcpkgs/ol/template
@@ -1,6 +1,6 @@
# Template file for 'ol'
pkgname=ol
-version=2.3
+version=2.3.5
revision=1
build_style=gnu-makefile
hostmakedepends="xxd"
@@ -8,8 +8,9 @@ short_desc="Purely functional dialect of Lisp"
maintainer="rc-05 <rc23@email.it>"
license="LGPL-3.0-or-later, MIT"
homepage="https://yuriy-chumak.github.io/ol/"
+changelog="https://raw.githubusercontent.com/yuriy-chumak/ol/master/doc/CHANGELOG.md"
distfiles="https://github.com/yuriy-chumak/ol/archive/${version}.tar.gz"
-checksum=99b43cb7c510b2f9345fc2ff976540689131c563a883d1bd0699124466e155a8
+checksum=1f3da2d3b2e47f5c626bfe2727b649db3fd8f53e700dad2a984314275ee7a6ff
CFLAGS="-lm"
From 3cc3fc798ff212ad18f6c88ea6af722a3bf016d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 27 Jun 2022 10:37:20 -0400
Subject: [PATCH 104/608] python3-prompt_toolkit: update to 3.0.30.
---
srcpkgs/python3-prompt_toolkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 27fdeb83dab2..663bb18d5a93 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,6 +1,6 @@
# Template file for 'python3-prompt_toolkit'
pkgname=python3-prompt_toolkit
-version=3.0.29
+version=3.0.30
revision=1
wrksrc="prompt_toolkit-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7
+checksum=859b283c50bde45f5f97829f77a4674d1c1fcd88539364f1b28a37805cfd89c0
conflicts="python3-prompt_toolkit2<=2.0.9_4"
post_install() {
From 23fc55bf23a9390f025a9a5dcc436b6a18c32153 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 27 Jun 2022 10:37:45 -0400
Subject: [PATCH 105/608] python3-pytools: update to 2022.1.12.
---
srcpkgs/python3-pytools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 4dad3d984738..5c2ed5c5e1f8 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytools'
pkgname=python3-pytools
-version=2022.1.11
+version=2022.1.12
revision=1
wrksrc=${pkgname#*-}-${version}
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="X11"
homepage="https://pypi.org/project/pytools"
distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=810173d62d5d6c391b137a6666be4a1616eae05df24d5ddbc0eada684a0180a2
+checksum=4d62875e9a2ab2a24e393a9a8b799492f1a721bffa840af3807bfd42871dd1f4
post_install() {
vlicense LICENSE
From 01f619f92d802fe55e25b4254e0fcee03abc9459 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 27 Jun 2022 13:33:07 -0400
Subject: [PATCH 106/608] subfinder: update to 2.5.2
---
srcpkgs/subfinder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index 9c5ac3e7269e..859b723b57e5 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,6 +1,6 @@
# Template file for 'subfinder'
pkgname=subfinder
-version=2.4.9
+version=2.5.2
revision=1
build_wrksrc=v2
build_style=go
@@ -11,7 +11,7 @@ maintainer="w. fnintr <wfnintr@null.net>"
license="MIT"
homepage="https://github.com/projectdiscovery/subfinder"
distfiles="https://github.com/projectdiscovery/subfinder/archive/refs/tags/v${version}.tar.gz"
-checksum=0163626e69aa4ea4642633ab447ca2afcf2e06f7aec16c2aa95ec5ce301250cf
+checksum=3f99323effbbc0d8f1d5181ac4cc1c5bd31b50a1eb792866269ec44acf308f1d
post_install() {
vlicense ../LICENSE.md
From 0dbefd1d9acb8d2b478728018809c1ce10e90578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 27 Jun 2022 15:25:01 +0200
Subject: [PATCH 107/608] dunst: update to 1.9.0.
---
srcpkgs/dunst/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index 686ed171ff8c..789219ee6ca7 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,6 +1,6 @@
# Template file for 'dunst'
pkgname=dunst
-version=1.8.1
+version=1.9.0
revision=1
build_style=gnu-makefile
make_check_target=test
@@ -18,7 +18,7 @@ license="BSD-3-Clause"
homepage="https://dunst-project.org"
changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=90325a4004626ce516ac7b5b0ed1aaab11c5315385d31f781d6f26064601c3a1
+checksum=b7b8d7d6560bb241b1e4d37eba770cdf19b9d5dbfc1d4d47572ad676f3f7c98a
build_options="wayland"
build_options_default="wayland"
From 9777f398af3e8fb898cd633a0d365c3b73ec035b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 27 Jun 2022 17:15:19 +0300
Subject: [PATCH 108/608] sudo: update to 1.9.11p3.
---
srcpkgs/sudo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 46a20f757d5f..b28ced997ea8 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,6 +1,6 @@
# Template file for 'sudo'
pkgname=sudo
-version=1.9.10
+version=1.9.11p3
revision=1
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://www.sudo.ws/"
changelog="https://www.sudo.ws/repos/sudo/raw-file/tip/NEWS"
distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz"
-checksum=44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4
+checksum=4687e7d2f56721708f59cca2e1352c056cb23de526c22725615a42bb094f1f70
conf_files="/etc/pam.d/sudo /etc/sudoers"
lib32disabled=yes
From 91d76e5d6b10eb59eb0c3bddb2ad6dda12aed7b7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 27 Jun 2022 16:14:46 -0400
Subject: [PATCH 109/608] starship: update to 1.9.1
---
srcpkgs/starship/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index f4cffc0cfb8d..ec4691a96956 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,6 +1,6 @@
# Template file for 'starship'
pkgname=starship
-version=1.8.0
+version=1.9.1
revision=1
build_style=cargo
build_helper=qemu
@@ -13,7 +13,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
license="ISC"
homepage="https://starship.rs"
distfiles="https://github.com/starship/starship/archive/refs/tags/v${version}.tar.gz"
-checksum=398bf5b413ce5dfe4d3c5acceb0025f773478f28016609869821cf385448dcf5
+checksum=2b54bee07bf67504a1bb170d37dc8d6accab4594d35731bbdf0e8a631c8d1585
post_build() {
STARSHIP="target/${RUST_TARGET}/release/starship"
From 1abe0aac06a923012f802c989fed65cc7586f917 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 27 Jun 2022 11:25:26 -0400
Subject: [PATCH 110/608] miniserve: update to 0.20.0
---
srcpkgs/miniserve/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index fcf8884708bf..d1ddc81a1c80 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -1,6 +1,6 @@
# Template file for 'miniserve'
pkgname=miniserve
-version=0.19.5
+version=0.20.0
revision=1
build_style=cargo
checkdepends="curl"
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/svenstaro/miniserve"
changelog="https://raw.githubusercontent.com/svenstaro/miniserve/master/CHANGELOG.md"
distfiles="https://github.com/svenstaro/miniserve/archive/v${version}.tar.gz"
-checksum=6c758467bd546327505717ecab1a0f78a07226509dd5de098112065221882474
+checksum=77aca0e3660564cc2b9a7f318c5d9065d471f3c5ab0a7d1b6850a5cb6e21904f
make_check=ci-skip # port binding succeeds locally but fails in CI
case "$XBPS_TARGET_MACHINE" in
From 6f9a99444d54489e0562ed06596007c9f67944ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 27 Jun 2022 09:59:34 +0200
Subject: [PATCH 111/608] newsboat: update to 2.28.
---
srcpkgs/newsboat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 09f30180a19c..371b6dcc9a7a 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,6 +1,6 @@
# Template file for 'newsboat'
pkgname=newsboat
-version=2.27
+version=2.28
revision=1
build_style=configure
build_helper="rust"
@@ -17,7 +17,7 @@ license="MIT"
homepage="https://newsboat.org/"
changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=fd5a40096689d4fc0f18441319197769fa377709821b1a3f1b2ba1f006625285
+checksum=2508713ac850f1f2ae156e4b42cbc75a1c9e399d804e007b5773019115d3b0ec
# tests fail when run by superuser
# they always fail on musl, see https://github.com/newsboat/newsboat/issues/1216
From d249e67de2b307b558a27fcfdde7fb297d2ef8f7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 27 Jun 2022 17:44:54 +0300
Subject: [PATCH 112/608] mupdf: update to 1.20.0.
---
srcpkgs/mupdf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 93286959c402..c7814cf7f53c 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,6 +1,6 @@
# Template file for 'mupdf'
pkgname=mupdf
-version=1.19.1
+version=1.20.0
revision=1
wrksrc="${pkgname}-${version}-source"
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
@@ -14,8 +14,8 @@ short_desc="Lightweight PDF and XPS viewer"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="AGPL-3.0-only"
homepage="https://mupdf.com"
-distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.xz"
-checksum=b5eac663fe74f33c430eda342f655cf41fa73d71610f0884768a856a82e3803e
+distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.lz"
+checksum=68dbb1cf5e31603380ce3f1c7f6c431ad442fa735d048700f50ab4de4c3b0f82
pre_build() {
# libmupdf-{threads,pkcs7}.a are required by fbpdf
From b78e92f82f78f90f607553dacb6edec465747561 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 26 Jun 2022 22:55:45 -0400
Subject: [PATCH 113/608] NetworkManager: update to 1.38.2
---
srcpkgs/NetworkManager/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d3ba80c81650..f95ac17414ba 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
-version=1.38.0
+version=1.38.2
revision=1
build_style=meson
build_helper="gir qemu"
@@ -33,9 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
-changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=82a4cf07ddfeb0816787b67c0f5058ae6c50d6259c0b0541a24e35156062b2ef
+checksum=9cffd2adc68651316df2d2f8a09e1717bb1d0c2ea389cfc721a0109db9b35826
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes
From 431abfbb49f3ee4cac40377efeb0008962dd163f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 26 Jun 2022 22:48:46 -0400
Subject: [PATCH 114/608] zoxide: update to 0.8.2
---
srcpkgs/zoxide/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index f5dca73b732d..9391834fc8cc 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
# Template file for 'zoxide'
pkgname=zoxide
-version=0.8.1
+version=0.8.2
revision=1
build_style=cargo
short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/ajeetdsouza/zoxide"
changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=55f4bf374421f842f5541d95db14d7a63f5d24e269613fb95f769f00cdb9ffc3
+checksum=3a977960284bc06f3c7f02ec93b6f269fd9f5bf933115828e6f46cf6c2601f5e
post_install() {
vlicense LICENSE
From 8ee89ec09f778c2d5d46b1cb29e7e5d96481f081 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 27 Jun 2022 22:40:26 +0200
Subject: [PATCH 115/608] python-b2sdk: update to 1.17.2.
---
srcpkgs/python-b2sdk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index bdc6d758e732..ed5e4a57f998 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,7 +1,7 @@
# Template file for 'python-b2sdk'
# keep python-b2sdk name to revert this package
pkgname=python-b2sdk
-version=1.16.0
+version=1.17.2
revision=1
wrksrc="b2sdk-${version}"
build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://pypi.org/project/b2sdk"
distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=cbffff1163bb8e7cc920c76b29f5e889369d7f5ef1b7b53c89fd5bb79f5ea9c5
+checksum=c20a9e9951da17c65d2b0aa3b9551404d4e8a6e76dedab02816704fd406edcb9
post_install() {
vlicense LICENSE
From efa725c769a24c3c132ff70c2e3d31ceae36559b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 27 Jun 2022 23:26:57 +0200
Subject: [PATCH 116/608] terragrunt: update to 0.38.1.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index ce0ca8b85f6a..6e18fd4d8be3 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.37.1
+version=0.38.1
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=c8bfad7cea4a165af474cff2f7386f91ee0d571a12cd897569b9641f2bbd0e93
+checksum=7c8b187a5a516e3e90467960c161c7ef20b105ac9c391ddde27b0cbf98b0ea4c
post_install() {
vlicense LICENSE.txt
From 5aca2dc2e732c268f9c68dee6736b4483d362cfc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 27 Jun 2022 21:02:09 -0400
Subject: [PATCH 117/608] wsjtx: add changelog, fix update detection
---
srcpkgs/wsjtx/template | 1 +
srcpkgs/wsjtx/update | 3 +++
2 files changed, 4 insertions(+)
create mode 100644 srcpkgs/wsjtx/update
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index b798d0a21208..c1838dd7cf51 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -14,6 +14,7 @@ short_desc="Weak-signal Amateur Radio communication program"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+changelog="https://physics.princeton.edu/pulsar/K1JT/Release_Notes.txt"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
diff --git a/srcpkgs/wsjtx/update b/srcpkgs/wsjtx/update
new file mode 100644
index 000000000000..b5cc9bd4f17d
--- /dev/null
+++ b/srcpkgs/wsjtx/update
@@ -0,0 +1,3 @@
+site='https://physics.princeton.edu/pulsar/K1JT/Release_Notes.txt'
+pattern='Release: WSJT-X \K[\d\w.-]+(?=)'
+ignore='*-rc*'
From 2f577c3214eb7b1d6e8139781c325fd308a81705 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 27 Jun 2022 16:53:25 +0200
Subject: [PATCH 118/608] minify: update to 2.11.11.
---
srcpkgs/minify/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 668b65eb92c8..26e335a515c7 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
# Template file for 'minify'
pkgname=minify
-version=2.11.10
+version=2.11.11
revision=1
build_style=go
go_import_path="github.com/tdewolff/minify/v2"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/tdewolff/minify"
distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=ace21c2009e094c3e985865f52b51e6f20d2b257c3a1335a9d7f3e48b38f6530
+checksum=13b3d9973a4fc1ead30dd24addb89a522bce174e1bced7a418067eb6a6fce0cf
post_install() {
vlicense LICENSE
From 644b8d0e4f3fefd567d82b8f7ff275621976f594 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:21:28 +0200
Subject: [PATCH 119/608] jpm: update to 1.1.0.
---
srcpkgs/jpm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/jpm/template b/srcpkgs/jpm/template
index ff847ba872e1..9aa12fe85471 100644
--- a/srcpkgs/jpm/template
+++ b/srcpkgs/jpm/template
@@ -1,7 +1,7 @@
# Template file for 'jpm'
pkgname=jpm
-version=1.0.0
-revision=2
+version=1.1.0
+revision=1
hostmakedepends="janet"
depends="janet janet-devel"
short_desc="Janet Project Manager"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/janet-lang/jpm"
distfiles="https://github.com/janet-lang/jpm/archive/refs/tags/v${version}.tar.gz"
-checksum=858d4ef2f6ac78222c53154dd91f8fb5994e3c3cbe253c9b0d3b9d52557eeb9b
+checksum=337c40d9b8c087b920202287b375c2962447218e8e127ce3a5a12e6e47ac6f16
do_install() {
PREFIX=/usr DESTDIR=$DESTDIR janet bootstrap.janet
From a267717b0c57272403f18ab6487c3a90e9b04b01 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:22:20 +0200
Subject: [PATCH 120/608] ocaml-camlp-streams: update to 5.0.1.
---
srcpkgs/ocaml-camlp-streams/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
index ce728427d280..edccf5495260 100644
--- a/srcpkgs/ocaml-camlp-streams/template
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -1,6 +1,6 @@
# Template file for 'ocaml-camlp-streams'
pkgname=ocaml-camlp-streams
-version=5.0
+version=5.0.1
revision=1
wrksrc="camlp-streams-${version}"
makedepends="ocaml dune"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
homepage="https://github.com/ocaml/camlp-streams"
distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
-checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+checksum=ad71f62406e9bb4e7fb5d4593ede2af6c68f8b0d96f25574446e142c3eb0d9a4
nocross=yes
disable_parallel_build=yes
From de0640567e198b6944559288184c15a0c5f63f9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:23:30 +0200
Subject: [PATCH 121/608] wireguard-dkms: update to 1.0.20220627.
---
srcpkgs/wireguard-dkms/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wireguard-dkms/template b/srcpkgs/wireguard-dkms/template
index ed6aa026e171..84f0befaac15 100644
--- a/srcpkgs/wireguard-dkms/template
+++ b/srcpkgs/wireguard-dkms/template
@@ -1,6 +1,6 @@
# Template file for 'wireguard-dkms'
pkgname=wireguard-dkms
-version=1.0.20211208
+version=1.0.20220627
revision=1
wrksrc="wireguard-linux-compat-${version}"
build_wrksrc="src"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.wireguard.com/"
distfiles="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"
-checksum=c0e607138a17daac656f508d8e63ea3737b5221fa5d9288191ddeb099f5a3b92
+checksum=362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
dkms_modules="wireguard ${version}"
From 5833072316c3cf4796deb4b7a7c7056b5ab69d78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:31:11 +0200
Subject: [PATCH 122/608] python: update to 2.7.18.5.
---
srcpkgs/python/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 3cbe4673172c..bae1327ad821 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
#
pkgname=python
-version=2.7.18.4
+version=2.7.18.5
revision=1
wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Python-2.0"
homepage="https://www.python.org"
distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=003a4fbd03fa0dbb3cf88d894c40311ef30dd17b2aa85291c3136393148b1362
+checksum=a046ddfd75f439ec2e65af840caa267d1edb4d914d7777d2fbd2f88041c6f3a2
alternatives="
python:idle:/usr/bin/idle2.7
From 8e65ac3069188abed4d489a15152ba0621b25c03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 15:31:15 +0200
Subject: [PATCH 123/608] python-tkinter: update to 2.7.18.5.
---
srcpkgs/python-tkinter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 58658eda5272..94667653def5 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -7,7 +7,7 @@
_desc="Interpreted, interactive, object-oriented programming language"
pkgname=python-tkinter
-version=2.7.18.4
+version=2.7.18.5
revision=1
wrksrc="cpython-${version}"
pycompile_dirs="usr/lib/python2.7/lib-tk"
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Python-2.0"
homepage="https://www.python.org"
distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=003a4fbd03fa0dbb3cf88d894c40311ef30dd17b2aa85291c3136393148b1362
+checksum=a046ddfd75f439ec2e65af840caa267d1edb4d914d7777d2fbd2f88041c6f3a2
pre_configure() {
# Ensure that internal copies of expat, libffi and zlib are not used.
From cfe99393d26765a97cdc5cdd4a78a7135031adcd Mon Sep 17 00:00:00 2001
From: Barbaross <cullen.ross@proton.me>
Date: Tue, 28 Jun 2022 10:21:59 -0400
Subject: [PATCH 124/608] keyd: update to 2.4.1.
---
srcpkgs/keyd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keyd/template b/srcpkgs/keyd/template
index e8c4a1c45a39..39b6aeaff0ae 100644
--- a/srcpkgs/keyd/template
+++ b/srcpkgs/keyd/template
@@ -1,6 +1,6 @@
# Template file for 'keyd'
pkgname=keyd
-version=2.4.0
+version=2.4.1
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/rvaiya/keyd"
changelog="https://raw.githubusercontent.com/rvaiya/keyd/master/docs/CHANGELOG.md"
distfiles="https://github.com/rvaiya/keyd/archive/refs/tags/v${version}.tar.gz"
-checksum=100007894ac4fa6e95f5de5c2fe992c8b00e68d9df76c4bcdd8402a29d7b4058
+checksum=23e6eac529b0c07ad99420c2a8a75967b7cadb0c3509284cc0f7633056dc50e2
system_groups="keyd"
post_install() {
From cd594dfd1cd2b99fcaf297dd3c43b6589c6dfac5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 28 Jun 2022 17:19:27 +0300
Subject: [PATCH 125/608] exo: use raw changelog.
---
srcpkgs/exo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index df5c22224d59..b15a2be8ddd1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -11,7 +11,7 @@ short_desc="Extension library for the Xfce desktop environment"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://docs.xfce.org/xfce/exo/start"
-changelog="https://gitlab.xfce.org/xfce/exo/-/blob/master/NEWS"
+changelog="https://gitlab.xfce.org/xfce/exo/-/raw/master/NEWS"
distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
checksum=722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6
From 0ef7159f84445e97d6c17ff258167cf7ec1dfee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Rubio?= <engolianth@protonmail.com>
Date: Tue, 28 Jun 2022 08:51:18 +0200
Subject: [PATCH 126/608] New package: hunspell-ca_ES-3.0.6
---
srcpkgs/hunspell-ca_ES/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/hunspell-ca_ES/template
diff --git a/srcpkgs/hunspell-ca_ES/template b/srcpkgs/hunspell-ca_ES/template
new file mode 100644
index 000000000000..b9aa920b50e1
--- /dev/null
+++ b/srcpkgs/hunspell-ca_ES/template
@@ -0,0 +1,18 @@
+# Template file for 'hunspell-ca_ES'
+pkgname=hunspell-ca_ES
+version=3.0.6
+revision=1
+create_wrksrc=yes
+hostmakedepends="unzip"
+short_desc="Catalan dictionary for hunspell"
+maintainer="Adrià Rubio <engolianth@protonmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://www.softcatala.org/projectes/corrector-ortografic/"
+distfiles="https://github.com/Softcatala/catalan-dict-tools/releases/download/v${version}/ca-hunspell.zip"
+checksum=1652bd89c43a17f576470b467da2d4fbe128683d6054d1c6a31f9967ae067fcd
+
+do_install() {
+ vinstall catalan.aff 644 /usr/share/hunspell ca_ES.aff
+ vinstall catalan.dic 644 /usr/share/hunspell ca_ES.dic
+ vdoc README.txt
+}
From 32d7a2b2e3a5addae6bbf80c1fcdb87f39567b95 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 28 Jun 2022 10:35:06 +0200
Subject: [PATCH 127/608] slack-desktop: update to 4.27.154
---
srcpkgs/slack-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 6ab5acf70145..6b30c8158717 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'slack-desktop'
pkgname=slack-desktop
-version=4.26.1
+version=4.27.154
revision=1
archs="x86_64"
hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="custom:Proprietary"
homepage="https://slack.com/"
distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=c13fa42fa7f63afbcffb315dd4c2bb626f98d680be86483543f7db78bd63835b
+checksum=65c47c7312de88e6ecf3fcffcf494ca4c1ff2c41c472933a61b05d0713168b98
restricted=yes
repository="nonfree"
nopie=yes
From 86622495aa9f3006e57444e97d09e1932f60ced7 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Mon, 21 Feb 2022 13:19:55 +0530
Subject: [PATCH 128/608] uhubctl: update to 2.4.0
---
srcpkgs/uhubctl/patches/Makefile.patch | 15 ++-------------
srcpkgs/uhubctl/template | 6 ++++--
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/uhubctl/patches/Makefile.patch b/srcpkgs/uhubctl/patches/Makefile.patch
index 429a805e354c..cd24ad3870a3 100644
--- a/srcpkgs/uhubctl/patches/Makefile.patch
+++ b/srcpkgs/uhubctl/patches/Makefile.patch
@@ -1,21 +1,10 @@
-diff --git Makefile Makefile
-index f6d69d3..58a9d98 100644
--- a/Makefile
+++ b/Makefile
-@@ -4,7 +4,7 @@ UNAME_S := $(shell uname -s)
-
- DESTDIR ?=
- prefix ?= /usr
--sbindir ?= $(prefix)/sbin
-+sbindir ?= $(prefix)/bin
-
- INSTALL := install
- INSTALL_DIR := $(INSTALL) -m 755 -d
-@@ -14,7 +14,7 @@ RM := rm -rf
+@@ -14,7 +14,7 @@
CC ?= gcc
CFLAGS ?= -g -O0
CFLAGS += -Wall -Wextra -std=c99 -pedantic
--GIT_VERSION := $(shell git describe --abbrev=8 --dirty --always --tags)
+-GIT_VERSION := $(shell git describe --match "v[0-9]*" --abbrev=8 --dirty --tags | cut -c2-)
+GIT_VERSION := $(shell basename "$(CURDIR)" | cut -d '-' -f 2)
ifeq ($(GIT_VERSION),)
GIT_VERSION := $(shell cat VERSION)
diff --git a/srcpkgs/uhubctl/template b/srcpkgs/uhubctl/template
index 748b10a9b32a..8f14794092e5 100644
--- a/srcpkgs/uhubctl/template
+++ b/srcpkgs/uhubctl/template
@@ -1,13 +1,15 @@
# Template file for 'uhubctl'
pkgname=uhubctl
-version=2.1.0
+version=2.4.0
revision=1
build_style=gnu-makefile
make_use_env=yes
+make_install_args="sbindir=/usr/bin"
+hostmakedepends="pkg-config which"
makedepends="libusb-devel"
short_desc="USB hub per-port power control"
maintainer="Pavel Fatin <mail@pavelfatin.com>"
license="GPL-2.0-only"
homepage="https://github.com/mvp/uhubctl"
distfiles="https://github.com/mvp/uhubctl/archive/v${version}.tar.gz"
-checksum=227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b
+checksum=391f24fd1f89cacce801df38ecc289b34c3627bc08ee69eec515af7e1a283d97
From 0c00df2fe5a5616f80836a73b1c12c87a5884672 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 14 Mar 2022 10:02:42 +0100
Subject: [PATCH 129/608] scid_vs_pc: update to 4.23
---
srcpkgs/scid_vs_pc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/scid_vs_pc/template b/srcpkgs/scid_vs_pc/template
index ed2e13d5d235..4551c49fe0b2 100644
--- a/srcpkgs/scid_vs_pc/template
+++ b/srcpkgs/scid_vs_pc/template
@@ -1,6 +1,6 @@
# Template file for 'scid_vs_pc'
pkgname=scid_vs_pc
-version=4.22
+version=4.23
revision=1
build_style=configure
hostmakedepends="tcl"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://scidvspc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/scidvspc/source/scid_vs_pc-${version}.tgz"
-checksum=3d21c33eb7e1248fc3c845502e8f0291aae0a9ffe2506e4f82f51b3bfe163493
+checksum=e182a4370adce21c579f5f93f4d56eec5c6e19c486bb893dc1f514ff2f070e89
do_configure() {
./configure CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
From 8bb03a4f6a993cb548cba987f0e79ea1e86e01b4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 13:17:24 +0100
Subject: [PATCH 130/608] New package: japa-0.9.4
---
srcpkgs/japa/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/japa/template
diff --git a/srcpkgs/japa/template b/srcpkgs/japa/template
new file mode 100644
index 000000000000..3ac435617fd5
--- /dev/null
+++ b/srcpkgs/japa/template
@@ -0,0 +1,15 @@
+# Template file for 'japa'
+pkgname=japa
+version=0.9.4
+revision=1
+build_wrksrc=source
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel
+ alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
+short_desc="JACK and ALSA Perceptual Analyser"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
+distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
+checksum=b7dc2566bfa9139bbac93a404d60d0b1e0bfadfe1315bb46d17f6d9d376407c2
From 12a7e9cbe66b2dc78bde562717dff60e5acd57aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 28 Jun 2022 12:08:53 +0200
Subject: [PATCH 131/608] hcloud: update to 1.30.0.
---
srcpkgs/hcloud/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 18fd46f72bfc..70a9abba9d2c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
# Template file for 'hcloud'
pkgname=hcloud
-version=1.29.5
+version=1.30.0
revision=1
wrksrc="cli-${version}"
build_style=go
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="MIT"
homepage="https://github.com/hetznercloud/cli"
distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=8a8a0a8ee86eaae329090657f236c8f736c5c67209fedf5047977f8ef8c2afb8
+checksum=12110363deb3d4bb66f4ab0350b3ee220c38d9f9a4bda94bb8396c32c9025e33
post_install() {
vlicense LICENSE
From f5240c0d8c105d13651b78c7360f35ba03572990 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 6 Mar 2022 17:54:03 -0800
Subject: [PATCH 132/608] srb2: update to 2.2.10
---
srcpkgs/srb2/patches/comptime.patch | 19 +++++++++++++++++++
srcpkgs/srb2/patches/libadd-execinfo.patch | 12 ------------
srcpkgs/srb2/template | 14 +++++++-------
3 files changed, 26 insertions(+), 19 deletions(-)
create mode 100644 srcpkgs/srb2/patches/comptime.patch
delete mode 100644 srcpkgs/srb2/patches/libadd-execinfo.patch
diff --git a/srcpkgs/srb2/patches/comptime.patch b/srcpkgs/srb2/patches/comptime.patch
new file mode 100644
index 000000000000..5d0c2167b2ac
--- /dev/null
+++ b/srcpkgs/srb2/patches/comptime.patch
@@ -0,0 +1,19 @@
+diff -Naur comptime.sh comptime.sh.new
+--- a/SRB2-SRB2_release_2.2.10/comptime.sh 2022-03-06 13:52:43.000000000 -0800
++++ b/SRB2-SRB2_release_2.2.10/comptime.sh 2022-03-06 17:05:02.725041025 -0800
+@@ -40,13 +40,14 @@
+ const char* compbranch = "Unknown";
+ const char* comprevision = "illegal";
+ EOF
++exit 0
+ }
+
+ compversion() {
+ touch $path/comptime.c
+-versionfake
+ test -d $path/.svn && versionsvn
+ test -d $path/../.git && versiongit
++versionfake
+ exit 1
+ }
+
diff --git a/srcpkgs/srb2/patches/libadd-execinfo.patch b/srcpkgs/srb2/patches/libadd-execinfo.patch
deleted file mode 100644
index faa8fb25a687..000000000000
--- a/srcpkgs/srb2/patches/libadd-execinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg SRB2-SRB2_release_2.2.9.orig/src/sdl/MakeNIX.cfg
---- a/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-07 00:06:51.901546000 -0700
-+++ b/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-06 19:38:24.000000000 -0700
-@@ -22,7 +22,7 @@
- OPTS=-DUNIXCOMMON
-
- #LDFLAGS = -L/usr/local/lib
-+ LIBS+=-lm
-- LIBS=-lm
- ifdef LINUX
- LIBS+=-lrt
- ifdef NOTERMIOS
diff --git a/srcpkgs/srb2/template b/srcpkgs/srb2/template
index a181643caa8e..f966b5e88a6c 100644
--- a/srcpkgs/srb2/template
+++ b/srcpkgs/srb2/template
@@ -1,7 +1,7 @@
# Template file for 'srb2'
pkgname=srb2
-version=2.2.9
-revision=2
+version=2.2.10
+revision=1
create_wrksrc=true
build_wrksrc="SRB2-SRB2_release_${version}"
build_style=gnu-makefile
@@ -16,8 +16,8 @@ license="GPL-2.0-or-later"
homepage="https://srb2.org/"
distfiles="https://github.com/STJr/SRB2/archive/SRB2_release_${version}.tar.gz
https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${version//./}-Full.zip"
-checksum="5f7eeb08e90323e28cdcb02ad25c904eef25ce75316720609b995a1e4ffd154a
- 48e644604bed81b5ce6b12ef23a2f4042d0118d0ba70f18c534dfe86ebe6f37d"
+checksum="feb3a95a15ea04218282e5c4f01ae3733672e14d219e2792dcfc500dcf89a3c2
+ e69ac5cacc86f85eeaba14644a37cad932f7d7031b667892d2f9ba9bfb437d25"
restricted=yes
case "$XBPS_TARGET_MACHINE" in
@@ -28,7 +28,7 @@ esac
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
- export LIBS="-lexecinfo"
+ export LDFLAGS="-lexecinfo"
fi
if [ -n "$CROSS_BUILD" ]; then
@@ -36,7 +36,7 @@ if [ -n "$CROSS_BUILD" ]; then
fi
do_install() {
- vbin bin/Linux/Release/${pkgname}
+ vbin bin/${pkgname}
PROGRAM_NAME="${pkgname}" PROGRAM_DESCRIPTION="${short_desc}" \
PACKAGE_INSTALL_PATH="/usr/bin" PROGRAM_FILENAME="${pkgname}" \
@@ -45,7 +45,7 @@ do_install() {
vinstall srb2.png 644 /usr/share/pixmaps/
vinstall srb2.desktop 644 /usr/share/applications/
vmkdir /usr/share/games/SRB2
- for f in {music,player}.dta {srb2,zones,patch,patch_music}.pk3 models models.dat; do
+ for f in {music,player}.dta {srb2,zones}.pk3 models models.dat; do
vcopy ../${f} /usr/share/games/SRB2
done
}
From 93f1a00454ad1ae0b90fce96b727e1318e6da32d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 13:30:23 +0100
Subject: [PATCH 133/608] ddgr: update to 2.0.
---
srcpkgs/ddgr/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ddgr/template b/srcpkgs/ddgr/template
index b53bfe8196b3..99e88022e36b 100644
--- a/srcpkgs/ddgr/template
+++ b/srcpkgs/ddgr/template
@@ -1,13 +1,13 @@
# Template file for 'ddgr'
pkgname=ddgr
-version=1.9
-revision=2
+version=2.0
+revision=1
build_style=gnu-makefile
-depends="python3-requests"
+depends="python3"
short_desc="DuckDuckGo from the terminal"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/jarun/ddgr"
-changelog="https://github.com/jarun/ddgr/raw/master/CHANGELOG"
+changelog="https://raw.githubusercontent.com/jarun/ddgr/main/CHANGELOG"
distfiles="https://github.com/jarun/ddgr/archive/v${version}.tar.gz"
-checksum=3dfe82fab649f1cec904a1de63f78692be329a3b6928c1615f22c76f6e21c36f
+checksum=7e46430b0a8c479a5feca832adb73f2f09804bf603dedc50f4cf2e1da4c75f88
From 28a1064e221eba52c1a74363a864c21a4a2cb5fa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 17:08:13 +0200
Subject: [PATCH 134/608] qemu: move INSTALL.msg to README.voidlinux
---
srcpkgs/qemu/{INSTALL.msg => files/README.voidlinux} | 0
srcpkgs/qemu/template | 2 ++
2 files changed, 2 insertions(+)
rename srcpkgs/qemu/{INSTALL.msg => files/README.voidlinux} (100%)
diff --git a/srcpkgs/qemu/INSTALL.msg b/srcpkgs/qemu/files/README.voidlinux
similarity index 100%
rename from srcpkgs/qemu/INSTALL.msg
rename to srcpkgs/qemu/files/README.voidlinux
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 042ba79299e1..823caa111ba9 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -75,6 +75,8 @@ pre_configure() {
}
post_install() {
+ vdoc "${FILESDIR}/README.voidlinux"
+
# qemu-bridge-helper must be setuid for non privileged users.
chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
From 0da7513ade2a5e212e42d6f4a0bcfe9f6d422ee8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 28 Jun 2022 17:48:17 +0200
Subject: [PATCH 135/608] vim: update to 9.0.0000.
Adopted.
---
srcpkgs/vim/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 2e55873e45c3..e1ff9731c83c 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,6 +1,6 @@
# Template file for 'vim'
pkgname=vim
-version=8.2.5083
+version=9.0.0000
revision=1
hostmakedepends="gettext glib-devel pkg-config"
makedepends="acl-devel ncurses-devel
@@ -9,11 +9,11 @@ makedepends="acl-devel ncurses-devel
$(vopt_if huge 'lua53-devel perl python3-devel ruby-devel')"
depends="vim-common>=${version}"
short_desc="Vim editor (vi clone)"
-maintainer="Neel Chotai <neel@chot.ai>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Vim"
homepage="https://www.vim.org"
distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=6a40f4eb8db1e3d5ac453a281886551afdf4f54dafa334676bf4bf663bee3243
+checksum=1b3cd3732eb7039cf58a9321de26ab1a12d81c2f6760eb03c5d7b60d548f4587
python_version=3
build_options="x11 gtk3 huge"
From 1d454833117445ecfabb87e15af7f38c91a2eebd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jun 2022 09:38:17 -0400
Subject: [PATCH 136/608] python3-pamqp: update to 3.2.0.
---
srcpkgs/python3-pamqp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pamqp/template b/srcpkgs/python3-pamqp/template
index 1a22fec84fad..fc2e5ba8f8b8 100644
--- a/srcpkgs/python3-pamqp/template
+++ b/srcpkgs/python3-pamqp/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pamqp'
pkgname=python3-pamqp
-version=3.1.0
+version=3.2.0
revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://github.com/gmr/pamqp"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9fc37561f68bde122e2a86ddb8caf9c758d9780519ee2bdcc1d3ce3a34941e3f
+checksum=56bd552a3baa3b506845727eb9acf0f1a00c5272f4ef7fcf5fa4c4d6e476502e
post_install() {
vlicense LICENSE
From 44d45c823539f53608fde4bd123f9a7e001a028a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jun 2022 09:40:33 -0400
Subject: [PATCH 137/608] vkQuake: update to 1.20.0.
---
srcpkgs/vkQuake/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 1ca876fe6927..88e2b0eaf0eb 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
# Template file for 'vkQuake'
pkgname=vkQuake
-version=1.13.1
+version=1.20.0
revision=1
build_wrksrc="Quake"
build_style=gnu-makefile
@@ -12,7 +12,12 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/Novum/vkQuake"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ceb9ee46135309f7caf94267539cae70b47ef8edf104e3901b89d3aee7b0b874
+checksum=2ff682a4b289607c56200d9d0920e3a360fe1b8aeb8cb39d4e0f4b460f4ad744
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+ LDFLAGS+=" -latomic"
+fi
do_install() {
vbin vkquake
From 0bfc3d555dc6104b1bfb8638a57bc43d71d0b70c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 28 Jun 2022 11:46:32 -0400
Subject: [PATCH 138/608] zfsbootmenu: update to 2.0.0.
---
srcpkgs/zfsbootmenu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 47c4211f859a..3e27d86b9c0d 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,9 +1,8 @@
# Template file for 'zfsbootmenu'
pkgname=zfsbootmenu
-version=1.12.0
+version=2.0.0
revision=1
build_style=gnu-makefile
-conf_files="/etc/zfsbootmenu/config.yaml"
depends="dracut zfs kexec-tools fzf bash pigz mbuffer ncurses
perl-Config-IniFiles perl-Sort-Versions perl-boolean perl-YAML-PP"
short_desc="ZFS Boot Environment menu, implemented in Dracut"
@@ -12,7 +11,8 @@ license="MIT"
homepage="https://github.com/zbm-dev/zfsbootmenu"
changelog="https://raw.githubusercontent.com/zbm-dev/zfsbootmenu/master/CHANGELOG.md"
distfiles="https://github.com/zbm-dev/zfsbootmenu/archive/v${version}.tar.gz"
-checksum=b90b1a055fe5744fb34a49718b49265e800f8f6e19456c3fa3619a48a036f359
+checksum=466496e896a992fea9d46c55e48c6fcec1ab62b7022476571f0c41c015e31b13
+conf_files="/etc/zfsbootmenu/config.yaml /etc/zfsbootmenu/mkinitcpio.conf"
post_install() {
vlicense LICENSE
From b79b59fae9be2da660823daa45d559dfd9a91631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
<sigrid@ftrv.se>
Date: Tue, 28 Jun 2022 17:44:49 +0200
Subject: [PATCH 139/608] cpufrequtils: enable on aarch64*
---
srcpkgs/cpufrequtils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index f29bb4155f6c..7b3bb14774e7 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -15,7 +15,7 @@ homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git
distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95
-archs="i686* x86_64* ppc*"
+archs="i686* x86_64* ppc* aarch64*"
post_extract() {
sed -i "s|/usr/bin/install|install|g" Makefile
From dab9211501ac75aea6bf149c72fc900feb4f436b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 28 Jun 2022 11:07:14 -0400
Subject: [PATCH 140/608] synapse: update to 1.61.1.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index ce748cc3a452..6490cdf94035 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.61.0
+version=1.61.1
revision=1
build_style=python3-pep517
make_check_target=tests
@@ -22,7 +22,7 @@ license="Apache-2.0"
homepage="https://github.com/matrix-org/synapse"
changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=3602b4a01688edae8365973877220a0511cb3970ff4e32eec759ca070066a684
+checksum=79b216330a22711521d0ff6694c9f12e40de7e7345a1601bac22021fcace36fc
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
From 98e1836aa4a21bbd1694b9d1da87ca7d21b1815b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 27 Jun 2022 20:05:57 -0400
Subject: [PATCH 141/608] qownnotes: update to 22.6.2
---
srcpkgs/qownnotes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index db79662ba4bf..a961314e3908 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
# Template file for 'qownnotes'
pkgname=qownnotes
-version=22.4.0
+version=22.6.2
revision=1
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
homepage="https://www.qownnotes.org"
changelog="https://www.qownnotes.org/changelog.html"
distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=96b682608ecdf303e2c5d5eb2341812db3c3848e15bc4832ba5d426f01bdbd66
+checksum=adb3be2cc6d5fa24f2e9e383c8843c7d795c34f0b85263efa1580f935600c99a
pre_build() {
vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
From 583296d24e7fbbf30644911b645ab66fce218273 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sun, 26 Jun 2022 17:17:34 +0200
Subject: [PATCH 142/608] cpuid: update to 20220620.
Closes: #37695 [via git-merge-pr]
---
srcpkgs/cpuid/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 4c651ab451cd..aded1c55f137 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
# Template file for 'cpuid'
pkgname=cpuid
-version=20220224
+version=20220620
revision=1
archs="i686* x86_64*"
build_style=gnu-makefile
@@ -10,4 +10,6 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://www.etallen.com/cpuid.html"
distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=4a19de2a118aee44f856cd1becfa5a192574b5957795372a86e37dca24da1f9d
+checksum=9159a1c095a6e44c6ca6306c5080bfe2a7bcde25e8dc16f06f5f874d7732cb1a
+
+conflicts="msr-tools"
From 1758a354c6b9c951ba9d793f5ec6dbec11677e4b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 16:36:54 +0200
Subject: [PATCH 143/608] firefox: update to 102.0.
---
srcpkgs/firefox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 59d0c5cf1866..0684b67f6f13 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=101.0.1
+version=102.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b4c76e8bdf81f473f3e56b2f69dbe5119bba5cab38e36ab0f3f38cf0cdc4a9c2
+checksum=01797f04bd8d65f4c7f628d7ce832bf52a0874433886e4d0d78ef33c1ca66abf
lib32disabled=yes
From c0d07248645ae4984234bf2a204e83fb4272c65d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 16:37:04 +0200
Subject: [PATCH 144/608] firefox-i18n: update to 102.0.
---
srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
1 file changed, 97 insertions(+), 97 deletions(-)
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index f1d8480adcf4..c767f1254fdc 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=101.0.1
+version=102.0
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
}
}
-checksum="ed5be7552b72589432c44cef4446208bc7f94fdbbf8c7a46aafc83f223a6d436
- 0aceb525734b1e5647f75d6c0ac3b14131594c7fe1e7fcf7a7c8be8d920c8a61
- 02c4c0d865eaa1508a8c660f312ba3947bd15ede09eb9dfcbf25e31bd6370d63
- d71038f9da1773305ee7ff69808ddcd460196795049a5cfa97167fd224345f49
- e400acc7af52b6d7bf2bff2fcd4d325345cba5b3d1f8d417023020cd1a1e2eec
- 15de0f52e2484e77be071f987dcadac15f05f93c4cb676f023d037ff64f8408b
- ee849e83a50c3a69b22ba93e253d5a99a9793be738232ffb3bac0c078c78bb52
- 1feefc2c94b6dfacb868c91ae1aed6e63b233b4e3a2f1043caaeb8161e62be74
- e8657525629fc6dc35149b629a379bebd006b1b9d41845be098f3bb8ec6ace67
- cab077c643a57f10b9c474277bd0b191cb6e25638788ac15c9e176ee393d2393
- 5ae7f71bfd39956b8553446feaebb047ddfc520459f275e8765bf917696ff4f0
- 19c322ee28a0b89bedcc7f20fb85857fb1d5bbcc6c6183d54f965165d42962d9
- 2c6ecd3ed59d14cbd5834259b4a258fc1513f6d8e09aa14e96467f5821ecd6bb
- 03f4fc349e1631d5883b5c2a5f601e57e01ce7945f3f08f970f413b5a8411f77
- 3c889dff21cdf6e6c261e160c723e21bcbe87dc28c3c5687275b35bcc42ecf47
- 569db6c6aef1a3dcd634c7f3dad0cd4ef5d7fdd9bc4b7e37003fb8fc9ca52d04
- 1abf5e0077367234e2363c4b531a37c6e0c229794c3aca5f2ff83cfb661f0576
- 88dc29afeb4e10b81a352902804705ed1b0e3abd03aa9f20e5896dcd0febd185
- 14e0a939d23596c8370b03189fc0d0bc0a6eebbfa40b00cfe2e5368c0282b33d
- c286bd9ab2237fc2262b5e08230209254ef545fffb0e3fe36645f12ef14d4cda
- 66875ff542436d2f6c725efb81c820c7a7ede37f0e925c2305c44999544133aa
- 5472ee129514179a5ed866564e8778af1092b9516206aef9c8d80e028386c5bb
- 694a1f37b26486ebe10347ee7253db720aa1fd560417a35bcce05e2522846946
- 1a99f781645c1d20a0b00bab9fb7fc5c51f298648225751d3f6fd6f8702cb8aa
- f741d5c6acfcc9cc5b856b1061eba22e4c441a1b4911d5d9c2ebc0cfcda8d0e2
- 787fb1a1e55ae88a1511a118bca51a94cbee52bb1d735aead9a53642f8a9896f
- 204ca0c4a8007b027042affe98f68a06ed931daaa240801ba0d8a6504a41f292
- 7cff5d7e596e7b1016d62032e676e6d9ec241f0b2d2662d2aa85978d8797ca41
- 173cf3f1db9977cfe8970b10b4b2488bf17a95b5d70f7aee105f57c975c74b98
- a190cbcf63bee079efa4efefe8374729208150959176546b9ac4f4dd67dcff31
- c55e07086edcb10b74d0948ec7807fdd86b51527023f7d48e600544f54eacda4
- fc6b2f5d1ffa0334e2323c0dbea4acea081854b76e458e3d03ef723e72f042c1
- 65b1d5b59587860e8851bbcdb43908d9fafb2e82b8f453b6f7679af80db10c11
- 7c0c575216db5741975ddf6fac5515654f965a294c55a4b7c4dc260ca32ecc96
- 472325c726434a8b1415afcb2f1f4beb4e64e84cd7bfeeeb325b170f83608467
- fb5738328cc412fa9d766d60046b2f48368db912bd2fa77e58ef108053c4d700
- 307786457a572b4c3a4944aa9786ce5f15556cf025355add2296d4b509f97e1f
- e20d65ca34bc1de29484f18c4f2d419737419b4d9d974a9a1ea50b622019a22c
- 32dc9d36318a6b5b4c5b5b043499d32da01ca5766087fb04d6b407c2e23799c6
- ad87c861c2534d56a8552dc27cdf765dc13769c11bf93afcfd3643cba7fd342d
- 75bad5529ff59be3ba641fffc7e419b459cf9b8b788ca79b6ad0c34d8301a67a
- 3ad4c7510b8ea15e7374b16ce67c7d9573f34d918b769fd618567bb5fefaa21a
- 80443ab4873bf78bfa97b640bf7870db5b0539c658d52bce442de2f9087c61fd
- c264effcb13fcb8ff69aee2f297998b6707253f1c60c135c0bd3a6c31101e91c
- d32b27498f9ca1211d585dceaa07c502f4dc113aa8f69ab8898f3a7abb9bf983
- 275f4da7e7f99544ef11f3ba29eed96fa1fe46f3300b5642c3b552003909309c
- 8a37e9727154f77e502ad8cc1e692287662a600adf99aeb534adbed751c1e2fc
- fc8c453a640b329fd86e8711ff9f5c2c2a810fba4231f42d551cb881261042ef
- 4617409870b80e777b5831e13bc50537bc881b860a99d89721e8cd0123ecc095
- b24c7fa37c8db9a31e180495e881447df8d186df1e600983010fa8d24e102665
- b280609c17a7fa30b40e06b123515752b0cc31015bc737705bcd596f5b54194f
- 7c680a3447c386bbe787c94ebbf53422792230be6e5fe8317cf570ea4fa81160
- 01306b4cf4455eb0c8ba4511e586ef6e0dbaadb8001696ad46b5cc11c50e5dde
- 351b9e1a91ce19449f0bfb444fefc67ae7e3c9cb284c121e5275fe6ebd1a32ae
- bae7bc95eb40c272efd4cbabd053c88c58b32e0797f1109a33bac26acdd3269f
- 7a0e0a3b0bca1c85c754a90da279bfa9c81aa23bccbc3beff48367bdf99e061e
- 459abe53c247de6ffaa15ffdc4076fd7eb98329ab721a9b7d046f2dde9080f10
- eabfa6ed9c4fd559bb95a7afac8e0d72bd761c0fd25f9b2fbc2dfc4e561b7c19
- a9c3a787c4ecac6e0e0893a27c04347d919fcd8e45eb9a527d8d3408e93c8ff7
- 31b0eaddbb4637a65994576d969c14b53049161e26475c8446d209f149f51ba7
- 7e6eb8f127014388b1f46da1849e033caf80b351c341a1a345e6556d7b419098
- 56168c028d5cde120c1319d902cf8086d9993d76a32ba9233a09ade20897ae4f
- 7a14c159efd1bd940cb4c1d7c019b14e7f8fddef8a70f1416fc0d5d9c03a64e9
- 0f87061b5f9f3241eeeef54808023eb8dc5b5da542b6bb5dcce3ac7028eac667
- 850048e1edd47f618df235e396fb425ed95d5966da392cd5a775db1fd369a116
- ec12fe50526317b04d19b559aeb728b36b4cac323266f2d509ebda41c6571a1a
- 86e157ffa5e04dccf08ac54d9d9f6a7cc3d5dd8a6a159d076d79e28e6a7efeae
- fa3d06b57a1c497841238818e0235872e3eaa92a1285fff72652da8a33629709
- 10e2ae7d974c094644ea0bc942bafc724a92c593d301af38105d4d38f670b444
- 33a05876f3db5b4759ac0fbb183d4a148bc2c21e02a98ba399e55e07db4fc243
- 1fe5bb3bd6704d67219013d14054a85329c31a7ba4d0102d31f6e92d7c8d853d
- dc4bcc6f83176bcf3b4592e42028c313336e7fcbf923640db3421dfc683457a5
- ecfa7cbd39c083217975570ca9ead77b0a9652d6ad0900a59a46a74fe3b0a83b
- 90e4366784389fc2ecc1eca995c65d49de03e18c5027884e830ed41ede1795d7
- 9a8de63c5ea8613174efd78951b7d07782eb340a3112dde85cc7298edbcf2a8b
- cb260111748e7ca714e8ed19259fcd42e29f52269191ef42e584d501436cde93
- 0b07daee1594196377e8fa8cde38440781ce528d37e32fa396c9ebda24a5d38b
- 6080231954304e786b4511fceced3430a43708399bc43421ee032efc13fa4be8
- efd3f46a9894cf014fcab2c0440d424f9845576f23af975b81c8ec417004876a
- 2af0504ec8e35a7737be66320e0bff2d3fe06ab0b463b3bbeb563e8ff5a4d9da
- 5ddbb04a69131a4b909d91c99334f3821de1f7cc4b4b435f247f94970d36016d
- c846e1ed79a76994714a7cd1341cfa4e87b7e7bc874a305732d207451bfa7510
- 2bda954e26ce2d640a6be009171feec861fa7206e798fa39119341831448a25a
- 64bda1ee9682427bffc30607eb9eff48cd0f362186e3fe6a746671b33552893b
- d081fd3c0d75f96503fa7092fcbe127b98f41c69eb75a2f776de66bdd413f2a6
- b02caec19d30f1f123ff6ef303e55d36192c9b9fd18c887f264ff7cd49386515
- 0a54a6dffc32d7782b05c6696304510be94e3ab25fb941973b68801660fa990d
- 1714f28f03c6a655957f428573c26054b4bf6d558724844325d63c9154fee1d0
- 6f42d07f07fa58096c97106d632d5319c516d9306ab94b874a8716d4da59e761
- 0a7c14d11ba323b0fbc6e111d6e641cadd1e0e3bff9b1ce0d6dba6712c575c99
- eae673d6dafa7ac0f030392bb096d10b81b04f479f59b0c53987d1d76ddf0da6
- d48527ed3cd53ff6519804de1dcca284e548d08e145849e0e5cd1a179ab00279
- 753b92a8524164a261668594482d62a5c7c46068561ad08b8c06a9526ff9d413
- 794972ec101968df6317a076a6a7c9300abffb697e04cd51f81885ab23b6cfbe
- dd2e57795f858d01aba47dde88e75b9c238e7cb15888c1f39dcce28214b356f3
- bf6078b5ca9ea99acb41ee8484bf692498b9f14aa94b52facbe4ccccc2e21987"
+checksum="25377f70be3b157611ba7a23422ba5d56a27bc83dff3664a7659d1f0ed29385e
+ 0ae9e26a2dae23a158a88a3b1d0aba7d7ca47510fa1f0c3318d0434eda6ccc15
+ f74bc0f0eeea4f6cf6308e48f5e9bd7465bbd29addb2040f5f9c8fa2120e9871
+ debe58b15334f4dcb95be4a8e9903702564eeccf2eb70f4d711782ba062999d6
+ b361440b296e8657cc6fea1966d4b4eb875e09240ece4996ad0e8bc3d6bfe8c4
+ eaf1d5514d0da291fd5e7f71bf4fdc9f7ad9f3b917f865ce5c9b99d51a1b79f2
+ 9d2b466b49543b45fd8a76c33a541cb84b091541148d6d537ee06ff40d2367c2
+ f11fb7f609c8f7b79717d7e600f8d158bcd3d0d45e09f4141c8da81be4eb773c
+ 6fd073f9ca64d0c570373dc51e238c2d7330b3d2e59c49e5238b6f34a26388f6
+ 55ab7157f0ffb6a353585345d0d7ef5438f93776850f71860c3379e887781a54
+ 2470882400d197973dfb89f33002ff08a20e750048d524e566e28fa0a55a98c2
+ 5fe0df8ea7af8e78a61263afefc6b2cf926ae7f265303a68fe08133ba0630e74
+ 908654c162e05561600220ed6717df9a58c01676450dec5473d19eb1dfb05277
+ 2ee25d54f2279fe5e9c152858d62c49e099466c7eecef1c116f9318b12eced09
+ beb27d76bc8006310e9db3a3737b6d5ce4ac6cd382a3fe7f856768cddea4cd4a
+ b2ca58e0053763bcaa7c5e7b1422daa1bd4f1977fabc1408fcb5aa00b5132e76
+ 5b06916ad46a261e399087ef0add54ab754f73cc6375959a5a484256ecd1ddb8
+ 9f47ebcd12c7d77eaba1cf86c159644d33529778eaf9734effc6667aa737d040
+ 66be782cf1c15a8c89febb594a2984c5c01f4f6adcc9cc90a32790e5da721874
+ af995cbe813fc58ed5db3e298e55af4c89c392854efb03f73a4c0532b9b9e9f2
+ 41bb36c560832efc235a4d2b6dc3c9bf482e7e54e23a7ca086031b2c78eaa4d5
+ fb46a6806a1afe016afcba95b8790a631c0ac93d87c575d5533e2f302bd4aa72
+ 3d7cd55f4dc1a8c30dfa20696d81e4c30258fc7a0450e22a56a398d79008f8f4
+ 28701f521eb95414acba715c4d3e38626ae3a2c5ba39a9cae78ff9783c17d1f2
+ 2fe1ac59bd8ee2d813723fb941a3aac234dea60d3966d1fbb436d21bbcaf7544
+ dd751857ce60a1a8f203f6541477abb3eb9c37a9ea720ec94e15e1a151500caf
+ a11beef824c3c59bc567c5e582b832b31ee43020b085e3d16d1611b670b0be4d
+ f6cc564e119061e545163eeb1e21dd9e6009259f135bed8311bddb0c9fdf2da8
+ 40d28a7f4ebbbc50f0a75e2a1b99c60c6b48b333b0d361b02692b5b34d666efd
+ 97f3825f0cd1a72e86b5f27ef4a39b59f9a5cd23a3871b85f9d35f6a5a0e56a2
+ 742e978e7f2f3866c99225faf6b441e80d8185c2496fe6a578e782fc448164d8
+ 75dc712421be5ca9df31fb24a98aa814a59760246c0500daf9fdba58873573d3
+ c8bb018f9015e71f53b84e84e3788ea36ce67e68df1a73b9e390a1bcfe54bdae
+ 89b3f698bbe3767920cbd1774afc42640a96b0b47f9012b19a824cf8284d470e
+ cfdfd54e4af8984c9d0c7f2c7ba1394870a0c09ca8a356204daf7bacab9e487f
+ 6b1eee73028edd3bbdfb69edcbe72c346ede385ec8689da70cc7a6aed435e6d1
+ d7a3a0710e450af2ea0e3887bea396bcb7f8618b5077b764a57cb5c622dbd6ef
+ a32f4403ac5a271994360670015754f70e44049fd64dcc04b84e34c2b6a6a8b5
+ cbbbeb833be4649eec828b4dd4230be95c1d4b44ea07350424532d3753eb105b
+ 171dd89ce80cc9834931f54d4704fbc18efc4bf24c0bd8ebedfb2a8294ad9c6f
+ dae98ac17129518186a8977726540f898f289a606a98e4984e282c0297347224
+ 676eb31cc4b56817584734dc78819836c6add0a46dae97462625fc6ee6ffa19c
+ 606779e0cd35849af072153235e2e607e1ea2365721e5a85b3acb7a145aadde3
+ 3d370f7ed9bc65553eadcada425ea4aec7bd2acdbd6802f09781def4fafda88c
+ 6b1c30670eb2b4b6cdca086e44ada1958de18dcb2d405304dbec15ff846ad009
+ 789facabc76813995b8a6e156f9941cfbaa0dbb63e969625ed10f90fd9859afe
+ 53674e753e7144698b15be7811313c618a3fac0a3fd58928b0276edaa5b3c211
+ 4755c156f3300673edc4dc8d268ce522ee52f31252230295bc96f761779fca47
+ 4070ea5c60459128f5e5686b70a7edd6429769e6ccf701759346f8fbfb24119d
+ c15cff8a847748c1dd08e882d040514c696a2a514f803a055f145e157d8fd72c
+ 0a23a489ebdc3c16fd1fbf837620e8424b185819a7ecce709baa5a8a9aebeec0
+ f8032c6af9aadd277fa0de7f13fbeb52d32ad444d9f112fe8add3232e2dd16fd
+ 5e1a9a559b5da812fc51a5a8fcb1a94b6a86be1703e44f3ed075302cc4071b1c
+ 387cb04f594820410f0fa4d530b810e2a04c03b70e84d021623e644bbabfd5e7
+ 6527ec912e51885c5a3e2c007f7bcb88fce91ed106df71a10c6435f7e686ed04
+ f5071a4db9872d687fd5b8ef4e0c51de6db3f30e8cb07f4847a5674f7e7d5008
+ 21eadd5ffc305c7f0a3959b341177509318ed0c4b6758831248ab37fcdfff806
+ f008c0c0efb76842f110749662a2026c2517786a60ce0026f124845ad34ebd0d
+ dfca65617d92f564e25e08edfe0672cf16562f0998684e6f0819e3e9e150702e
+ d58c76e234c70b822072677324cc73f0979846813d06033dc17eaa0a63672460
+ dfae73801171a2923bf5c27f4a72feba091934cadae06d6d736ca6d2a16d6e82
+ f41a20958b14becd880a6ac7d0c21fc390ea0bf63617c96a049933f5dbce7f66
+ a83ac8437ecb29d0baeb5d64e4cd6050a1efa1bf6459ebe7f6d991110c6615d4
+ cb54e39194fa58cd755bc7881cec7b8657588427826209d11737c415ccd3c640
+ 34327a1035b5b292e1c46e164f48ccfceb0415f34f83d82b0744c92f4cf28d30
+ b73aa26d1be066a6bcbdf0b11bb5b5ad8bae2b7e0c6773bfd62454bea8ae481a
+ bcfdb924ea6f3b4cdbf5521295ed22033d5c8115520c145f753077fb2d727479
+ 379a31c14fd2f8b8e76acfeccff61f67ad1abdfbf886e81aee47162a3cde4c09
+ b720183fc8b170c34667c1b0be47bebcf2d6a30eb20da4177a317c11fa038555
+ 6f8a589a8b09650637bf8ae278125ec4a1a28fa8ef563d90789e9a182616abb8
+ 0a672a833fe8295e351c660f55aad2be99833da2f64265e1750db6380cff718c
+ ad5b61df6118cf2d6758510c0edd76ee4fa5e9ea66fc0f8385eae7b204ea36ea
+ 2b54612de252ad8d265158080248568315ffbb4642862a33fc3df23d0f7b7c1a
+ f04afa4dc0f17bffa28cee2c7f95cf55b23aa03356ec2fc09cc4964f787a2fab
+ 056d3aa6a9b0357640657124071939df409aa6b8147891b0c2328ccf3ff2ac7a
+ 6ad37899cc9c2c2f1ca4c500fb3d94b01d6ef7c793386ae1c37270173d26ffac
+ d3c5ea071789528330ff1b611615292bdaec0469161aacd7aaf752998a7557f9
+ 4cd4cf50780abd1a59eca4a47a528990fa671d8469b686d4066a77750cfa5963
+ c34654930dcc9aa4f53e1fdc483301353d6142df8c811fdb9185239bbdb0f604
+ 326e2fb597e013b617b74b01fc82c4bac661e1602290f37ef357babbcf4c1c4f
+ 7e70f23a8e3c2c249e561d5bd8ecb161d338d312a7f9abff84a1b1d5f277685c
+ a58146804a5a35f298d9a8218dfeb86050738587a836c0a7cbbfdb487dfb34ba
+ 9c80904e23a9c3478eb714f06b2c32d93553a8cb446f02b02d1d652f64527a77
+ c979e494142bfc96903cdb0086f62fe55238e1591da50f36f14ec0a8c7616c41
+ 0dbd12b279e1b4cd14b4b8b7679c96a19f118b57db4ff4eed000bfe862292e30
+ 53fc2bbeb3e9293eb64136951448ec18992e3db9793b691b848de581e4fd4075
+ ba2609b95599e9de602c823a4c8d9261dc46ec00fadcadb230f8dcba4c2af4fc
+ 12e3246e7f0e899f7f0a0fed599d498d7bbdb4c9b879f6bfc87056ccc2797188
+ b81715fe9f6183e6cb464201b338b74c1cac801230670af5756b07dfed879a3f
+ 59b04edcc84cb780ca88cab59f174e31c784290a74db26834ace3736d222ba1e
+ c0029cc6ff583e661f47f8e72bc506e3ede3dd1b5589a90057ef8450f06a53bf
+ 248a74746a834cfaba19efb4bcafd7e50cd42786155cd902d35f77f8ad8e6f7f
+ a4d636d08218c5a866bd405e79f16b9efe7e3692b56fb306e4b16f07ef0c0e53
+ a3544cc263415916a1fa5492298d91a37de08edbccabdf0f4f08cae1eea8d014
+ 585ba6b38a0e05b44889c5b3a228248b239c5ff5da613ca6f27a87cace35cf45
+ 768fbd9d0bd85f99d955d5a426319c8e07af7edc98178cc066a5984175c87d18"
From 0ecb7a3c6bd1a1e340f5fd0b6ecac93cf25fd96a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 19:59:45 +0200
Subject: [PATCH 145/608] dialog: update to 1.3.20220526.
---
srcpkgs/dialog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..00f5be8f5b48 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
# Template file for 'dialog'
pkgname=dialog
-version=1.3.20210621
+version=1.3.20220526
revision=1
_distver=${version%.*}
_date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
homepage="https://invisible-island.net/dialog/"
changelog="https://invisible-island.net/dialog/CHANGES"
distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=858c9a625b20fde19fb7b19949ee9e9efcade23c56d917b1adb30e98ff6d6b33
post_install() {
rm -r ${DESTDIR}/usr/lib
From ce86cde9c5afa5b1d5cc33747089fa3f241283f4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 20:00:53 +0200
Subject: [PATCH 146/608] dateutils: update to 0.4.10.
---
srcpkgs/dateutils/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dateutils/template b/srcpkgs/dateutils/template
index 0f08283ec917..6bb758dba919 100644
--- a/srcpkgs/dateutils/template
+++ b/srcpkgs/dateutils/template
@@ -1,17 +1,17 @@
# Template file for 'dateutils'
pkgname=dateutils
-version=0.4.9
+version=0.4.10
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
checkdepends="tzdata"
short_desc="Nifty command line date and time utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://www.fresse.org/dateutils/"
changelog="http://www.fresse.org/dateutils/changelog.html"
distfiles="https://bitbucket.org/hroptatyr/dateutils/downloads/${pkgname}-${version}.tar.xz"
-checksum=790256d9949b96001fdcc3f7c42226dde4fcc87eb580717c7aabf51a1334c9c3
+checksum=3c508e2889b9d5aecab7d59d7325a70089593111a1230a496dab0f5ad677cdec
post_extract() {
vsed -i '/sysctl\.h/d' build-aux/yuck.c
From e4494fe0dbf5681fc64da605db8f80c3bb28d57c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 27 Jun 2022 18:46:55 -0400
Subject: [PATCH 147/608] rofi-rbw: fix wofi support
---
srcpkgs/rofi-rbw/patches/wofi.patch | 28 ++++++++++++++++++++++++++++
srcpkgs/rofi-rbw/template | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/rofi-rbw/patches/wofi.patch
diff --git a/srcpkgs/rofi-rbw/patches/wofi.patch b/srcpkgs/rofi-rbw/patches/wofi.patch
new file mode 100644
index 000000000000..9627b6771b3c
--- /dev/null
+++ b/srcpkgs/rofi-rbw/patches/wofi.patch
@@ -0,0 +1,28 @@
+From d059d0a4f352d295c116639798f8b5e110967e4f Mon Sep 17 00:00:00 2001
+From: Fabian Winter <5821180+fdw@users.noreply.github.com>
+Date: Mon, 27 Jun 2022 20:55:21 +0200
+Subject: [PATCH] Return correct values from wofi
+
+Returning no targets might not be the best idea...
+
+Issue: #51
+---
+ src/rofi_rbw/selector.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rofi_rbw/selector.py b/src/rofi_rbw/selector.py
+index d2c9844..e5d8696 100644
+--- a/src/rofi_rbw/selector.py
++++ b/src/rofi_rbw/selector.py
+@@ -198,9 +198,9 @@ def show_selection(
+ encoding='utf-8'
+ )
+ if wofi.returncode == 0:
+- return [], DEFAULT(), wofi.stdout
++ return DEFAULT(), DEFAULT(), wofi.stdout
+ else:
+- return [], CANCEL(), wofi.stdout
++ return CANCEL(), CANCEL(), wofi.stdout
+
+ def select_target(
+ self,
diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template
index 37dc916c12d6..5a2ef1eedcec 100644
--- a/srcpkgs/rofi-rbw/template
+++ b/srcpkgs/rofi-rbw/template
@@ -1,7 +1,7 @@
# Template file for 'rofi-rbw'
pkgname=rofi-rbw
version=1.0.0
-revision=1
+revision=2
build_style=python3-pep517
make_install_target="rofi_rbw-${version}-py3-none-any.whl"
hostmakedepends="python3-setuptools python3-wheel"
From 15e1a50b41f26c6422987b05bae441ba5abed333 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:02:16 -0500
Subject: [PATCH 148/608] mesa: update to 22.1.2.
---
srcpkgs/mesa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index e57a4b116683..481a3ec15b63 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=22.1.1
+version=22.1.2
revision=1
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=46940865ffe794db73ac2bc7ab7ff2570042a0b61a8ac43ca1688863e2bc0ef1
+checksum=0971226b4a6a3d10cfc255736b33e4017e18c14c9db1e53863ac1f8ae0deb9ea
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false"
From 7da114e4d371d6f4dcfa6a5bde1d3c9d63c8aed2 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:49:10 -0500
Subject: [PATCH 149/608] mesa: Enable llvmpipe for i686*
---
srcpkgs/mesa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 481a3ec15b63..79d1c638443f 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -32,7 +32,7 @@ fi
# especially on big endian it's all kinds of broken, and e.g. on
# 32-bit powerpc it does not work at all, so fall back to softpipe
case "$XBPS_TARGET_MACHINE" in
- x86_64*|aarch64*|ppc64le*|arm*) ;;
+ i686*|x86_64*|aarch64*|ppc64le*|arm*) ;;
*) configure_args+=" -Ddraw-use-llvm=false" ;;
esac
From 2aa8483ec5e5c8d73f6d8a7ecfe78c0920943ea8 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 17 Jun 2022 16:52:56 -0500
Subject: [PATCH 150/608] mesa: Re-add HoneyComb LX2K patch for aarch64*
---
...ch64-force-persistent-buffers-to-GTT.patch | 39 +++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
new file mode 100644
index 000000000000..725a306ec30b
--- /dev/null
+++ b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
@@ -0,0 +1,39 @@
+https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
+
+From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
+From: Jon Nettleton <jon@solid-run.com>
+Date: Fri, 14 Aug 2020 13:36:08 +0200
+Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
+
+This fixes a glamore corruption issue on the HoneyComb and by
+internet reports should also fix problems seen on Huaweii
+Kunpeng hardware.
+
+The root cause of the corruption needs to be worked out, but
+this patch also adds a noticable performance improvement. The
+aquarium webgl demo under chromium increases from 39-49 FPS
+when 5000 fish being rendered is selected. Glmark scores also
+improve by ~200 with no specific tests showing any regression.
+
+Signed-off-by: Jon Nettleton <jon@solid-run.com>
+---
+ src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
+index 6b58aebee2d..c9e983367a0 100644
+--- a/src/gallium/drivers/radeonsi/si_buffer.c
++++ b/src/gallium/drivers/radeonsi/si_buffer.c
+@@ -151,6 +151,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
+ */
+ if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)
+ res->domains = RADEON_DOMAIN_GTT;
++
++#if defined(PIPE_ARCH_AARCH64)
++ res->domains = RADEON_DOMAIN_GTT;
++#endif
+ }
+
+ /* Tiled textures are unmappable. Always put them in VRAM. */
+--
+2.26.2
From 9429b6b76e565ef62b45de7d5c1416df59bd6dad Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sun, 26 Jun 2022 21:43:15 +0200
Subject: [PATCH 151/608] sqlite: update to 3.39.0.
---
srcpkgs/sqlite/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 5ca279068b5d..75ca796cef16 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
# Template file for 'sqlite'
pkgname=sqlite
-version=3.38.5
+version=3.39.0
revision=1
_amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -11,9 +11,9 @@ short_desc="SQL Database Engine in a C Library"
maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="Public Domain"
homepage="https://sqlite.org/"
-changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
+changelog="https://www.sqlite.org/changes.html"
distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=5af07de982ba658fd91a03170c945f99c971f6955bc79df3266544373e39869c
+checksum=e90bcaef6dd5813fcdee4e867f6b65f3c9bfd0aec0f1017f9f3bbce1e4ed09e2
CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
-DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
From 4e7d2af3ca4cc16daebfcc7b42a3eaa359d59fa4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 20:50:25 +0200
Subject: [PATCH 152/608] botan: update to 2.19.2.
---
srcpkgs/botan/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 65a626714fdf..330cbcc93314 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,17 +1,18 @@
# Template file for 'botan'
pkgname=botan
-version=2.19.1
+version=2.19.2
revision=1
wrksrc="${pkgname^}-${version}"
build_style=gnu-makefile
hostmakedepends="doxygen python3"
-makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
short_desc="Crypto library written in C++"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://botan.randombit.net/"
+changelog="https://botan.randombit.net/news.html"
distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
-checksum=e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560
+checksum=3af5f17615c6b5cd8b832d269fb6cb4d54ec64f9eb09ddbf1add5093941b4d75
python_version=3
LDFLAGS="-pthread"
@@ -22,7 +23,6 @@ do_configure() {
_args="--prefix=/usr"
_args+=" --os=linux"
_args+=" --with-doxygen"
- _args+=" --with-openssl"
_args+=" --with-bzip2"
_args+=" --with-lzma"
_args+=" --with-zlib"
@@ -75,10 +75,6 @@ do_configure() {
${_args}
}
-do_check() {
- make check
-}
-
post_install() {
vlicense license.txt
}
From c944bc1e86888b05db77aa1ed799ddc82c8e0186 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 27 Jun 2022 18:14:00 +0300
Subject: [PATCH 153/608] ffmpeg: update to 4.4.2.
libfaac support was removed way back in ffmpeg 3.2.
Closes: #37710 [via git-merge-pr]
Co-authored-by: Duncaen <duncaen@voidlinux.org>
---
srcpkgs/ffmpeg/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 7545d83ef849..f42c6a1c0aa6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.4.1
-revision=6
+version=4.4.2
+revision=1
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02
+checksum=af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93
hostmakedepends="pkg-config perl yasm"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -19,7 +19,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
libbs2b-devel libvidstab-devel $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if x265 x265-devel) $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
- $(vopt_if v4l2 v4l-utils-devel) $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel)
+ $(vopt_if v4l2 v4l-utils-devel) $(vopt_if fdk_aac fdk-aac-devel)
$(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel)
$(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
$(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
@@ -29,9 +29,13 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
$(vopt_if srt srt-devel) $(vopt_if rist librist-devel)"
depends="ffplay>=${version}_${revision}"
-build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio
+build_options="x265 v4l2 vaapi vdpau vpx fdk_aac aom nvenc sndio pulseaudio
dav1d zimg webp sofa vulkan drm svtav1 srt rist"
build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm srt rist"
+desc_option_srt="Enable support for SRT (Secure, Reliable, Transport)"
+desc_option_rist="Enable support for RIST (Reliable Internet Stream Transport)"
+desc_option_sofa="Enable support for AES SOFA"
+desc_option_webp="Enable support for WebP"
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";;
@@ -102,7 +106,6 @@ do_configure() {
$(vopt_enable pulseaudio libpulse) --enable-libfreetype --enable-libmodplug \
--enable-libspeex --enable-libcelt --enable-libass \
--enable-libopus --enable-librtmp --enable-libjack $(vopt_enable nvenc) \
- $(vopt_if faac '--enable-nonfree --enable-libfaac') \
$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
--disable-libopencore_amrnb --disable-libopencore_amrwb \
--disable-libopenjpeg \
From 65f0babe91b23343f145de363a691a8caa9fa69f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 28 Jun 2022 14:58:38 -0400
Subject: [PATCH 154/608] cinnamon-control-center: fix network settings
segfault
fixes #37723
---
.../patches/network-fix.patch | 58 +++++++++++++++++++
srcpkgs/cinnamon-control-center/template | 3 +-
2 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cinnamon-control-center/patches/network-fix.patch
diff --git a/srcpkgs/cinnamon-control-center/patches/network-fix.patch b/srcpkgs/cinnamon-control-center/patches/network-fix.patch
new file mode 100644
index 000000000000..116c9a3058d3
--- /dev/null
+++ b/srcpkgs/cinnamon-control-center/patches/network-fix.patch
@@ -0,0 +1,58 @@
+From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 31 Jan 2022 08:56:28 -0500
+Subject: [PATCH] network: Remove old workaround for openvpn widgets.
+
+I can't reproduce the original issue anymore, and NMACertChooser
+is removed in network-manager-openvpn 1.8.34.
+
+Fixes #10616
+
+ref:
+6db4961fd3a002182984d0e71ec364c9befdd93b
+---
+ meson.build | 2 --
+ panels/network/cc-network-panel.c | 10 ----------
+ 2 files changed, 12 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f1f213b..c4d7d86 100644
+--- a/meson.build
++++ b/meson.build
+@@ -56,8 +56,6 @@ else
+ libnma= dependency('', required: false)
+ endif
+
+-config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0'))
+-
+ if get_option('modemmanager')
+ if not get_option('networkmanager')
+ error('*** NetworkManager is required by ModemManager ***')
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index a4289de..d1925e4 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -47,10 +47,6 @@
+ #include <libmm-glib.h>
+ #endif
+
+-#ifdef HAVE_NMA_18
+-#include <nma-cert-chooser.h>
+-#endif
+-
+ CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
+
+ #define NETWORK_PANEL_PRIVATE(o) \
+@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
+ return;
+ }
+
+-#ifdef HAVE_NMA_18
+- /* some newer VPN plugins pre-require internal resources from libnma */
+- /* this solution is really ugly, but works clean */
+- gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE));
+-#endif
+-
+ panel->priv->cancellable = g_cancellable_new ();
+
+ panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 692e838d5061..1449c05709fd 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=5.2.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel
@@ -19,6 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://github.com/linuxmint/cinnamon-control-center"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=977ac52cf8bcdea99c03c6455f29276a57a605839cf16d190db2088df243366d
+# requires X and wacom devices?
make_check=no
libcinnamon-control-center_package() {
From 8f25439e6561b2579655131c50c3b31d02e83fd2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 20 Jun 2022 13:13:33 -0700
Subject: [PATCH 155/608] ibus: update to 1.5.26
---
srcpkgs/ibus/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index f12d7ec92ed0..750470cea083 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,19 +1,20 @@
# Template file for 'ibus'
pkgname=ibus
-version=1.5.23
-revision=4
+version=1.5.26
+revision=1
build_style=gnu-configure
build_helper="gir"
-configure_args="--enable-ui --enable-gtk3 --disable-tests
- --disable-schemas-compile --enable-memconf --enable-dconf
- --enable-wayland --with-python=/usr/bin/python3
+configure_args="--enable-ui --enable-gtk3 --enable-gtk4
+ --disable-tests --disable-schemas-compile --disable-systemd-services
+ --enable-memconf --enable-dconf --enable-wayland
+ --with-python=/usr/bin/python3
$(vopt_enable dicts emoji-dict) $(vopt_enable dicts unicode-dict)
--enable-introspection --enable-vala $(vopt_enable ibus_setup setup)"
hostmakedepends="automake gettext-devel libtool pkg-config intltool dconf
python3 glib-devel $(vopt_if vala vala)
$(vopt_if dicts 'cldr-emoji-annotation unicode-character-database unicode-emoji')"
-makedepends="dconf-devel gtk+-devel hicolor-icon-theme iso-codes
- json-glib-devel libnotify-devel librsvg-devel python3-xdg
+makedepends="dconf-devel gtk+-devel gtk4-devel hicolor-icon-theme
+ iso-codes json-glib-devel libnotify-devel librsvg-devel python3-xdg
$(vopt_if vala vala) libXtst-devel"
depends="hicolor-icon-theme iso-codes dbus-x11 python3-xdg
$(vopt_if ibus_setup 'python3-gobject>=3.12.1_3')"
@@ -22,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/ibus/ibus"
distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
-checksum=b7e8d5bdb7d71a5ba4ee43cdf374675f77121a71c1679c9b9e7e02875bd0e150
+checksum=5c2fd118e7bfd4e9a42c3a20e6175a263426c90b6256f94989ed3d0384f4c9fc
build_options="ibus_setup dicts"
desc_option_ibus_setup="Enable support for building the ibus setup UI"
From 28aeebdd03337bc2433cdb82ded0ad034aba55f3 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Tue, 21 Jun 2022 17:02:57 -0400
Subject: [PATCH 156/608] sc-controller: update to 0.4.8.7.
---
srcpkgs/sc-controller/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sc-controller/template b/srcpkgs/sc-controller/template
index f1d641021f82..19ed5b512681 100644
--- a/srcpkgs/sc-controller/template
+++ b/srcpkgs/sc-controller/template
@@ -1,14 +1,15 @@
# Template file for 'sc-controller'
pkgname=sc-controller
-version=0.4.8.6
+version=0.4.8.7
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel zlib-devel"
-depends="gtk+3 python3-gobject python3-cairo python3-evdev"
+depends="gtk+3 python3-gobject python3-cairo python3-evdev python3-vdf"
+checkdepends="python3-pytest libusb-devel libXfixes libXext-devel python3-vdf"
short_desc="User-mode driver and GTK3 based GUI for Steam Controller"
maintainer="Henry Naguski <henry@nilsu.org>"
license="GPL-2.0-only"
homepage="https://github.com/Ryochan7/sc-controller"
distfiles="https://github.com/Ryochan7/sc-controller/archive/refs/tags/v$version.tar.gz"
-checksum=e6b8c736877acbee0a90acb3470650327c6c76ab9a4c13a3359356e6858943f5
+checksum=af96bc2f2a90207007bc5ed00c626a1927085bb2aab7efb373e7e4339d4d11ae
From 8caa105c792666b63e338eaddec8e1781c68eafa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 17 Jun 2022 21:48:53 +0300
Subject: [PATCH 157/608] eclipse: update to 4.24.
---
srcpkgs/eclipse/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index d365b6ff06e5..9bac719e07c9 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
# Template file for 'eclipse'
pkgname=eclipse
-version=4.23
+version=4.24
revision=1
#code name of version
-_release=2022-03
+_release=2022-06
archs="x86_64"
wrksrc="eclipse"
depends="openjdk11 gtk+3 webkit2gtk libXtst
@@ -19,7 +19,7 @@ _patch=R
_edition=java
_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=2905e74afac8ecbaaf2563d4c14a1a28100a7a03cb4b73b540df3607ee5bfa6f
+checksum=de5f4dc8ac87d6be77fee0d2f3cc447318fd9247551818cda80eff9cb330b60d
python_version=2
do_install() {
From 4e456ecbbaeb1d08579840dfb1bc770258ca098e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 16 Jun 2022 22:47:16 +0200
Subject: [PATCH 158/608] wireshark: update to 3.6.6.
---
srcpkgs/wireshark/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index 4d0d23c7ed50..28adc9aadaae 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,6 +1,6 @@
# Template file for 'wireshark'
pkgname=wireshark
-version=3.6.3
+version=3.6.6
revision=1
build_style=cmake
hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.wireshark.org"
distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
-checksum=b60364a4c0068a10811ab3fd075ca6c1eb0e75d44600271b88a20ed93a2ef631
+checksum=beba27aeb4d3bb78df6202e88dda69e1dba9b0561044957bcac47e68b6ac28ba
system_groups="wireshark"
CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
From 88830dddcbb663b598b0d9fc20342149098e1777 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 18 Jun 2022 20:03:59 -0400
Subject: [PATCH 159/608] New package: tio-1.40
Closes: #37619 [via git-merge-pr]
---
srcpkgs/tio/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/tio/template
diff --git a/srcpkgs/tio/template b/srcpkgs/tio/template
new file mode 100644
index 000000000000..8b6cd9669585
--- /dev/null
+++ b/srcpkgs/tio/template
@@ -0,0 +1,18 @@
+# Template file for 'tio'
+pkgname=tio
+version=1.40
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="inih-devel"
+short_desc="Simple serial device I/O tool"
+maintainer="0x5c <dev@0x5c.io>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/tio/tio"
+changelog="https://github.com/tio/tio/raw/master/ChangeLog"
+distfiles="https://github.com/tio/tio/archive/refs/tags/v${version}.tar.gz"
+checksum=1fe3631b9236155818cdb9bac28435499a3701a97b193c5165275952c9f56da5
+
+post_install() {
+ vcompletion "build/src/bash-completion/tio" bash tio
+}
From cfa979dec86a9022b2e4e689cc37ba199a6d90cd Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jun 2022 21:45:55 +0200
Subject: [PATCH 160/608] perl-Specio: update to 0.48
---
srcpkgs/perl-Specio/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Specio/template b/srcpkgs/perl-Specio/template
index b8eb77e5e2c1..fc2dd72e39ec 100644
--- a/srcpkgs/perl-Specio/template
+++ b/srcpkgs/perl-Specio/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Specio'
pkgname=perl-Specio
-version=0.47
-revision=2
+version=0.48
+revision=1
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -14,4 +14,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="Artistic-2.0"
homepage="https://metacpan.org/release/Specio"
distfiles="${CPAN_SITE}/Test/Specio-${version}.tar.gz"
-checksum=f41307f14444f8777e572f27eeb6a964084399e7e382c47c577827ad8a286a1c
+checksum=0c85793580f1274ef08173079131d101f77b22accea7afa8255202f0811682b2
From 19e107a098269b9a1b61fa8d5a3a9adb5484f24b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Jun 2022 21:44:30 +0200
Subject: [PATCH 161/608] perl-Test-Time: update to 0.092
---
srcpkgs/perl-Test-Time/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Test-Time/template b/srcpkgs/perl-Test-Time/template
index fad5a2abe5c6..0ed775292773 100644
--- a/srcpkgs/perl-Test-Time/template
+++ b/srcpkgs/perl-Test-Time/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Test-Time'
pkgname=perl-Test-Time
-version=0.08
-revision=2
+version=0.092
+revision=1
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Test-Time"
distfiles="${CPAN_SITE}/Test/${pkgname#perl-}-${version}.tar.gz"
-checksum=b8bc3b074bb2247e8588399c1e55d071f049cf6ce1c8b4192c38cf3c24559548
+checksum=30d90f54ce840893c7ba2cac2a4d1eecd4c9cdf805910c595e3ae89dfd644738
From 42af2947f07a58f80d9a605baa85c3260920c6aa Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 11 Jun 2022 09:48:18 -0700
Subject: [PATCH 162/608] runc: update to 1.1.3
---
srcpkgs/runc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 35f011484e72..ef7d7995d07a 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,6 +1,6 @@
# Template file for 'runc'
pkgname=runc
-version=1.1.2
+version=1.1.3
revision=1
build_style=go
go_import_path=github.com/opencontainers/runc
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/opencontainers/runc"
distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz"
-checksum=78ad532465ce4c2802480644a8756c30ae99c1bf779f0243af4bca11c4d041de
+checksum=2db1f3a01ffd2f8fa3a259b9b512ca7d4dbf89be5765cc58d306e45658668453
post_build() {
make man
From df367bacbad8d03aead5ff537f2276e9f3419f0e Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 11 Jun 2022 13:19:58 +0200
Subject: [PATCH 163/608] k3d: update to 5.4.3.
---
srcpkgs/k3d/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index cb772ac1b27b..0be3def4f63d 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,6 +1,6 @@
# Template file for 'k3d'
pkgname=k3d
-version=5.4.1
+version=5.4.3
revision=1
build_style=go
build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://k3d.io/"
distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
-checksum=606cf8fc8d2732e87e92cc9e67d73e64eb73c5e093193cc03172cbba685e0ee0
+checksum=003461822e2f1987394040711d423e44f56f2de5250962fbcee67c765ef8474b
_completions="bash zsh fish"
post_build() {
From bd005adaf9bd11f0bba7dfd02b8b8ac36327ee02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 11 Jun 2022 13:16:12 +0200
Subject: [PATCH 164/608] ruplacer: update to 0.8.0.
Closes: #37511 [via git-merge-pr]
---
srcpkgs/ruplacer/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ruplacer/template b/srcpkgs/ruplacer/template
index 226155a2452a..9cf7468413e4 100644
--- a/srcpkgs/ruplacer/template
+++ b/srcpkgs/ruplacer/template
@@ -1,14 +1,15 @@
# Template file for 'ruplacer'
pkgname=ruplacer
-version=0.6.4
+version=0.8.0
revision=1
build_style=cargo
short_desc="Find and replace text in source files"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="BSD-3-Clause"
homepage="https://github.com/dmerejkowsky/ruplacer"
+changelog="https://github.com/your-tools/ruplacer/raw/main/CHANGELOG.md"
distfiles="https://github.com/dmerejkowsky/ruplacer/archive/refs/tags/v${version}.tar.gz"
-checksum=4f66e8970942e55dc287c585eef7a21394aefa49df746cef429f9e5bc6714c7a
+checksum=7109bf19c0f62ec477c952c1c509353f7c6abd19deb9169384ebc9d21ad71dc7
post_install() {
vlicense LICENSE
From 7aafc9b54b80b07a900a49c09abe830aef76f544 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Sun, 5 Jun 2022 00:04:19 +0200
Subject: [PATCH 165/608] gnupg: update to 2.2.35
---
srcpkgs/gnupg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index e62820c88888..77767cf0a22a 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,6 +1,6 @@
# Template file for 'gnupg'
pkgname=gnupg
-version=2.2.34
+version=2.2.35
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable ldap)
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnupg.org/"
distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
-checksum=562a3350dcf66cb67c5825c67ff2c2904db1e30ec8e1d353adc14efba9abf43f
+checksum=340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690
build_options="ldap"
build_options_default="ldap"
From 3b45f6f0cf685285571254a581d93995501022f8 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 28 Jun 2022 17:14:43 +0530
Subject: [PATCH 166/608] gef: update to 2022.06
---
srcpkgs/gef/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index 5f000d87b7b9..1309b0c7bffa 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,15 +1,15 @@
# Template file for 'gef'
pkgname=gef
-version=2022.01
+version=2022.06
revision=1
pycompile_dirs="usr/lib/gef"
depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
short_desc="GDB Enhanced Features for exploit devs & reversers"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
-homepage="https://gef.readthedocs.io/en/master/"
+homepage="https://hugsy.github.io/gef/"
distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=bb1070dfee440577927d7fa1aa5d310d9fb7297d87ffd786ee63cc6ae7f0f177
+checksum=ae93f55c081753203b05f427ba0fa9e9e92d25139e10e946a081cd5d6a379329
python_version="3"
do_install() {
From f7076950ef0fa50440bc347e281d84aa3375a9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 29 Jun 2022 12:06:57 +0200
Subject: [PATCH 167/608] yt-dlp: update to 2022.06.29.
---
srcpkgs/yt-dlp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index f81a997bcd5c..fe0b4d4bc732 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
# Template file for 'yt-dlp'
pkgname=yt-dlp
-version=2022.06.22.1
+version=2022.06.29
revision=1
wrksrc="$pkgname"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
homepage="https://github.com/yt-dlp/yt-dlp"
changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=fac29d5a8d4c2f1317ba5c2fc4231cf169887bcef26d0fbf0481c90ddb7826db
+checksum=3b0aa20659b7ba35a9d74b4d35e7fa1fbe13f4d3a30c3970fd2bf4ac087c407c
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 9523576b3456a32d675620971f9d8bf45650472a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 28 Jun 2022 21:17:36 -0400
Subject: [PATCH 168/608] watchexec: update to 1.20.2
---
srcpkgs/watchexec/patches/fix-tests.patch | 14 ++++++++++++++
srcpkgs/watchexec/template | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/watchexec/patches/fix-tests.patch
diff --git a/srcpkgs/watchexec/patches/fix-tests.patch b/srcpkgs/watchexec/patches/fix-tests.patch
new file mode 100644
index 000000000000..f210de15e314
--- /dev/null
+++ b/srcpkgs/watchexec/patches/fix-tests.patch
@@ -0,0 +1,14 @@
+# Remove debug notice from test case
+diff --git a/crates/cli/tests/snapshots/help__help_unix.snap b/crates/cli/tests/snapshots/help__help_unix.snap
+index b55782f022..c5642f98ce 100644
+--- a/crates/cli/tests/snapshots/help__help_unix.snap
++++ b/crates/cli/tests/snapshots/help__help_unix.snap
+@@ -2,8 +2,6 @@
+ source: crates/cli/tests/help.rs
+ expression: "String::from_utf8(output.stdout).unwrap()"
+ ---
+-⚠ DEBUG BUILD ⚠
+-
+ watchexec 1.20.2
+ Execute commands when watched files change
+
diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 6e872efcd8ee..4bd08d626870 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,6 +1,6 @@
# Template file for 'watchexec'
pkgname=watchexec
-version=1.20.0
+version=1.20.2
revision=1
wrksrc="${pkgname}-cli-v${version}"
build_wrksrc="crates/cli"
@@ -10,7 +10,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
license="Apache-2.0"
homepage="https://github.com/watchexec/watchexec"
distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/cli-v${version}.tar.gz"
-checksum=69c551090692a04943e7ded2d7f997f8777aa099c674b096a31d94983d02dbf7
+checksum=62e2e722a84475436286010edff36c56c4c6fad9e76be4b35381877e93faeac8
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 596f2a13e05b7d3ae999fd91ae42b691a930ac39 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 28 Jun 2022 21:15:33 -0400
Subject: [PATCH 169/608] Manual.md: fix working directories of build phases
---
Manual.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Manual.md b/Manual.md
index 26e3b9f43413..d8358565893c 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1133,9 +1133,9 @@ Current working directory for functions is set as follows:
- For do_fetch, post_fetch: `XBPS_BUILDDIR`.
-- For do_extract, post_extract: `wrksrc`.
+- For do_extract through do_patch: `wrksrc`.
-- For pre_patch through post_install: `build_wrksrc`
+- For post_patch through post_install: `build_wrksrc`
if it is defined, otherwise `wrksrc`.
<a id="build_options"></a>
From 6389a3eb7844f7bf4d2d888402be8850c6505285 Mon Sep 17 00:00:00 2001
From: wrest64 <mrh64@pm.me>
Date: Tue, 28 Jun 2022 22:26:26 -0400
Subject: [PATCH 170/608] slock: added line in build section of template to
factor in config.h
---
srcpkgs/slock/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template
index df12400b6c98..481c5b86d168 100644
--- a/srcpkgs/slock/template
+++ b/srcpkgs/slock/template
@@ -12,6 +12,7 @@ distfiles="http://dl.suckless.org/tools/slock-${version}.tar.gz"
checksum=b53849dbc60109a987d7a49b8da197305c29307fd74c12dc18af0d3044392e6a
do_build() {
+ [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
From a8f2f6b94075855b71107f9952eb63996b54b997 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 14:03:43 +0200
Subject: [PATCH 171/608] harfbuzz: update to 4.4.1.
---
srcpkgs/harfbuzz/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 5eb9dd8310f9..4899fd5a1c38 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
-version=4.3.0
+version=4.4.1
revision=1
build_style=meson
build_helper="gir qemu"
@@ -14,7 +14,7 @@ license="MIT"
homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530
+checksum=c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee
libharfbuzz_package() {
short_desc+=" - runtime library"
From 79e2c4653b1bf26fbce7c44f855ab456edabc758 Mon Sep 17 00:00:00 2001
From: Skylar Hill <stellarskylark@posteo.net>
Date: Tue, 28 Jun 2022 02:12:21 -0500
Subject: [PATCH 172/608] fillets-ng: include game data
Closes: #37720 [via git-merge-pr]
---
srcpkgs/fillets-ng/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/fillets-ng/template b/srcpkgs/fillets-ng/template
index 8db27477c3c4..83741590c011 100644
--- a/srcpkgs/fillets-ng/template
+++ b/srcpkgs/fillets-ng/template
@@ -1,7 +1,7 @@
# Template file for 'fillets-ng'
pkgname=fillets-ng
version=1.0.1
-revision=2
+revision=3
create_wrksrc=yes
build_wrksrc="fillets-ng-${version}"
build_style=gnu-configure
@@ -16,3 +16,8 @@ distfiles="${SOURCEFORGE_SITE}/fillets/fillets-ng-${version}.tar.gz
checksum="329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da
f0c979fb35ec550a43246fc209add8f45ca550a382c94d6383bb3f01b1073799"
replaces="fillets-ng-data>=0"
+
+post_install() {
+ vmkdir usr/share/games/fillets-ng
+ vcopy "$wrksrc/fillets-ng-data-${version}/*" usr/share/games/fillets-ng
+}
From 3d4d49f26287d43ccb3e43bccc8850474c6541d5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 14:33:49 +0200
Subject: [PATCH 173/608] macchanger: use debian patches
The project hasn't been updated for 8 years and there are some
important bugs to be fixed.
Closes: https://github.com/void-linux/void-packages/issues/36245
---
srcpkgs/macchanger/template | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/macchanger/template b/srcpkgs/macchanger/template
index 9af205a0d0f4..6bba11bcb3fe 100644
--- a/srcpkgs/macchanger/template
+++ b/srcpkgs/macchanger/template
@@ -1,13 +1,27 @@
# Template file for 'macchanger'
pkgname=macchanger
version=1.7.0
-revision=3
+revision=4
+create_wrksrc=yes
+build_wrksrc="macchanger-${version}"
build_style=gnu-configure
configure_script="./autogen.sh"
hostmakedepends="automake texinfo"
short_desc="Small utility to change your NIC's MAC address"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/macchanger"
-distfiles="https://github.com/alobbs/macchanger/archive/${version}.tar.gz"
-checksum=1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f
+distfiles="https://github.com/alobbs/macchanger/archive/${version}.tar.gz
+ http://deb.debian.org/debian/pool/main/m/macchanger/macchanger_1.7.0-5.4.debian.tar.xz"
+checksum="1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f
+ a5f48390eb4cb50f16898740e99e38671957a3d5360105986ff0ee41db46383f"
+
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+post_patch() {
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/02-fix_usage_message.patch
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/06-update_OUI_list.patch
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/08-fix_random_MAC_choice.patch
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/check-random-device-read-errors.patch
+ patch -Np1 -D "${build_wrksrc}" <../debian/patches/verify-changed-MAC.patch
+}
From 9c22a690cbfbb7f4feadb94794bf8186146254fe Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 29 Jun 2022 17:48:57 +0530
Subject: [PATCH 174/608] black: update to 22.6.0.
Adopt.
---
srcpkgs/black/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index c197da7cc670..6e4a1f15fcab 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,6 +1,6 @@
# Template file for 'black'
pkgname=black
-version=22.3.0
+version=22.6.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-setuptools_scm"
@@ -8,21 +8,22 @@ depends="python3-click python3-platformdirs python3-tomli python3-pathspec pytho
checkdepends="${depends} python3-pytest-xdist python3-aiohttp python3-colorama python3-uvloop
python3-ipython python3-tokenize-rt"
short_desc="Uncompromising Python code formatter"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/psf/black"
changelog="https://raw.githubusercontent.com/psf/black/main/CHANGES.md"
distfiles="${PYPI_SITE}/b/black/black-${version}.tar.gz"
-checksum=35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79
+checksum=6c6d39e28aed379aec40da1c65434c77d75e65bb59a1e1c283de545fb4e7c6c9
do_check() {
- PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional jupyter \
- -m jupyter --deselect=tests/test_ipynb.py::test_set_input
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional jupyter -m jupyter
pyver=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
mv ${XBPS_MASTERDIR}/usr/lib/python${pyver}/site-packages/IPython ${XBPS_MASTERDIR}/tmp/IPython.bak
PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest --run-optional no_jupyter
mv ${XBPS_MASTERDIR}/tmp/IPython.bak ${XBPS_MASTERDIR}/usr/lib/python${pyver}/site-packages/IPython
+
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m black --check src tests setup.py
}
post_install() {
From e5ab3a5b4981f27b79d556074ee3fd756daf676c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 14:40:48 +0200
Subject: [PATCH 175/608] macchanger: fix post_patch patch arguments
---
srcpkgs/macchanger/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/macchanger/template b/srcpkgs/macchanger/template
index 6bba11bcb3fe..b0363f1f70ce 100644
--- a/srcpkgs/macchanger/template
+++ b/srcpkgs/macchanger/template
@@ -1,7 +1,7 @@
# Template file for 'macchanger'
pkgname=macchanger
version=1.7.0
-revision=4
+revision=5
create_wrksrc=yes
build_wrksrc="macchanger-${version}"
build_style=gnu-configure
@@ -19,9 +19,9 @@ checksum="1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f
patch_args="-Np1 --directory=${build_wrksrc}"
post_patch() {
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/02-fix_usage_message.patch
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/06-update_OUI_list.patch
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/08-fix_random_MAC_choice.patch
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/check-random-device-read-errors.patch
- patch -Np1 -D "${build_wrksrc}" <../debian/patches/verify-changed-MAC.patch
+ patch -Np1 <../debian/patches/02-fix_usage_message.patch
+ patch -Np1 <../debian/patches/06-update_OUI_list.patch
+ patch -Np1 <../debian/patches/08-fix_random_MAC_choice.patch
+ patch -Np1 <../debian/patches/check-random-device-read-errors.patch
+ patch -Np1 <../debian/patches/verify-changed-MAC.patch
}
From 6d6993f49249943e5d01aa8cd614b21eedc6256e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 16:12:44 +0200
Subject: [PATCH 176/608] xscreensaver: add xscreensaver-elogind subpackage
Closes: https://github.com/void-linux/void-packages/issues/36208
---
srcpkgs/xscreensaver-elogind | 1 +
srcpkgs/xscreensaver/template | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/xscreensaver-elogind
diff --git a/srcpkgs/xscreensaver-elogind b/srcpkgs/xscreensaver-elogind
new file mode 120000
index 000000000000..6a813cf9fee2
--- /dev/null
+++ b/srcpkgs/xscreensaver-elogind
@@ -0,0 +1 @@
+xscreensaver
\ No newline at end of file
diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 55d3f744c1d6..723bccd5460c 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,7 +1,7 @@
# Template file for 'xscreensaver'
pkgname=xscreensaver
version=6.04
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-pam --with-login-manager
--includedir=${XBPS_CROSS_BASE}/include
@@ -9,7 +9,7 @@ configure_args="--with-pam --with-login-manager
conf_files="/etc/pam.d/xscreensaver"
hostmakedepends="bc intltool pkg-config"
makedepends="glu-devel libXi-devel libXinerama-devel libXmu-devel libXpm-devel
- libXrandr-devel libglade-devel pam-devel gdk-pixbuf-xlib-devel"
+ libXrandr-devel libglade-devel pam-devel gdk-pixbuf-xlib-devel elogind-devel"
depends="perl perl-LWP"
short_desc="Screen saver and locker for the X Window System"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -35,3 +35,11 @@ do_install() {
sed '/^$/q' < driver/xscreensaver.c > LICENSE
vlicense LICENSE
}
+
+xscreensaver-elogind_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - elogind support"
+ pkg_install() {
+ vmove usr/libexec/xscreensaver/xscreensaver-systemd
+ }
+}
From ebbf97b37db5272c197634ae6f513f067ce1be6c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 15 May 2022 19:35:06 +0300
Subject: [PATCH 177/608] enlightenment: update to 0.25.3.
---
srcpkgs/enlightenment/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index 87e27274b4a1..66bc8539c815 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -1,6 +1,6 @@
# Template file for 'enlightenment'
pkgname=enlightenment
-version=0.25.2
+version=0.25.3
revision=1
build_style=meson
configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
@@ -16,7 +16,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="BSD-2-Clause"
homepage="http://enlightenment.org"
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=123a06815e41453deddf22ad8373c72e652b3c6553385d16fe27e51ede5e3811
+checksum=37fd49ebb537216a18efe69d5c5511e118f9cdacb5652807769331707be4cff6
lib32disabled=yes
build_options="wayland"
build_options_default="wayland"
From d3d380d28d6581a044caead3ffb69808766aa722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 11 Jun 2022 13:45:01 +0200
Subject: [PATCH 178/608] New package: hatchling-1.3.1
---
srcpkgs/hatchling/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/hatchling/template
diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template
new file mode 100644
index 000000000000..894c15c8f719
--- /dev/null
+++ b/srcpkgs/hatchling/template
@@ -0,0 +1,18 @@
+# Template file for 'hatchling'
+pkgname=hatchling
+version=1.3.1
+revision=1
+build_style=python3-pep517
+_deps="python3-pathspec python3-tomli python3-pluggy python3-packaging"
+hostmakedepends="python3-setuptools ${_deps}"
+depends="${_deps}"
+short_desc="Extensible, standards compliant build backend used by Hatch"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://hatch.pypa.io/latest/"
+distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=aaa63019c9d666053d9ff318097335e766123844547c52940155c0401c3c142f
+
+post_install() {
+ vlicense LICENSE.txt
+}
From f1afb63528a66955d3c8b40b28bfc728cefe60cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 11 Jun 2022 14:06:41 +0200
Subject: [PATCH 179/608] New package: python3-tomli-w-1.0.0
---
srcpkgs/python3-tomli-w/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-tomli-w/template
diff --git a/srcpkgs/python3-tomli-w/template b/srcpkgs/python3-tomli-w/template
new file mode 100644
index 000000000000..6268e501aedf
--- /dev/null
+++ b/srcpkgs/python3-tomli-w/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-tomli-w'
+pkgname=python3-tomli-w
+version=1.0.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+checkdepends="python3-pytest python3-tomli"
+short_desc="Lil' python TOML writer"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/hukkin/tomli-w"
+changelog="https://github.com/hukkin/tomli-w/raw/master/CHANGELOG.md"
+distfiles="https://github.com/hukkin/tomli-w/archive/refs/tags/${version}.tar.gz"
+checksum=4fe1fb4696899c01356ef4e028c975103abf62e5fa9472f31f1714100f1b065d
+
+post_install() {
+ vlicense LICENSE
+}
From df1f9502d8b583524de49538da1a708a99bc5df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 11 Jun 2022 14:20:44 +0200
Subject: [PATCH 180/608] New package: hatch-1.2.1
---
srcpkgs/hatch/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/hatch/template
diff --git a/srcpkgs/hatch/template b/srcpkgs/hatch/template
new file mode 100644
index 000000000000..f8b068a2a713
--- /dev/null
+++ b/srcpkgs/hatch/template
@@ -0,0 +1,37 @@
+# Template file for 'hatch'
+pkgname=hatch
+version=1.2.1
+revision=1
+build_style=python3-pep517
+make_check_args="--deselect tests/backend/test_build.py::test_editable
+ --deselect tests/backend/builders/test_custom.py::test_default
+ --deselect tests/backend/builders/test_custom.py::test_explicit_path
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_default_auto_detection
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_default
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_default_extra_dependencies
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_default_force_include
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_exact
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_exact_extra_dependencies
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_exact_force_include
+ --deselect tests/backend/builders/test_wheel.py::TestBuildStandard::test_editable_pth
+ --deselect tests/cli/run/test_run.py::test_scripts_no_environment
+ --deselect tests/backend/dep/test_core.py::test_unknown_extra
+ --deselect tests/backend/dep/test_core.py::test_extra_met"
+hostmakedepends="hatchling"
+depends="python3-atomicwrites python3-click hatchling python3-httpx
+ python3-keyring python3-pexpect python3-platformdirs python3-pyperclip
+ python3-rich python3-tomli-w python3-tomlkit python3-userpath
+ python3-virtualenv"
+checkdepends="${depends} python3-pytest python3-pytest-mock
+ python3-pytest-xdist git python3-pip"
+short_desc="Modern, extensible Python project management "
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://hatch.pypa.io/latest/"
+distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=61761e1fe14474fb2be7e264555b99fc343b4e63c0ee32aa3497c651e4cdec03
+make_check_pre="env PYTHONPATH=./src"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 3db6caaee225b76c4243b9e72f7556b475434c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 26 Jun 2022 16:45:06 +0200
Subject: [PATCH 181/608] New package: hatch-vcs-0.2.0
---
srcpkgs/hatch-vcs/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/hatch-vcs/template
diff --git a/srcpkgs/hatch-vcs/template b/srcpkgs/hatch-vcs/template
new file mode 100644
index 000000000000..adac314297e0
--- /dev/null
+++ b/srcpkgs/hatch-vcs/template
@@ -0,0 +1,24 @@
+# Template file for 'hatch-vcs'
+pkgname=hatch-vcs
+version=0.2.0
+revision=1
+wrksrc="${pkgname/-/_}-${version}"
+build_style=python3-pep517
+make_check_args="--deselect tests/test_build.py::test_basic
+ --deselect tests/test_build.py::test_write
+ --deselect tests/test_build.py::test_fallback"
+hostmakedepends="hatchling"
+depends="hatchling python3-setuptools_scm"
+checkdepends="${depends} python3-pytest git"
+short_desc="Hatch plugin for VCS based versioning"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/ofek/hatch-vcs"
+changelog="https://github.com/ofek/hatch-vcs/raw/master/HISTORY.md"
+distfiles="${PYPI_SITE}/h/${pkgname/-/_}/${pkgname/-/_}-${version}.tar.gz"
+checksum=9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff
+make_check_pre="env PYTHONPATH=./"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From ba2858bd3502e0f374c8c0c02f83c6d5bb2687dd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 18:54:13 +0200
Subject: [PATCH 182/608] ferm: update to 2.7.
---
srcpkgs/ferm/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ferm/template b/srcpkgs/ferm/template
index 3b623d0dd0cc..9cdac4712eb6 100644
--- a/srcpkgs/ferm/template
+++ b/srcpkgs/ferm/template
@@ -1,15 +1,21 @@
# Template file for 'ferm'
pkgname=ferm
-version=2.6
+version=2.7
revision=1
hostmakedepends="perl"
depends="perl iptables"
+checkdepends="perl-Net-DNS-Resolver-Mock"
short_desc="Frontend for iptables"
maintainer="johannes <johannes.brechtmann@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://ferm.foo-projects.org/"
+changelog="https://github.com/MaxKellermann/ferm/raw/master/NEWS"
distfiles="http://ferm.foo-projects.org/download/${version:0:3}/ferm-${version}.tar.xz"
-checksum=689541465e7c073cbd604c9cd18f113c31c0b41bb12614726a59b17e44058885
+checksum=c00d910d5394e69675608eb5ee0f504d5cfda41e990a2d9a91baac6df93e3f92
+
+do_check() {
+ make check
+}
do_install() {
make install PREFIX=${DESTDIR}/usr
From c0044cb5aa77ffbac35fce361abba5631c58abed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jun 2022 17:31:38 +0200
Subject: [PATCH 183/608] zsh: backport https://zsh.org/workers/50325
---
srcpkgs/zsh/patches/50325.patch | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 srcpkgs/zsh/patches/50325.patch
diff --git a/srcpkgs/zsh/patches/50325.patch b/srcpkgs/zsh/patches/50325.patch
new file mode 100644
index 000000000000..6d2007023bc2
--- /dev/null
+++ b/srcpkgs/zsh/patches/50325.patch
@@ -0,0 +1,31 @@
+Author: Bart Schaefer <schaefer@zsh.org>
+Date: Fri Jun 3 20:08:15 2022 -0700
+
+ 50325: revert 38150 and fix in calling function cfp_matcher_range() instead
+
+diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
+index bb8359f1d..56e5509a4 100644
+--- a/Src/Zle/compmatch.c
++++ b/Src/Zle/compmatch.c
+@@ -1319,7 +1319,7 @@ pattern_match_equivalence(Cpattern lp, convchar_t wind, int wmtp,
+ convchar_t lchr;
+ int lmtp;
+
+- if (!PATMATCHINDEX(lp->u.str, wind, &lchr, &lmtp)) {
++ if (!PATMATCHINDEX(lp->u.str, wind-1, &lchr, &lmtp)) {
+ /*
+ * No equivalent. No possible match; give up.
+ */
+diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
+index 59abb4cc4..77ccdebf7 100644
+--- a/Src/Zle/computil.c
++++ b/Src/Zle/computil.c
+@@ -4383,7 +4383,7 @@ cfp_matcher_range(Cmatcher *ms, char *add)
+ * word pattern.
+ */
+ if ((ind = pattern_match_equivalence
+- (m->word, ind, mt, addc)) != CHR_INVALID) {
++ (m->word, ind+1, mt, addc)) != CHR_INVALID) {
+ if (ret) {
+ if (imeta(ind)) {
+ *p++ = Meta;
From 1b704d1b703134d70811c9661174a0ae71e10dfd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jun 2022 18:51:39 +0200
Subject: [PATCH 184/608] python3-pipx: update to 1.1.0.
---
srcpkgs/python3-pipx/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index b20d67772463..597395ceda37 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,18 +1,18 @@
# Template file for 'python3-pipx'
pkgname=python3-pipx
-version=1.0.0
+version=1.1.0
revision=1
wrksrc="pipx-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-argcomplete python3-userpath python3-setuptools python3-packaging"
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3-argcomplete python3-packaging python3-userpath"
short_desc="Install and Run Python Applications in Isolated Environments"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://pypa.github.io/pipx/"
changelog="https://pypa.github.io/pipx/changelog/"
distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=91e2bca934a5e82785d7b4ae44b95553611311691bd87da31915d08a0ad2df1c
+checksum=4d2f70daf15f121e90b7394b0730ee82fc39d7da514e50a7bbf8066be88883bb
post_install() {
vlicense LICENSE
From 2fd359e89342f088ccd21f4aeef99c0042918d16 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jun 2022 18:55:29 +0200
Subject: [PATCH 185/608] python3-pipenv: update to 2022.6.7.
---
srcpkgs/python3-pipenv/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 70e3a8914830..14330c5ee440 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pipenv'
pkgname=python3-pipenv
-version=2022.5.2
+version=2022.6.7
revision=1
wrksrc="pipenv-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
depends="python3 python3-pip python3-virtualenv python3-virtualenv-clone"
short_desc="Python Development Workflow for Humans"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/pypa/pipenv"
changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=71d510c20f99ea5cd3c951f8203140197bcc79fc21a0d74924f97c726a0f2bd3
+checksum=6ac0e7a8bbe02859d46c53c03d3f33136bbf49c8c7d9a6d818409e17a604eda0
conflicts="python-pipenv>=0"
post_extract() {
From 574b708e8efbc3c3a742f20ddf91837a4f1ba444 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 29 Jun 2022 18:56:50 +0200
Subject: [PATCH 186/608] mcelog: update to 183.
---
srcpkgs/mcelog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 53d5330e5dc3..cd5d0df82e44 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
# Template file for 'mcelog'
pkgname=mcelog
-version=182
+version=183
revision=1
archs="i686* x86_64*"
hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://www.mcelog.org/"
distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=ed934229ce45c1ab730fa50bc8502b649a02609c392856a8b14b951190b1475c
+checksum=1112843bc5b7451f782b06fd4da165d5ee035a2b2402a10b5ca3535002c43d81
do_build() {
make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}
From eb6cb4b0b05ade2900d26737abf1e15db128dfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 29 Jun 2022 19:02:24 +0200
Subject: [PATCH 187/608] btop: update to 1.2.8.
---
srcpkgs/btop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/btop/template b/srcpkgs/btop/template
index 62247c367b53..4935494bb04f 100644
--- a/srcpkgs/btop/template
+++ b/srcpkgs/btop/template
@@ -1,6 +1,6 @@
# Template file for 'btop'
pkgname=btop
-version=1.2.7
+version=1.2.8
revision=1
build_style=gnu-makefile
short_desc="Monitor of resources"
@@ -9,4 +9,4 @@ license="Apache-2.0"
homepage="https://github.com/aristocratos/btop"
changelog="https://raw.githubusercontent.com/aristocratos/btop/main/CHANGELOG.md"
distfiles="https://github.com/aristocratos/btop/archive/refs/tags/v${version}.tar.gz"
-checksum=60075824ca4e14c1ca920b76ffb101fc2340c5342f3ba600b5c280389b69bbbf
+checksum=7944b06e3181cc1080064adf1e9eb4f466af0b84a127df6697430736756a89ac
From cbd9468f1d2b70df8b86617939bd1175882440c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 29 Jun 2022 17:41:55 +0200
Subject: [PATCH 188/608] homebank: update to 5.5.6.
---
srcpkgs/homebank/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 84f52ed2fa7a..d203a7234f3c 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
# Template file for 'homebank'
pkgname=homebank
-version=5.5.5
+version=5.5.6
revision=1
build_style=gnu-configure
hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://homebank.free.fr/"
distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=bece05ecb52392147424aa1e5a179389777b82bf468abebd73eb70b2af9c9e67
+checksum=460e8e8c72e4c152039d7ab3a8f5c0f03c6a49dae1d93e95fe02c1343f2fc7da
post_patch() {
vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From 437574e42ca4e9e29f8546e5b5f3bb408043702f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 26 Jun 2022 16:34:19 +0200
Subject: [PATCH 189/608] neovim: update to 0.7.2.
---
srcpkgs/neovim/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 63c9247030f7..c29b7b6885a1 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,6 +1,6 @@
# Template file for 'neovim'
pkgname=neovim
-version=0.7.0
+version=0.7.2
revision=1
build_style=cmake
build_helper="qemu"
@@ -14,7 +14,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df
+checksum=ccab8ca02a0c292de9ea14b39f84f90b635a69282de38a6b4ccc8565bc65d096
alternatives="
vi:vi:/usr/bin/nvim
From 8e27f36d20c413aab98722e8ccabc69136a9f178 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 28 Jun 2022 22:42:52 +0200
Subject: [PATCH 190/608] valgrind: update to 3.19.0.
---
srcpkgs/valgrind/patches/str_tester.patch | 22 -------------------
.../patches/tc20_verifywrap_musl.patch | 11 ----------
srcpkgs/valgrind/patches/test_statx.patch | 18 ---------------
srcpkgs/valgrind/template | 7 +++---
4 files changed, 4 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/valgrind/patches/str_tester.patch
delete mode 100644 srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
delete mode 100644 srcpkgs/valgrind/patches/test_statx.patch
diff --git a/srcpkgs/valgrind/patches/str_tester.patch b/srcpkgs/valgrind/patches/str_tester.patch
deleted file mode 100644
index cbf64a95e02b..000000000000
--- a/srcpkgs/valgrind/patches/str_tester.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-rawmemchar is not available on musl, guard it with defined(__GLIBC__)
-
---- a/memcheck/tests/str_tester.c 2021-10-10 14:17:32.000000000 +0000
-+++ b/memcheck/tests/str_tester.c 2021-11-16 19:37:26.950006442 +0000
-@@ -504,7 +504,7 @@
- #endif
-
- // DDD: better done by testing for the function.
--#if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
-+#if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
- static void
- test_rawmemchr (void)
- {
-@@ -1451,7 +1451,7 @@
- test_strchrnul ();
- # endif
-
--# if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
-+# if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
- /* rawmemchr. */
- test_rawmemchr ();
- # endif
diff --git a/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch b/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
deleted file mode 100644
index ad12ba01302b..000000000000
--- a/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/helgrind/tests/tc20_verifywrap.c 2021-11-16 21:01:30.020008847 +0000
-+++ b/helgrind/tests/tc20_verifywrap.c 2021-11-16 21:02:22.140008872 +0000
-@@ -20,7 +20,7 @@
-
- #if !defined(__APPLE__) && !defined(__FreeBSD__)
-
--#if defined(__sun__)
-+#if defined(__sun__) || !defined(__GLIBC__)
- /* Fake __GLIBC_PREREQ on Solaris. Pretend glibc >= 2.4. */
- # define __GLIBC_PREREQ
- #else
diff --git a/srcpkgs/valgrind/patches/test_statx.patch b/srcpkgs/valgrind/patches/test_statx.patch
deleted file mode 100644
index 7deb78fc9793..000000000000
--- a/srcpkgs/valgrind/patches/test_statx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/memcheck/tests/linux/sys-statx.c 2021-01-21 15:09:33.000000000 +0000
-+++ b/memcheck/tests/linux/sys-statx.c 2021-11-16 20:26:33.970007848 +0000
-@@ -7,11 +7,15 @@
- #include <assert.h>
- #include <string.h>
- #include <sys/syscall.h>
-+#if defined(__GLIBC__)
- #if __GLIBC_PREREQ(2,28)
- /* struct statx provided in sys/stat.h */
- #else
- #include <linux/stat.h>
- #endif
-+#else
-+#include <linux/stat.h>
-+#endif
- #include <errno.h>
-
- int check_stat2;
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 0f4a2c4ba1f8..055e3ca6e520 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,6 +1,6 @@
# Template file for 'valgrind'
pkgname=valgrind
-version=3.18.1
+version=3.19.0
revision=1
build_style=gnu-configure
configure_args="--enable-tls --without-mpicc --enable-lto=yes"
@@ -8,11 +8,12 @@ hostmakedepends="automake perl pkg-config"
makedepends="libgomp-devel"
depends="perl"
short_desc="Tool for finding memory management bugs in programs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://valgrind.org/"
+changelog="https://valgrind.org/docs/manual/dist.news.html"
distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5
+checksum=dd5e34486f1a483ff7be7300cc16b4d6b24690987877c3278d797534d6738f02
CFLAGS="-fno-stack-protector"
CXXFLAGS="-fno-stack-protector"
From a9a3aa51159aeb2130d59dd56256c7eabd97ffb3 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 2 Jun 2022 23:39:05 +0200
Subject: [PATCH 191/608] New package: gtklock-1.0.0
---
srcpkgs/gtklock/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/gtklock/template
diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template
new file mode 100644
index 000000000000..c7cf960401dc
--- /dev/null
+++ b/srcpkgs/gtklock/template
@@ -0,0 +1,20 @@
+# Template file for 'gtklock'
+pkgname=gtklock
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config wayland-devel"
+makedepends="pam-devel gtk+3-devel gtk-layer-shell-devel"
+short_desc="GTK-based lockscreen for Wayland"
+maintainer="Jovan Lanik <jox969@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/jovanlanik/gtklock"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=4dfbff5f484153e62aa0cd63f538a5baf9e32c890f8c6f62dd85274670289bc5
+
+post_install() {
+ # copying CSS example provided
+ vmkdir /usr/share/gtklock
+ vcopy assets/* /usr/share/gtklock
+}
From 9a69de441a38348f4abf4584a402430f8a80726c Mon Sep 17 00:00:00 2001
From: Rodrigo Oliveira <mdkcore@qtrnn.io>
Date: Fri, 27 May 2022 19:50:10 -0300
Subject: [PATCH 192/608] xdg-desktop-portal: update to 1.14.4
Explicitly disable systemd build, and bump fuse-devel version as fuse3 is now
required to properly build xdg-desktop-portal.
---
srcpkgs/xdg-desktop-portal/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 2f1c240cebb0..8318c768fe4b 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,11 +1,11 @@
# Template file for 'xdg-desktop-portal'
pkgname=xdg-desktop-portal
-version=1.8.1
+version=1.14.4
revision=1
build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
+configure_args="--enable-pipewire --enable-geoclue --enable-libportal --without-systemd"
hostmakedepends="pkg-config glib-devel"
-makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel
+makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
libportal-devel"
checkdepends="dbus"
short_desc="Portal frontend service for Flatpak"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/flatpak/xdg-desktop-portal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
+checksum=0590199a65daee7c4f3e5c293e3d5b287610bf9299c4515eacc3d133474f0c73
do_check() {
# some tests require a dbus session
From 1a1107fb3b712093e2828a58c8b4a6486804a96b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 1 Jun 2022 22:44:11 +0530
Subject: [PATCH 193/608] New package: wlopm-0.1.0
---
srcpkgs/wlopm/template | 18 ++++++++++++++++++
srcpkgs/wlopm/update | 2 ++
2 files changed, 20 insertions(+)
create mode 100644 srcpkgs/wlopm/template
create mode 100644 srcpkgs/wlopm/update
diff --git a/srcpkgs/wlopm/template b/srcpkgs/wlopm/template
new file mode 100644
index 000000000000..f07be45820b0
--- /dev/null
+++ b/srcpkgs/wlopm/template
@@ -0,0 +1,18 @@
+# Template file for 'wlopm'
+pkgname=wlopm
+version=0.1.0
+revision=1
+wrksrc=${pkgname}-v${version}
+build_style=gnu-makefile
+hostmakedepends="wayland-devel"
+makedepends="wayland-devel"
+short_desc="Simple client implementing zwlr-output-power-management-v1"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~leon_plickat/wlopm"
+distfiles="https://git.sr.ht/~leon_plickat/wlopm/archive/v${version}.tar.gz"
+checksum=f9a7ec03a412e602420ab11d0eea872f6d30dfe5cfee93cd3d0289e4fbbb3aa1
+
+post_install() {
+ vman wlopm.1
+}
diff --git a/srcpkgs/wlopm/update b/srcpkgs/wlopm/update
new file mode 100644
index 000000000000..a0f8bcfb49e3
--- /dev/null
+++ b/srcpkgs/wlopm/update
@@ -0,0 +1,2 @@
+site="https://git.sr.ht/~leon_plickat/wlopm/refs"
+pattern="v\K\d+\.\d+\.\d+(?=)"
From 088cac9f5d1a5daee818faea7f23dd1ef39ed55c Mon Sep 17 00:00:00 2001
From: CToID <funk443@yandex.com>
Date: Wed, 1 Jun 2022 11:39:08 +0800
Subject: [PATCH 194/608] New package: ibus-array-0.2.2
Closes: #37372 [via git-merge-pr]
Co-Authored-By: Duncaen <duncaen@voidlinux.org>
---
srcpkgs/ibus-array/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/ibus-array/template
diff --git a/srcpkgs/ibus-array/template b/srcpkgs/ibus-array/template
new file mode 100644
index 000000000000..182945a4907f
--- /dev/null
+++ b/srcpkgs/ibus-array/template
@@ -0,0 +1,20 @@
+# Template file for 'ibus-array'
+pkgname=ibus-array
+version=0.2.2
+revision=1
+wrksrc="ibus-array-release-${version}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config python3 ibus-devel gettext-devel sqlite-devel libtool"
+makedepends="ibus-devel gettext-devel sqlite-devel"
+short_desc="Array 30 engine for iBus"
+maintainer="CToID <funk443@yandex.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/lexical/ibus-array"
+distfiles="https://github.com/lexical/ibus-array/archive/refs/tags/release-${version}.tar.gz"
+checksum=736fee6de90674619f6ad9b0821dc989d91c7b9f364cd7b2b228fdecd9814f85
+
+python_version=3
+
+pre_configure() {
+ autoreconf -fi
+}
From bd24f31172d437f5d3dbbdb679affc037fe205a1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 20:04:31 +0200
Subject: [PATCH 195/608] ibus-array: remove unneeded hostmakedepends
---
srcpkgs/ibus-array/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ibus-array/template b/srcpkgs/ibus-array/template
index 182945a4907f..2b799f93d850 100644
--- a/srcpkgs/ibus-array/template
+++ b/srcpkgs/ibus-array/template
@@ -4,7 +4,7 @@ version=0.2.2
revision=1
wrksrc="ibus-array-release-${version}"
build_style=gnu-configure
-hostmakedepends="automake pkg-config python3 ibus-devel gettext-devel sqlite-devel libtool"
+hostmakedepends="automake pkg-config python3 gettext-devel libtool"
makedepends="ibus-devel gettext-devel sqlite-devel"
short_desc="Array 30 engine for iBus"
maintainer="CToID <funk443@yandex.com>"
From e3b8d8d8f1d11d5a6fd67567eca30840ce201b85 Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Wed, 25 May 2022 13:04:19 +0200
Subject: [PATCH 196/608] New package: wl-mirror-0.11.2
---
srcpkgs/wl-mirror/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/wl-mirror/template
diff --git a/srcpkgs/wl-mirror/template b/srcpkgs/wl-mirror/template
new file mode 100644
index 000000000000..fae87d95aee8
--- /dev/null
+++ b/srcpkgs/wl-mirror/template
@@ -0,0 +1,14 @@
+# Template file for 'wl-mirror'
+pkgname=wl-mirror
+version=0.11.2
+revision=1
+build_style=cmake
+configure_args="-DWLR_PROTOCOL_DIR=${wrksrc}/proto/wlr-protocols"
+hostmakedepends="wayland-devel"
+makedepends="libglvnd-devel wayland-devel wayland-protocols"
+short_desc="Simple Wayland output mirror client"
+maintainer="Tung Anh Vu <vu.tunganh96@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ferdi265/wl-mirror"
+distfiles="https://github.com/Ferdi265/wl-mirror/releases/download/v${version}/wl-mirror-${version}.tar.gz"
+checksum=6ae70c0912eded7f99af16d97f48aa68bbf0e2626ecdc50284f70e237096d6c6
From 068a675dc829e4e35ad50351b060e7a79e3e98c6 Mon Sep 17 00:00:00 2001
From: dashslash <omukou@disroot.org>
Date: Sun, 22 May 2022 20:00:05 -0500
Subject: [PATCH 197/608] libstrophe: update to 0.12.0.
---
srcpkgs/libstrophe/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 5dad32e38267..b3947a91e381 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,7 +1,7 @@
# Template file for 'libstrophe'
pkgname=libstrophe
-version=0.10.1
-revision=2
+version=0.12.0
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable cares) $(vopt_enable tls)"
hostmakedepends="automake libtool pkg-config"
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
homepage="http://strophe.im/libstrophe/"
changelog="https://raw.githubusercontent.com/strophe/libstrophe/master/ChangeLog"
distfiles="https://github.com/strophe/libstrophe/archive/${version}.tar.gz"
-checksum=5bf0bbc555cb6059008f1b748370d4d2ee1e1fabd3eeab68475263556405ba39
+checksum=f645819d8d93711c92454974dd9007c9b9e98ea0b59cb708dc626dd4c6b9d0a8
build_options="cares tls"
build_options_default="tls"
From 75612ebcc7322c08d1cf83125cfe53fa9d3181ac Mon Sep 17 00:00:00 2001
From: dashslash <omukou@disroot.org>
Date: Sun, 22 May 2022 20:00:10 -0500
Subject: [PATCH 198/608] profanity: update to 0.12.1.
---
srcpkgs/profanity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index 959da4cedb93..d5004820bcce 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,6 +1,6 @@
# Template file for 'profanity'
pkgname=profanity
-version=0.11.1
+version=0.12.1
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
homepage="https://profanity-im.github.io/"
changelog="https://raw.githubusercontent.com/profanity-im/profanity/master/CHANGELOG"
distfiles="https://github.com/boothj5/profanity/releases/download/${version}/profanity-${version}.tar.gz"
-checksum=6f1b4df6c2971f51d03d48d2bfd4f69b4404410d800b43f029ea1cf08a02bd45
+checksum=e344481e7bf3b16baf58a169d321b809c4700becffb70db6f1c39adc3fad306e
case "$XBPS_TARGET_MACHINE" in
arm*)
From f0b3d72540cce2f1f53fbfa525131d21fc74b48c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 21:13:06 +0200
Subject: [PATCH 199/608] libostree: update to 2022.4.
---
.../patches/fix-tests-musl-error-strings.patch | 12 ++++++++++++
srcpkgs/libostree/patches/musl-fixes.patch | 10 ++++++----
srcpkgs/libostree/template | 4 ++--
3 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch
diff --git a/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch b/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch
new file mode 100644
index 000000000000..e5ea3c16b925
--- /dev/null
+++ b/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch
@@ -0,0 +1,12 @@
+glibc's and musl's strerror for EOVERFLOW are different...
+
+--- a/tests/test-commit-timestamp.sh
++++ b/tests/test-commit-timestamp.sh
+@@ -40,6 +40,6 @@
+ ${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt
+ rm -rf testrepo testrepo-files
+ assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH'
+-assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range'
++assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH:'
+ assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000'
+ echo "ok commit with env timestamp"
diff --git a/srcpkgs/libostree/patches/musl-fixes.patch b/srcpkgs/libostree/patches/musl-fixes.patch
index 6eb0119bf1f3..956ab625e047 100644
--- a/srcpkgs/libostree/patches/musl-fixes.patch
+++ b/srcpkgs/libostree/patches/musl-fixes.patch
@@ -1,10 +1,8 @@
--- a/config.h.in
+++ b/config.h.in
-@@ -154,3 +154,13 @@
+@@ -1,5 +1,15 @@
+ /* config.h.in. Generated from configure.ac by autoheader. */
- /* Define to 1 if you need to in order for `stat' and other things to work. */
- #undef _POSIX_SOURCE
-+
+/* taken from glibc unistd.h and fixes musl */
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression) \
@@ -14,3 +12,7 @@
+ while (__result == -1L && errno == EINTR); \
+ __result; }))
+#endif
++
+ /* Define if we are building with asan and ubsan */
+ #undef BUILDOPT_ASAN
+
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index 96ce2464312d..50876cecf97a 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,6 +1,6 @@
# Template file for 'libostree'
pkgname=libostree
-version=2021.2
+version=2022.4
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -19,7 +19,7 @@ license="LGPL-2.0-or-later"
homepage="https://ostree.readthedocs.io/en/latest/"
changelog="https://github.com/ostreedev/ostree/releases"
distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"
-checksum=854008e7c71d44f6b3670f0e9b8500db0f08ff8b297d0b30a7cb9a66f34c5d7c
+checksum=14bbd351a95066f68c3b283e0bd0ddd03562e862af66f6f6d894c6c328d7eb81
build_options="gir"
build_options_default="gir"
From 69451bc60e01055137d7db29ef064e64ab26bb45 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Wed, 29 Jun 2022 21:31:41 +0200
Subject: [PATCH 200/608] gtklock: update to 1.2.0
---
srcpkgs/gtklock/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template
index c7cf960401dc..136b690aaa89 100644
--- a/srcpkgs/gtklock/template
+++ b/srcpkgs/gtklock/template
@@ -1,6 +1,6 @@
# Template file for 'gtklock'
pkgname=gtklock
-version=1.0.0
+version=1.2.0
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -11,7 +11,7 @@ maintainer="Jovan Lanik <jox969@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/jovanlanik/gtklock"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4dfbff5f484153e62aa0cd63f538a5baf9e32c890f8c6f62dd85274670289bc5
+checksum=0e4c74ef5a381c20e6ed199038300671dea0d85ff4cf76ffc50810f6056ff000
post_install() {
# copying CSS example provided
From ab8e4d4e40d93f1350b1c6c4a792566bca799003 Mon Sep 17 00:00:00 2001
From: Simon Wells <simonrwells@gmail.com>
Date: Tue, 28 Jun 2022 07:14:40 +1200
Subject: [PATCH 201/608] solvespace: update to 3.1
update to 3.1, add system eigen, add changelog link(classyabbyamp)
---
srcpkgs/solvespace/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index fa97e2ead290..376b78cd20be 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -1,20 +1,21 @@
# Template file for 'solvespace'
pkgname=solvespace
-version=3.0
+version=3.1
revision=1
_libdxfrw_hash=0b7b7b709d9299565db603f878214656ef5e9ddf
_mimalloc_hash=4e643b6d3178e0ea2a093b7e14fe621631a91e4b
build_style=cmake
hostmakedepends="pkg-config git"
-makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel"
+makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel eigen"
short_desc="Parametric 2d/3d CAD"
maintainer="Robert Lowry <bobertlo@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://solvespace.com/index.pl"
+changelog="https://github.com/solvespace/solvespace/raw/master/CHANGELOG.md"
distfiles="https://github.com/solvespace/solvespace/archive/refs/tags/v${version}.tar.gz
https://github.com/solvespace/libdxfrw/archive/${_libdxfrw_hash}.tar.gz
https://github.com/microsoft/mimalloc/archive/${_mimalloc_hash}.tar.gz"
-checksum="04cda618fbbbe2db92713adf2fff4264017f858bac6f737c9da11efab693be4f
+checksum="ab4b3a5fecb1800f8eab82a92138a70227e869d2066ee881441b1e13035786dc
3f7d37ee63f85219da3c63a266023008b8df993965a355739a3fdff3bfb2f932
448ac898c72468c4f632a0818cc4b8ec83a4669402ee059d74df35f94f3e2f34"
nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265"
From 620dff4dc0d42aefaa7b5ecf21826b1d38213c9d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 24 May 2022 22:12:47 +0300
Subject: [PATCH 202/608] mkfontscale: update to 1.2.2.
---
srcpkgs/mkfontscale/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mkfontscale/template b/srcpkgs/mkfontscale/template
index da4760b8d254..4dfb97bd6ae9 100644
--- a/srcpkgs/mkfontscale/template
+++ b/srcpkgs/mkfontscale/template
@@ -1,7 +1,7 @@
# Template file for 'mkfontscale'
pkgname=mkfontscale
-version=1.2.1
-revision=2
+version=1.2.2
+revision=1
build_style=gnu-configure
configure_args="--with-bzip2"
hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="X11 Scalable Font Index Generator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.x.org/wiki"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8ae3fb5b1fe7436e1f565060acaa3e2918fe745b0e4979b5593968914fe2d5c4
post_install() {
vlicense COPYING
From 9efa33af57a3b28b114fa944a304ca2851681a84 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 May 2022 09:08:30 +0300
Subject: [PATCH 203/608] flare-engine: update to 1.13.04.
---
srcpkgs/flare-engine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/flare-engine/template b/srcpkgs/flare-engine/template
index 469506f640ae..8d300f61d227 100644
--- a/srcpkgs/flare-engine/template
+++ b/srcpkgs/flare-engine/template
@@ -1,6 +1,6 @@
# Template file for 'flare-engine'
pkgname=flare-engine
-version=1.12
+version=1.13.04
revision=1
build_style=cmake
configure_args="-DBINDIR=/usr/bin -DDATADIR=share/flare"
@@ -11,6 +11,6 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
homepage="http://flarerpg.org/"
changelog="https://raw.githubusercontent.com/flareteam/flare-engine/master/RELEASE_NOTES.txt"
-distfiles="https://github.com/flareteam/flare-engine/archive/v${version}.tar.gz"
-checksum=287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e
+distfiles="https://github.com/flareteam/flare-engine/archive/refs/tags/v${version}.tar.gz"
+checksum=13dcfe562b98a5456ba5ba3fdffb457b8d92bfe8e332edfbe025353dbd0eb043
replaces="flare-engine-data>=0"
From 46a87cdfd3d749ef7a2ee4edc5feed643bd0fb9f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 22 May 2022 09:08:35 +0300
Subject: [PATCH 204/608] flare-game: update to 1.13.04.
---
srcpkgs/flare-game/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/flare-game/template b/srcpkgs/flare-game/template
index 3b1c1a25ca07..a23eb186f226 100644
--- a/srcpkgs/flare-game/template
+++ b/srcpkgs/flare-game/template
@@ -1,6 +1,6 @@
# Template file for 'flare-game'
pkgname=flare-game
-version=1.12
+version=1.13.04
revision=1
build_style=cmake
configure_args="-DDATADIR=share/flare"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later, CC-BY-SA-3.0"
homepage="http://flarerpg.org/"
distfiles="https://github.com/flareteam/flare-game/archive/v${version}.tar.gz"
-checksum=19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160
+checksum=bbb278516c46e96ecc9b9470af3c37348ccb5dc61d33bd91c4823c090ccf2c78
post_install() {
vlicense LICENSE.txt
From baa4198fe437f465066e6d8c84aec95b08c02d9f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 21 May 2022 16:20:25 +0300
Subject: [PATCH 205/608] sinit: update to 1.1.
---
srcpkgs/sinit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/sinit/template b/srcpkgs/sinit/template
index bf2e23a5bc85..14f2f838a96b 100644
--- a/srcpkgs/sinit/template
+++ b/srcpkgs/sinit/template
@@ -1,14 +1,14 @@
# Template file for 'sinit'
pkgname=sinit
-version=1.0
-revision=2
+version=1.1
+revision=1
build_style=gnu-makefile
-short_desc="A simple init, initially based on Rich Felker’s minimal init"
+short_desc="Simple init, initially based on Rich Felker’s minimal init"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://tools.suckless.org/sinit/"
distfiles="http://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=78c2120a97a5e93b80606c5403bd731152f8a344e47aa4ab74970c1c11dc6fc0
+checksum=545a6dd100e17a089b009562a946d76ff0578d060c237d94d39fadc555f7b549
pre_build() {
LD=$CC
From 9963e9f947c4761c89a57cdec2343ba7184bb5a6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 20 May 2022 10:22:11 +0200
Subject: [PATCH 206/608] radicale: update to 3.1.7.
---
srcpkgs/radicale/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 65eb085022c0..74b950908a53 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,6 +1,6 @@
# Template file for 'radicale'
pkgname=radicale
-version=3.1.5
+version=3.1.7
revision=1
wrksrc="Radicale-${version}"
build_style=python3-module
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://radicale.org"
changelog="https://github.com/Kozea/Radicale/blob/master/CHANGELOG.md"
distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
-checksum=1d631d0c0efd049c05fb32876d8e4f5662df4fa91f8aa6f52a994608d9a3e12d
+checksum=17d65e1a25925e4531dec3a3c7b49447b8f92d2d825489249bf99fde224151ca
conf_files="
/etc/radicale/config
/etc/radicale/rights
From c97b4e1fc7456a182b2036ea12ac2deb28498391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Fri, 20 May 2022 09:26:11 +0200
Subject: [PATCH 207/608] ausweisapp2: update to 1.22.6
Use official tarball to better check hashsums and maybe the signature
someday.
---
srcpkgs/AusweisApp2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 5ee22fec995c..c6753ed80682 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,6 +1,6 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
-version=1.22.2
+version=1.22.6
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -11,5 +11,5 @@ short_desc="Official authentication app for German ID cards and residence permit
maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="EUPL-1.2"
homepage="https://www.ausweisapp.bund.de/ausweisapp2/"
-distfiles="https://github.com/Governikus/AusweisApp2/archive/refs/tags/${version}.tar.gz"
-checksum=79d637a976dc1dc5445757a43324f4fe609d844bf90f11c0f62a46c39dc4fea6
+distfiles="https://github.com/Governikus/AusweisApp2/releases/download/${version}/AusweisApp2-${version}.tar.gz"
+checksum=3665502eb9fa5811c58ffd1952e15589216bcaaf88c63458ac5930c9ad588945
From 7b7cb252787a18dc1c342e73b16e3b3d8787a38c Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 14 May 2022 16:20:41 +0530
Subject: [PATCH 208/608] New package: wmenu-0.1.0
---
srcpkgs/wmenu/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/wmenu/template
diff --git a/srcpkgs/wmenu/template b/srcpkgs/wmenu/template
new file mode 100644
index 000000000000..40a5c7219cd3
--- /dev/null
+++ b/srcpkgs/wmenu/template
@@ -0,0 +1,17 @@
+# Template file for 'wmenu'
+pkgname=wmenu
+version=0.1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config scdoc wayland-devel"
+makedepends="pango-devel wayland-devel libxkbcommon-devel wayland-protocols"
+short_desc="Dmenu for wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://sr.ht/~adnano/wmenu/"
+distfiles="https://git.sr.ht/~adnano/wmenu/archive/${version}.tar.gz"
+checksum=d102703f038712d602530cc80ab58841f86834d4a377cb9e533c5ccc399a822c
+
+post_install() {
+ vlicense LICENSE
+}
From e6934de765af4dca0f97a1761e532757f46f07fb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 14 May 2022 17:40:39 +0300
Subject: [PATCH 209/608] cbatticon-gtk3: update to 1.6.13.
---
srcpkgs/cbatticon-gtk3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cbatticon-gtk3/template b/srcpkgs/cbatticon-gtk3/template
index 4e67df7be0d0..09b3255f8c58 100644
--- a/srcpkgs/cbatticon-gtk3/template
+++ b/srcpkgs/cbatticon-gtk3/template
@@ -1,6 +1,6 @@
# Template file for 'cbatticon-gtk3'
pkgname=cbatticon-gtk3
-version=1.6.10
+version=1.6.13
revision=1
wrksrc="cbatticon-${version}"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
homepage="https://github.com/valr/cbatticon"
changelog="https://raw.githubusercontent.com/valr/cbatticon/master/Changelog"
distfiles="https://github.com/valr/cbatticon/archive/${version}.tar.gz"
-checksum=c9782e86dab64bea17583640f23e9fda34682967984f2105aa21e0d1c355cd57
+checksum=87c6dae4a20dcfbf4897b110a7c5105fa8cf10de74b19e128b0cfd6212c55098
provides="cbatticon-${version}_${revision}"
replaces="cbatticon-gtk2>=0"
From 8f7baa33d761bf5ade3db82fd2b0672d4b84a5a2 Mon Sep 17 00:00:00 2001
From: beltofdespair <mogwinglodot@protonmail.com>
Date: Sat, 14 May 2022 17:48:32 -0500
Subject: [PATCH 210/608] mednafen: update to 1.29.0.
---
.../patches/ppc64-snes-libco-elfv2.patch | 325 ------------------
srcpkgs/mednafen/template | 4 +-
2 files changed, 2 insertions(+), 327 deletions(-)
delete mode 100644 srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch
diff --git a/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch b/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch
deleted file mode 100644
index 3f78b4f94e75..000000000000
--- a/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-Note: this is adapted from an equivalent change in higan/bsnes.
-Slightly modified for mednafen (no settings.h, different paths)
-
-From ddf550c1438d60b893a4fc1da333e021ac0e3658 Mon Sep 17 00:00:00 2001
-From: Shawn Anastasio <shawn@anastas.io>
-Date: Tue, 23 Jul 2019 15:59:03 -0500
-Subject: [PATCH] Implement ppc64 ELFv2 support in libco
-
-The existing ppc implementation in libco only supports
-the ELFv1 ABI on PowerPC 64 and therefore can't be used on
-Little Endian systems and Big Endian systems running ELFv2
-distros.
-
-This commit introduces a new implementation of the libco
-API for ppc64 elfv2. It has been tested with bsnes and higan.
-The original ppc implementation is maintained for non-ELFv2
-targets.
----
- libco/libco.c | 4 +-
- libco/ppc64v2.c | 284 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 287 insertions(+), 1 deletion(-)
- create mode 100644 libco/ppc64v2.c
-
-diff --git a/libco/libco.c b/libco/libco.c
-index de11fbe9..f5ee5d0a 100755
---- a/src/snes/src/lib/libco/libco.c
-+++ b/src/snes/src/lib/libco/libco.c
-@@ -9,6 +9,8 @@
- #include "amd64.c"
- #elif defined(__arm__)
- #include "arm.c"
-+ #elif defined(__powerpc64__) && defined(_CALL_ELF) && (_CALL_ELF == 2)
-+ #include "ppc64v2.c"
- #elif defined(_ARCH_PPC)
- #include "ppc.c"
- #elif defined(_WIN32)
-diff --git a/libco/ppc64v2.c b/libco/ppc64v2.c
-new file mode 100644
-index 00000000..8f733de2
---- /dev/null
-+++ b/src/snes/src/lib/libco/ppc64v2.c
-@@ -0,0 +1,283 @@
-+/**
-+ * libco implementation for ppc64 elfv2.
-+ *
-+ * Written by Shawn Anastasio.
-+ * Licensed under the ISC license.
-+ */
-+
-+#define LIBCO_C
-+#include "libco.h"
-+
-+#include <stdint.h>
-+#include <stdlib.h>
-+#include <assert.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct ppc64_context {
-+ // GPRs
-+ uint64_t gprs[32];
-+ uint64_t lr;
-+ uint64_t ccr;
-+
-+ // FPRs
-+ uint64_t fprs[32];
-+
-+#ifdef __ALTIVEC__
-+ // Altivec (VMX)
-+ uint64_t vmx[24 /* 12 non-volatile * 2 */];
-+ uint32_t vrsave;
-+#endif
-+};
-+
-+static thread_local struct ppc64_context *context_running = 0;
-+
-+#define MAX(x, y) ((x) > (y) ? (x) : (y))
-+#define ALIGN(ptr, x) ( (void *)( (uintptr_t)(ptr) & ~((x)-1) ) )
-+
-+#define MIN_STACK 0x10000lu
-+#define MIN_STACK_FRAME 0x20lu
-+#define STACK_ALIGN 0x10lu
-+
-+void swap_context(struct ppc64_context *read, struct ppc64_context *write);
-+__asm__(
-+ ".text\n"
-+ ".align 4\n"
-+ ".type swap_context @function\n"
-+ "swap_context:\n"
-+ ".cfi_startproc\n"
-+
-+ // Dump non-volatile and special GPRs
-+ "std 1, 8(4)\n"
-+ "std 2, 16(4)\n"
-+ "std 12, 96(4)\n"
-+ "std 13, 104(4)\n"
-+ "std 14, 112(4)\n"
-+ "std 15, 120(4)\n"
-+ "std 16, 128(4)\n"
-+ "std 17, 136(4)\n"
-+ "std 18, 144(4)\n"
-+ "std 19, 152(4)\n"
-+ "std 20, 160(4)\n"
-+ "std 21, 168(4)\n"
-+ "std 22, 176(4)\n"
-+ "std 23, 184(4)\n"
-+ "std 24, 192(4)\n"
-+ "std 25, 200(4)\n"
-+ "std 26, 208(4)\n"
-+ "std 27, 216(4)\n"
-+ "std 28, 224(4)\n"
-+ "std 29, 232(4)\n"
-+ "std 30, 240(4)\n"
-+ "std 31, 248(4)\n"
-+
-+ // LR
-+ "mflr 5\n"
-+ "std 5, 256(4)\n"
-+
-+ // CCR
-+ "mfcr 5\n"
-+ "std 5, 264(4)\n"
-+
-+ // Dump non-volatile FPRs
-+ "stfd 14, 384(4)\n"
-+ "stfd 15, 392(4)\n"
-+ "stfd 16, 400(4)\n"
-+ "stfd 17, 408(4)\n"
-+ "stfd 18, 416(4)\n"
-+ "stfd 19, 424(4)\n"
-+ "stfd 20, 432(4)\n"
-+ "stfd 21, 440(4)\n"
-+ "stfd 22, 448(4)\n"
-+ "stfd 23, 456(4)\n"
-+ "stfd 24, 464(4)\n"
-+ "stfd 25, 472(4)\n"
-+ "stfd 26, 480(4)\n"
-+ "stfd 27, 488(4)\n"
-+ "stfd 28, 496(4)\n"
-+ "stfd 29, 504(4)\n"
-+ "stfd 30, 512(4)\n"
-+ "stfd 31, 520(4)\n"
-+
-+#ifdef __ALTIVEC__
-+ // Dump non-volatile VMX registers
-+ "li 5, 528\n"
-+ "stvxl 20, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 21, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 22, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 23, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 24, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 25, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 26, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 27, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 28, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 29, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 30, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+ "stvxl 31, 4, 5\n"
-+ "addi 5, 5, 16\n"
-+
-+ // VRSAVE
-+ "mfvrsave 5\n"
-+ "stw 5, 736(4)\n"
-+#endif
-+
-+ // Restore GPRs
-+ "ld 1, 8(3)\n"
-+ "ld 2, 16(3)\n"
-+ "ld 12, 96(3)\n"
-+ "ld 13, 104(3)\n"
-+ "ld 14, 112(3)\n"
-+ "ld 15, 120(3)\n"
-+ "ld 16, 128(3)\n"
-+ "ld 17, 136(3)\n"
-+ "ld 18, 144(3)\n"
-+ "ld 19, 152(3)\n"
-+ "ld 20, 160(3)\n"
-+ "ld 21, 168(3)\n"
-+ "ld 22, 176(3)\n"
-+ "ld 23, 184(3)\n"
-+ "ld 24, 192(3)\n"
-+ "ld 25, 200(3)\n"
-+ "ld 26, 208(3)\n"
-+ "ld 27, 216(3)\n"
-+ "ld 28, 224(3)\n"
-+ "ld 29, 232(3)\n"
-+ "ld 30, 240(3)\n"
-+ "ld 31, 248(3)\n"
-+
-+ // Restore LR
-+ "ld 5, 256(3)\n"
-+ "mtlr 5\n"
-+
-+ // Restore CCR
-+ "ld 5, 264(3)\n"
-+ "mtcr 5\n"
-+
-+ // Restore FPRs
-+ "lfd 14, 384(3)\n"
-+ "lfd 15, 392(3)\n"
-+ "lfd 16, 400(3)\n"
-+ "lfd 17, 408(3)\n"
-+ "lfd 18, 416(3)\n"
-+ "lfd 19, 424(3)\n"
-+ "lfd 20, 432(3)\n"
-+ "lfd 21, 440(3)\n"
-+ "lfd 22, 448(3)\n"
-+ "lfd 23, 456(3)\n"
-+ "lfd 24, 464(3)\n"
-+ "lfd 25, 472(3)\n"
-+ "lfd 26, 480(3)\n"
-+ "lfd 27, 488(3)\n"
-+ "lfd 28, 496(3)\n"
-+ "lfd 29, 504(3)\n"
-+ "lfd 30, 512(3)\n"
-+ "lfd 31, 520(3)\n"
-+
-+#ifdef __ALTIVEC__
-+ // Restore VMX
-+ "li 5, 528\n"
-+ "lvxl 20, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 21, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 22, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 23, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 24, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 25, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 26, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 27, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 28, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 29, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 30, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+ "lvxl 31, 3, 5\n"
-+ "addi 5, 5, 16\n"
-+
-+ // VRSAVE
-+ "lwz 5, 720(3)\n"
-+ "mtvrsave 5\n"
-+#endif
-+
-+ // Context restored, branch to LR
-+ "blr\n"
-+
-+ ".cfi_endproc\n"
-+ ".size swap_context, .-swap_context\n"
-+);
-+
-+cothread_t co_active() {
-+ if (!context_running)
-+ context_running = (struct ppc64_context *)
-+ malloc(MIN_STACK + sizeof(struct ppc64_context));
-+ return (cothread_t)context_running;
-+}
-+
-+cothread_t co_derive(void *memory, unsigned int size, void (*coentry)(void)) {
-+ uint8_t *sp;
-+ struct ppc64_context *context = (struct ppc64_context *)memory;
-+
-+ // Save current context into new context to initialize it
-+ swap_context(context, context);
-+
-+ // Align stack
-+ sp = (uint8_t *)memory + size - STACK_ALIGN;
-+ sp = (uint8_t *)ALIGN(sp, STACK_ALIGN);
-+
-+ // Write 0 for initial backchain
-+ *(uint64_t *)sp = 0;
-+
-+ // Create new frame with backchain
-+ sp -= MIN_STACK_FRAME;
-+ *(uint64_t *)sp = (uint64_t)(sp + MIN_STACK_FRAME);
-+
-+ // Update context with new stack (r1) and entrypoint (LR, r12)
-+ context->lr = (uint64_t)coentry;
-+ context->gprs[12] = (uint64_t)coentry;
-+ context->gprs[1] = (uint64_t)sp;
-+
-+ return (cothread_t)memory;
-+}
-+
-+cothread_t co_create(unsigned int size, void (*coentry)(void)) {
-+ size_t total = MAX(size, MIN_STACK) + sizeof(struct ppc64_context);
-+ void *memory = malloc(total);
-+ if (!memory)
-+ return (cothread_t)0;
-+
-+ return co_derive(memory, total, coentry);
-+}
-+
-+void co_delete(cothread_t t) {
-+ free(t);
-+}
-+
-+void co_switch(cothread_t t) {
-+ struct ppc64_context *old = context_running;
-+ context_running = (struct ppc64_context *)t;
-+ swap_context((struct ppc64_context *)t, old);
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
diff --git a/srcpkgs/mednafen/template b/srcpkgs/mednafen/template
index e56addb35013..4d0cdc5883a6 100644
--- a/srcpkgs/mednafen/template
+++ b/srcpkgs/mednafen/template
@@ -1,6 +1,6 @@
# Template file for 'mednafen'
pkgname=mednafen
-version=1.26.1
+version=1.29.0
revision=1
wrksrc="$pkgname"
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://mednafen.github.io/"
distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz"
-checksum=842907c25c4292c9ba497c9cb9229c7d10e04e22cb4740d154ab690e6587fdf4
+checksum=da3fbcf02877f9be0f028bfa5d1cb59e953a4049b90fe7e39388a3386d9f362e
nopie=yes
build_options="altivec"
From 9316907a9e95a3ffee38a9e6a0e588a7ce6bf631 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 16 May 2022 09:47:05 +0700
Subject: [PATCH 211/608] opentoonz: update to 1.6.0
---
srcpkgs/opentoonz/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 540a66afc6bc..23bba3407e89 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
# Template file for 'opentoonz'
pkgname=opentoonz
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
build_wrksrc="toonz/sources"
build_style=cmake
make_cmd=make
@@ -15,7 +15,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="BSD-3-Clause"
homepage="https://opentoonz.github.io/e/"
distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
-checksum=fba0f381fb71ffda89e6423b4d461450d4851f93830342e69e36313070af5990
+checksum=9a6c28cb3933756dbebb45e849bdafc9e6d93d0328c4fd4d7bc8ec3ae481f684
export CMAKE_GENERATOR="Unix Makefiles"
From d6ee9c092b87dd8882042690ee62f45c6ec5f861 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 May 2022 09:37:12 +0300
Subject: [PATCH 212/608] flacon: update to 9.0.0.
Also:
- add taglib-devel to makedepends (new upstream default dep).
---
srcpkgs/flacon/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index 3a9b96ec14c0..0e0365f4c2a8 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,10 +1,10 @@
# Template file for 'flacon'
pkgname=flacon
-version=7.0.1
+version=9.0.0
revision=1
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel uchardet-devel"
+makedepends="qt5-tools-devel uchardet-devel taglib-devel"
depends="ffmpeg hicolor-icon-theme"
short_desc="Audio File Encoder. Splits audio tracks into separate tracks"
maintainer="travankor <travankor@tuta.io>"
@@ -12,15 +12,7 @@ license="LGPL-2.1-or-later"
homepage="https://flacon.github.io/"
changelog="https://flacon.github.io/changelog/"
distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=f63b959099e7b97b02a7f9ccf2c922a99de6c0d1ec83e74c436fd10e41630b6e
-
-post_extract() {
- # no support for 64-bit atomics on these platforms in qt
- if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -i 's/QAtomicInteger<quint64>/QAtomicInteger<quint32>/' \
- converter/splitter.cpp
- fi
-}
+checksum=a83d5fe297ceb6408b7f63c56a6be336fe1c6d06ebedcc0c84a3f7dd234140e4
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
From 225b170b699b4fbee0e2549a9c8352339d650530 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 May 2022 23:31:36 +0300
Subject: [PATCH 213/608] fontconfig: update to 2.14.0.
---
srcpkgs/fontconfig/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 89c0cf5ea240..75597231084c 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,23 +1,19 @@
# Template file for 'fontconfig'
pkgname=fontconfig
-version=2.13.1
-revision=3
+version=2.14.0
+revision=1
build_style=gnu-configure
configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
-hostmakedepends="gperf pkg-config"
-makedepends="expat-devel freetype-devel libuuid-devel"
+hostmakedepends="gperf pkg-config python3"
+makedepends="expat-devel freetype-devel"
+checkdepends="curl unzip"
conf_files="/etc/fonts/fonts.conf"
short_desc="Library for configuring and customizing font access"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.fontconfig.org"
-distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.bz2"
-checksum=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
-
-pre_build() {
- # trick to regenerate hash functions :-)
- rm -f src/fcobjshash.h
-}
+distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.xz"
+checksum=dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac
post_install() {
if [ "$CROSS_BUILD" ]; then
From e5711c38da7e6265a2732b64a115156716cb9612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 1 May 2022 18:47:42 +0200
Subject: [PATCH 214/608] jack: update to 1.9.21, orphan.
---
srcpkgs/jack/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 9ec2bc358370..c018a5bacc64 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,21 +1,22 @@
# Template file for 'jack'
pkgname=jack
-version=1.9.20
+version=1.9.21
revision=1
wrksrc="jack2-${version}"
build_style=waf3
-configure_args="--alsa --classic --dbus"
+configure_args="--alsa --classic --dbus --example-tools"
hostmakedepends="pkg-config"
makedepends="eigen opus-devel libsamplerate-devel readline-devel
dbus-devel db-devel celt-devel $(vopt_if ffado libffado-devel)
$(vopt_if zalsa 'zita-alsa-pcmi-devel zita-resampler-devel')"
depends="python3-dbus"
short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
-maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://jackaudio.org/"
+changelog="https://raw.githubusercontent.com/jackaudio/jack2/master/ChangeLog.rst"
distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz"
-checksum=915ad2900992159bdb729b9fc4ea134b962ce32b2df0b384fee40a2c5808835d
+checksum=8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d
python_version=3
# Package build options
From 62a0e8932bd1ac6843e5792568920165c0957b80 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Fri, 29 Apr 2022 14:14:15 -0500
Subject: [PATCH 215/608] libarchive: update to 3.6.1
---
srcpkgs/libarchive/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index a5ee27d350d4..6b46500183bf 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,6 +1,6 @@
# Template file for 'libarchive'
pkgname=libarchive
-version=3.6.0
+version=3.6.1
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -18,7 +18,7 @@ license="BSD-2-Clause"
homepage="http://www.libarchive.org/"
changelog="https://raw.githubusercontent.com/wiki/libarchive/libarchive/ReleaseNotes.md"
distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz"
-checksum=a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852
+checksum=c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2
build_options="acl expat lzo lz4 ssl zstd"
build_options_default="acl ssl lz4 zstd"
From 530fee7648e1bac1a730e0e18f2b0dce35680baa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 21:57:24 +0200
Subject: [PATCH 216/608] gnutls: update to 3.7.6.
Closes: https://github.com/void-linux/void-packages/pull/37122
---
srcpkgs/gnutls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 9f2d7f905b7b..228bd0334166 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
# Template file for 'gnutls'
pkgname=gnutls
-version=3.7.4
+version=3.7.6
revision=1
build_style=gnu-configure
configure_args="--disable-guile --disable-static
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only, LGPL-2.1-or-later"
homepage="https://gnutls.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f
+checksum=77065719a345bfb18faa250134be4c53bef70c1bd61f6c0c23ceb8b44f0262ff
pre_check() {
# same as $PASS in tests/cert-tests/certtool.sh
From 0658688e09333c3c7c1df8ed6333ef9ea56d696b Mon Sep 17 00:00:00 2001
From: JailBird <jailbird@fdf.net>
Date: Tue, 26 Apr 2022 00:40:27 -0500
Subject: [PATCH 217/608] dnsdist: update to 1.7.1
---
srcpkgs/dnsdist/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index 35d8e23b0c9f..d08573223251 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,6 +1,6 @@
# Template file for 'dnsdist'
pkgname=dnsdist
-version=1.7.0
+version=1.7.1
revision=1
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
@@ -19,7 +19,7 @@ license="GPL-2.0-only"
homepage="https://dnsdist.org/"
changelog="https://dnsdist.org/changelog.html"
distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=78cc72cb0ccf7fb5f3f2fae09c79eda65a5256374da09bb541b735ea6868fc64
+checksum=273a8212be2ddfaf754f752bcda4c2abc671ca5d42f776263312eb4661ea2d66
system_accounts="_dnsdist"
From 4f4a75391c2301d1b733ac41d315affbad20ddf9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 25 Apr 2022 21:50:17 +0200
Subject: [PATCH 218/608] restic: update to 0.13.1.
---
srcpkgs/restic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 18e2a8b1f406..bfa028308146 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
# Template file for 'restic'
pkgname=restic
-version=0.13.0
+version=0.13.1
revision=1
build_style=go
go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
homepage="https://restic.net/"
changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=b3c09137b462548f44d764f98909534bef6e85fe029d4daf60545642cdefd3dd
+checksum=8430f80dc17b98fd78aca6f7d635bf12a486687677e15989a891ff4f6d8490a9
post_install() {
vlicense LICENSE
From 1afbd3afc47fcf7aad5387a7c81e4b61dad225fe Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Wed, 23 Mar 2022 00:37:59 +0200
Subject: [PATCH 219/608] paper-icon-theme: update to 1.5.0.20200312.
---
srcpkgs/paper-icon-theme/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/paper-icon-theme/template b/srcpkgs/paper-icon-theme/template
index 03cc7d412f61..b2b390bbf818 100644
--- a/srcpkgs/paper-icon-theme/template
+++ b/srcpkgs/paper-icon-theme/template
@@ -1,12 +1,13 @@
# Template file for 'paper-icon-theme'
pkgname=paper-icon-theme
-version=1.5.0
-revision=2
-wrksrc="${pkgname}-v.${version}"
+version=1.5.0.20200312
+revision=1
+_commit=aa3e8af7a1f0831a51fd7e638a4acb077a1e5188
+wrksrc="${pkgname}-${_commit}"
build_style=meson
short_desc="Modern freedesktop icon theme"
maintainer="travankor <travankor@tuta.io>"
license="CC-BY-SA-4.0"
homepage="https://github.com/snwh/paper-icon-theme"
-distfiles="${homepage}/archive/v.${version}.tar.gz"
-checksum=62f21dfe95ece481e5c635480f32347f1ad27ea66b2ef0526fe799090b298ece
+distfiles="https://github.com/snwh/paper-icon-theme/archive/${_commit}.tar.gz"
+checksum=ad76f45266693666df43fab5a381a60899de99e21a85961fa24d60f4cb639b27
From a04c1f6a1d253a8d1ec4c15e5e3ea865c7dfe2d4 Mon Sep 17 00:00:00 2001
From: ghost <gh0st@vivaldi.net>
Date: Tue, 26 Apr 2022 03:37:41 +0200
Subject: [PATCH 220/608] pencil2d: update to 0.6.6.
---
srcpkgs/pencil2d/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pencil2d/template b/srcpkgs/pencil2d/template
index 048dad18db97..65943965a30c 100644
--- a/srcpkgs/pencil2d/template
+++ b/srcpkgs/pencil2d/template
@@ -1,6 +1,6 @@
# Template file for 'pencil2d'
pkgname=pencil2d
-version=0.6.5
+version=0.6.6
revision=1
wrksrc=pencil-${version}
build_style=qmake
@@ -13,4 +13,4 @@ license="GPL-2.0-only"
homepage="https://pencil2d.org/"
changelog="https://raw.githubusercontent.com/pencil2d/pencil/master/ChangeLog.md"
distfiles="https://github.com/${pkgname}/pencil/archive/v${version}.tar.gz"
-checksum=31903c54c8f0a79385cc5f519b380d26524219984e619204820b946c96fc2482
+checksum=9dd1f7dd35a86dea33ec4415ac92e7df146309a1f52139c908cbd8b4767e53ff
From a6ca6638c6188444b56a1a850bd15d52714fe692 Mon Sep 17 00:00:00 2001
From: Tony Zorman <soliditsallgood@mailbox.org>
Date: Sat, 30 Apr 2022 20:25:09 +0200
Subject: [PATCH 221/608] haskell-language-server: update to 1.7.0.0
The -dynamic flag is needed, as with this release[1] we dynamically
compile against GHC and the relevant system libraries by default.
[1]: https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0
---
srcpkgs/haskell-language-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 0c7b2187c5ca..7860f754298f 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
# Template file for 'haskell-language-server'
pkgname=haskell-language-server
-version=1.6.1.0
+version=1.7.0.0
revision=1
build_style="haskell-stack"
-make_build_args="--stack-yaml stack-9.0.2.yaml"
+make_build_args="--stack-yaml stack-9.0.2.yaml --flag=haskell-language-server:-dynamic"
makedepends="ncurses-devel ncurses-libtinfo-devel icu-devel zlib-devel"
short_desc="Integration of ghcide and haskell-ide-engine"
maintainer="Wayne Van Son <waynevanson@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/haskell/haskell-language-server"
distfiles="https://github.com/haskell/haskell-language-server/archive/${version}.tar.gz"
-checksum=e5c336ad2de8d021c882cdac5bbc26bf6427df8d2a5bd244c05cf18296a9bfdc
+checksum=252fc5ae41ef77bbfa36f42eb38f69c953d5aa8757b510c5c45a03655da95513
nopie_files="
/usr/bin/haskell-language-server
/usr/bin/haskell-language-server-wrapper
From 171c580c02f3ed5e0395c0b2089714cbad38cc3d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 02:36:38 +0200
Subject: [PATCH 222/608] help2man: update to 1.49.2.
---
srcpkgs/help2man/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index ce9a6600538f..04762df68a96 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,14 +1,14 @@
# Template file for 'help2man'
pkgname=help2man
-version=1.49.1
+version=1.49.2
revision=1
build_style=gnu-configure
-hostmakedepends="perl-Locale-gettext"
-depends="$hostmakedepends"
+hostmakedepends="perl-Locale-gettext gettext"
+depends="perl-Locale-gettext"
short_desc="GNU conversion tool to create man files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/help2man"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fd99a664ec4be9a86a0dd89719989f14f367a9c079d75d0e1d71e18a7bb51b03
+checksum=9e2e0e213a7e0a36244eed6204d902b6504602a578b6ecd15268b1454deadd36
lib32disabled=yes
From a53bccd37ae6b3ca810e47c55650a288486c89e7 Mon Sep 17 00:00:00 2001
From: Quad <contact@quad.moe>
Date: Wed, 13 Apr 2022 19:20:41 +0200
Subject: [PATCH 223/608] mednaffe: update to 0.9.2
---
srcpkgs/mednaffe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mednaffe/template b/srcpkgs/mednaffe/template
index 7e5a7462c6b8..774e39eb77e9 100644
--- a/srcpkgs/mednaffe/template
+++ b/srcpkgs/mednaffe/template
@@ -1,6 +1,6 @@
# Template file for 'mednaffe'
pkgname=mednaffe
-version=0.9.1
+version=0.9.2
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="VladTheImpaler <vladimir-romanov-ii@yandex.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/AmatCoder/mednaffe"
distfiles="https://github.com/AmatCoder/mednaffe/releases/download/${version}/mednaffe-${version}.tar.gz"
-checksum=426cd53342db9f6d619f5b7fafda3a262e5b4789aa87790265bb09ce674b454f
+checksum=fd9d7ccf6d30cd1123492518bef9df44d67c73fc2817a8575191b24764ce4436
From ed016e43fbb465b50f8a8eadf1250db9b9e74152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?=
=?UTF-8?q?=EF=BD=94=EF=BD=89?= <hiljusti@so.dang.cool>
Date: Sun, 10 Apr 2022 22:53:13 -0700
Subject: [PATCH 224/608] sigi: update to 3.4.1
Closes: #36632 [via git-merge-pr]
---
srcpkgs/sigi/template | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
index d9fc482b8207..e7651b6d4dec 100644
--- a/srcpkgs/sigi/template
+++ b/srcpkgs/sigi/template
@@ -1,6 +1,6 @@
# Template file for 'sigi'
pkgname=sigi
-version=3.1.0
+version=3.4.1
revision=1
build_style=cargo
short_desc="Organization tool for people who hate organization"
@@ -8,14 +8,7 @@ maintainer="J.R. Hill <hiljusti@so.dang.cool>"
license="GPL-2.0-only"
homepage="https://github.com/hiljusti/sigi"
distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
-checksum=967e492a89f05c3a373929a48e0a1a7712d4742b150216228feff4a7869297e3
-
-pre_check() {
- # CLI tests in the project rely on BATS (more than just bats-core) through
- # git submodules. We skip those tests here until the other bats components
- # are imported in Void or https://github.com/hiljusti/sigi/issues/19
- export SKIP_BATS_TESTS=1
-}
+checksum=81f1171495ca53246df1f271e7bc631454e94c8294b95e277f29136572bef6ad
post_install() {
vman sigi.1
From 06cccfbf783a45452b2764ababd4ca6bf1db396d Mon Sep 17 00:00:00 2001
From: blackbeard420 <blackbeard@blackbeard420.me>
Date: Wed, 13 Apr 2022 21:32:11 -0400
Subject: [PATCH 225/608] squirrel: update to 3.2
Closes: #36686 [via git-merge-pr]
---
srcpkgs/squirrel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/squirrel/template b/srcpkgs/squirrel/template
index f8254ef94403..abd2c7a0d607 100644
--- a/srcpkgs/squirrel/template
+++ b/srcpkgs/squirrel/template
@@ -1,15 +1,14 @@
# Template file for 'squirrel'
pkgname=squirrel
-version=3.1
+version=3.2
revision=1
build_style=cmake
-short_desc="The Squirrel Programming Language"
+short_desc="Squirrel Programming Language"
maintainer="Wilson Birney <wpb@360scada.com>"
license="MIT"
homepage="http://www.squirrel-lang.org/"
distfiles="https://github.com/albertodemichelis/squirrel/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=51942b8638a97b673e34ecf3ca50304996fa99bbdbfa7fe93d9744e6769b2f95
-depends="${pkgname}-libs>=${version}_${revision}"
+checksum=02805414cfadd5bbb921891d3599b83375a40650abd6404a8ab407dc5e86a996
post_install() {
vlicense COPYRIGHT
From f3c6e8fe14d6d231c833c7da308472f8ca33a4e8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 12:32:55 +0200
Subject: [PATCH 226/608] libXcursor: update to 1.2.1.
---
srcpkgs/libXcursor/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template
index 9d785a99bd06..118d8853ee17 100644
--- a/srcpkgs/libXcursor/template
+++ b/srcpkgs/libXcursor/template
@@ -1,6 +1,6 @@
# Template file for 'libXcursor'
pkgname=libXcursor
-version=1.2.0
+version=1.2.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXfixes-devel libXrender-devel"
short_desc="Client-side cursor loading library for X"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://wiki.freedesktop.org/xorg/"
-distfiles="${XORG_SITE}/lib/libXcursor-${version}.tar.bz2"
-checksum=3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782
+homepage="https://gitlab.freedesktop.org/xorg/lib/libxcursor"
+distfiles="${XORG_SITE}/lib/libXcursor-${version}.tar.xz"
+checksum=46c143731610bafd2070159a844571b287ac26192537d047a39df06155492104
post_install() {
vlicense COPYING
From 0add57f9be149d3d6123a6a198cb61a3fdf9933c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 12:44:53 +0200
Subject: [PATCH 227/608] libXres: update to 1.2.1.
---
srcpkgs/libXres/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libXres/template b/srcpkgs/libXres/template
index ac9c01c8778e..af75d0ad21d5 100644
--- a/srcpkgs/libXres/template
+++ b/srcpkgs/libXres/template
@@ -1,7 +1,7 @@
-# Template build file for 'libXres'.
+# Template file for 'libXres'
pkgname=libXres
-version=1.2.0
-revision=2
+version=1.2.1
+revision=1
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="xorgproto libXext-devel"
short_desc="X Resource Information Extension Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="${XORG_SITE}"
+homepage="https://gitlab.freedesktop.org/xorg/lib/libxres"
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4
+checksum=b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11
post_install() {
vlicense COPYING
From 2da9c20a74044254c8b01349717170bb278a5b7a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 13:03:00 +0200
Subject: [PATCH 228/608] libXvMC: update to 1.0.13.
---
srcpkgs/libXvMC/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template
index 3f6d9f9a7d9e..498896abca57 100644
--- a/srcpkgs/libXvMC/template
+++ b/srcpkgs/libXvMC/template
@@ -1,7 +1,7 @@
# Template file for 'libXvMC'
pkgname=libXvMC
-version=1.0.12
-revision=2
+version=1.0.13
+revision=1
build_style=gnu-configure
configure_args="--enable-malloc0returnsnull"
hostmakedepends="pkg-config"
@@ -9,9 +9,9 @@ makedepends="xorgproto libX11-devel libXext-devel libXv-devel"
short_desc="XVideo Motion Compensation Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://wiki.freedesktop.org/xorg/"
-distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd
+homepage="https://gitlab.freedesktop.org/xorg/lib/libxvmc"
+distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
+checksum=0a9ebe6dea7888a747e5aca1b891d53cd7d3a5f141a9645f77d9b6a12cee657c
post_install() {
# this file is now part of xorgproto.
From 1ecc767d2c3a240afa8c7f57675829f17be89d3c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 16:10:08 +0200
Subject: [PATCH 229/608] iceauth: update to 1.0.9.
---
srcpkgs/iceauth/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/iceauth/template b/srcpkgs/iceauth/template
index db359e80d62c..00f9e322a3c0 100644
--- a/srcpkgs/iceauth/template
+++ b/srcpkgs/iceauth/template
@@ -1,16 +1,16 @@
-# Template build file for 'iceauth'.
+# Template file for 'iceauth'
pkgname=iceauth
-version=1.0.8
+version=1.0.9
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorgproto libICE-devel"
short_desc="ICE protocol utility"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=e6ee213a217265cc76050e4293ea70b98c32dce6505c6421227efbda62ab60c6
+license="MIT"
+homepage="https://gitlab.freedesktop.org/xorg/app/iceauth"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=2cb9dfcb545683af77fb1029bea3fc52dcc8a0666f7b8b2d7373b6ed4c408c05
post_install() {
vlicense COPYING
From 38fdb52038982a15609a2a7415e94c5713d0df55 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 14 Apr 2022 16:44:49 +0200
Subject: [PATCH 230/608] xdpyinfo: update to 1.3.3.
---
srcpkgs/xdpyinfo/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index 3955252678be..2b51598a40f9 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -1,18 +1,17 @@
# Template file for 'xdpyinfo'
pkgname=xdpyinfo
-version=1.3.2
-revision=2
+version=1.3.3
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXext-devel libXtst-devel libXxf86vm-devel
- libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel
- libdmx-devel"
+ libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel"
short_desc="Display information utility for X"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51
+homepage="https://gitlab.freedesktop.org/xorg/app/xdpyinfo"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206
post_install() {
vlicense COPYING
From 2cbbf2b1a3c5b3dd7601d2b62a378096d269cd27 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 25 Apr 2022 00:37:12 +0200
Subject: [PATCH 231/608] imlib2: update to 1.9.0.
---
srcpkgs/imlib2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index b560ef27489c..3cbef2e102c4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,19 +1,19 @@
# Template file for 'imlib2'
pkgname=imlib2
-version=1.8.1
+version=1.9.0
revision=1
build_style=gnu-configure
configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
hostmakedepends="pkg-config"
makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel
tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel
- libheif-devel librsvg-devel"
+ libheif-devel librsvg-devel libopenjpeg2-devel libspectre-devel"
short_desc="Image manipulation library"
maintainer="tibequadorian <tibequadorian@posteo.de>"
license="Imlib2"
homepage="https://sourceforge.net/projects/enlightenment/"
distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.xz"
-checksum=522e1e70e65bc0eddfe207617d15c9a395662a7c090661daaa2c294fb7d9fdaa
+checksum=5ac9e8ca7c6700919fe72749ad7243c42de4b22823c81769a1bf8e480e14c650
post_install() {
vlicense COPYING
From 8fbc07c0f91678657e9f95450d58a1fcd6532718 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 19 Apr 2022 13:54:06 +0200
Subject: [PATCH 232/608] rocksndiamonds: update to 4.3.2.1
---
srcpkgs/rocksndiamonds/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 6c686c7c785b..5d67f3ca67c5 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
# Template file for 'rocksndiamonds'
pkgname=rocksndiamonds
-version=4.3.1.1
+version=4.3.2.1
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Clyhtsuriva <void-packages@adjutor.xyz>"
license="GPL-2.0-only"
homepage="http://www.artsoft.org/rocksndiamonds"
distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=05fcf2c2ac4cca5f94acc8a9c6d2d648d6d5acd901467030cd712fc4f499b564
+checksum=dba4b5ff63561a258348cd3b330d2084ab7ba647d26b6c21f996d93d76ea8439
replaces="rocksndiamonds-data>=0"
do_build() {
From cdc536439a1d6383454bb27c66c8c5a591791b0f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 21 Apr 2022 23:15:24 +1100
Subject: [PATCH 233/608] qemu: update to 7.0.0.
---
...l.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 37 -------
srcpkgs/qemu/patches/cve-2022-0358.patch | 101 ------------------
.../qemu/patches/fix-acpi-slic-table.patch | 90 ----------------
srcpkgs/qemu/patches/musl-rlimit-rttime.patch | 13 +++
srcpkgs/qemu/patches/xxx-ppcle.patch | 35 ++----
srcpkgs/qemu/template | 6 +-
6 files changed, 24 insertions(+), 258 deletions(-)
delete mode 100644 srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
delete mode 100644 srcpkgs/qemu/patches/cve-2022-0358.patch
delete mode 100644 srcpkgs/qemu/patches/fix-acpi-slic-table.patch
create mode 100644 srcpkgs/qemu/patches/musl-rlimit-rttime.patch
diff --git a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
deleted file mode 100644
index 528b5d5d8bf6..000000000000
--- a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8fbb4e6797ed67310b74cbaaa061269db45a5b71 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 29 Apr 2014 15:51:31 +0200
-Subject: [PATCH] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU
- platforms
-
-The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available
-on all platforms, so we define those if they are missing.
-
-This is needed for musl libc.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- linux-user/signal.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 5ca6d62b15..e917c16d91 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -25,6 +25,13 @@
- #include "trace.h"
- #include "signal-common.h"
-
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN 32
-+#endif
-+#ifndef __SIGRTMAX
-+#define __SIGRTMAX (NSIG-1)
-+#endif
-+
- static struct target_sigaction sigact_table[TARGET_NSIG];
-
- static void host_signal_handler(int host_signum, siginfo_t *info,
---
-2.23.0
-
diff --git a/srcpkgs/qemu/patches/cve-2022-0358.patch b/srcpkgs/qemu/patches/cve-2022-0358.patch
deleted file mode 100644
index 1b573d567b52..000000000000
--- a/srcpkgs/qemu/patches/cve-2022-0358.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 449e8171f96a6a944d1f3b7d3627ae059eae21ca Mon Sep 17 00:00:00 2001
-From: Vivek Goyal <vgoyal@redhat.com>
-Date: Tue, 25 Jan 2022 13:51:14 -0500
-Subject: [PATCH] virtiofsd: Drop membership of all supplementary groups
- (CVE-2022-0358)
-
-At the start, drop membership of all supplementary groups. This is
-not required.
-
-If we have membership of "root" supplementary group and when we switch
-uid/gid using setresuid/setsgid, we still retain membership of existing
-supplemntary groups. And that can allow some operations which are not
-normally allowed.
-
-For example, if root in guest creates a dir as follows.
-
-$ mkdir -m 03777 test_dir
-
-This sets SGID on dir as well as allows unprivileged users to write into
-this dir.
-
-And now as unprivileged user open file as follows.
-
-$ su test
-$ fd = open("test_dir/priviledge_id", O_RDWR|O_CREAT|O_EXCL, 02755);
-
-This will create SGID set executable in test_dir/.
-
-And that's a problem because now an unpriviliged user can execute it,
-get egid=0 and get access to resources owned by "root" group. This is
-privilege escalation.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2044863
-Fixes: CVE-2022-0358
-Reported-by: JIETAO XIAO <shawtao1125@gmail.com>
-Suggested-by: Miklos Szeredi <mszeredi@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
-Message-Id: <YfBGoriS38eBQrAb@redhat.com>
-Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
- dgilbert: Fixed missing {}'s style nit
----
- tools/virtiofsd/passthrough_ll.c | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
-index 64b5b4fbb1..b3d0674f6d 100644
---- a/tools/virtiofsd/passthrough_ll.c
-+++ b/tools/virtiofsd/passthrough_ll.c
-@@ -54,6 +54,7 @@
- #include <sys/wait.h>
- #include <sys/xattr.h>
- #include <syslog.h>
-+#include <grp.h>
-
- #include "qemu/cutils.h"
- #include "passthrough_helpers.h"
-@@ -1161,6 +1162,30 @@ static void lo_lookup(fuse_req_t req, fuse_ino_t parent, const char *name)
- #define OURSYS_setresuid SYS_setresuid
- #endif
-
-+static void drop_supplementary_groups(void)
-+{
-+ int ret;
-+
-+ ret = getgroups(0, NULL);
-+ if (ret == -1) {
-+ fuse_log(FUSE_LOG_ERR, "getgroups() failed with error=%d:%s\n",
-+ errno, strerror(errno));
-+ exit(1);
-+ }
-+
-+ if (!ret) {
-+ return;
-+ }
-+
-+ /* Drop all supplementary groups. We should not need it */
-+ ret = setgroups(0, NULL);
-+ if (ret == -1) {
-+ fuse_log(FUSE_LOG_ERR, "setgroups() failed with error=%d:%s\n",
-+ errno, strerror(errno));
-+ exit(1);
-+ }
-+}
-+
- /*
- * Change to uid/gid of caller so that file is created with
- * ownership of caller.
-@@ -3926,6 +3951,8 @@ int main(int argc, char *argv[])
-
- qemu_init_exec_dir(argv[0]);
-
-+ drop_supplementary_groups();
-+
- pthread_mutex_init(&lo.mutex, NULL);
- lo.inodes = g_hash_table_new(lo_key_hash, lo_key_equal);
- lo.root.fd = -1;
---
-2.35.0
-
diff --git a/srcpkgs/qemu/patches/fix-acpi-slic-table.patch b/srcpkgs/qemu/patches/fix-acpi-slic-table.patch
deleted file mode 100644
index 1a55ec5aa88c..000000000000
--- a/srcpkgs/qemu/patches/fix-acpi-slic-table.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 8cdb99af45365727ac17f45239a9b8c1d5155c6d Mon Sep 17 00:00:00 2001
-From: Igor Mammedov <imammedo@redhat.com>
-Date: Mon, 27 Dec 2021 14:31:17 -0500
-Subject: [PATCH] acpi: fix QEMU crash when started with SLIC table
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-if QEMU is started with used provided SLIC table blob,
-
- -acpitable sig=SLIC,oem_id='CRASH ',oem_table_id="ME",oem_rev=00002210,asl_compiler_id="",asl_compiler_rev=00000000,data=/dev/null
-it will assert with:
-
- hw/acpi/aml-build.c:61:build_append_padded_str: assertion failed: (len <= maxlen)
-
-and following backtrace:
-
- ...
- build_append_padded_str (array=0x555556afe320, str=0x555556afdb2e "CRASH ME", maxlen=0x6, pad=0x20) at hw/acpi/aml-build.c:61
- acpi_table_begin (desc=0x7fffffffd1b0, array=0x555556afe320) at hw/acpi/aml-build.c:1727
- build_fadt (tbl=0x555556afe320, linker=0x555557ca3830, f=0x7fffffffd318, oem_id=0x555556afdb2e "CRASH ME", oem_table_id=0x555556afdb34 "ME") at hw/acpi/aml-build.c:2064
- ...
-
-which happens due to acpi_table_begin() expecting NULL terminated
-oem_id and oem_table_id strings, which is normally the case, but
-in case of user provided SLIC table, oem_id points to table's blob
-directly and as result oem_id became longer than expected.
-
-Fix issue by handling oem_id consistently and make acpi_get_slic_oem()
-return NULL terminated strings.
-
-PS:
-After [1] refactoring, oem_id semantics became inconsistent, where
-NULL terminated string was coming from machine and old way pointer
-into byte array coming from -acpitable option. That used to work
-since build_header() wasn't expecting NULL terminated string and
-blindly copied the 1st 6 bytes only.
-
-However commit [2] broke that by replacing build_header() with
-acpi_table_begin(), which was expecting NULL terminated string
-and was checking oem_id size.
-
-1) 602b45820 ("acpi: Permit OEM ID and OEM table ID fields to be changed")
-2)
-Fixes: 4b56e1e4eb08 ("acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header()")
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/786
-Signed-off-by: Igor Mammedov <imammedo@redhat.com>
-Message-Id: <20211227193120.1084176-2-imammedo@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Tested-by: Denis Lisov <dennis.lissov@gmail.com>
-Tested-by: Alexander Tsoy <alexander@tsoy.me>
-Cc: qemu-stable@nongnu.org
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
----
- hw/acpi/core.c | 4 ++--
- hw/i386/acpi-build.c | 2 ++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/hw/acpi/core.c b/hw/acpi/core.c
-index 1e004d0078..3e811bf03c 100644
---- a/hw/acpi/core.c
-+++ b/hw/acpi/core.c
-@@ -345,8 +345,8 @@ int acpi_get_slic_oem(AcpiSlicOem *oem)
- struct acpi_table_header *hdr = (void *)(u - sizeof(hdr->_length));
-
- if (memcmp(hdr->sig, "SLIC", 4) == 0) {
-- oem->id = hdr->oem_id;
-- oem->table_id = hdr->oem_table_id;
-+ oem->id = g_strndup(hdr->oem_id, 6);
-+ oem->table_id = g_strndup(hdr->oem_table_id, 8);
- return 0;
- }
- }
-diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
-index 8383b83ee3..0234fe7588 100644
---- a/hw/i386/acpi-build.c
-+++ b/hw/i386/acpi-build.c
-@@ -2723,6 +2723,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
-
- /* Cleanup memory that's no longer used. */
- g_array_free(table_offsets, true);
-+ g_free(slic_oem.id);
-+ g_free(slic_oem.table_id);
- }
-
- static void acpi_ram_update(MemoryRegion *mr, GArray *data)
---
-GitLab
-
diff --git a/srcpkgs/qemu/patches/musl-rlimit-rttime.patch b/srcpkgs/qemu/patches/musl-rlimit-rttime.patch
new file mode 100644
index 000000000000..0cbf9be36a8f
--- /dev/null
+++ b/srcpkgs/qemu/patches/musl-rlimit-rttime.patch
@@ -0,0 +1,13 @@
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -141,6 +141,10 @@
+ #include "fd-trans.h"
+ #include "tcg/tcg.h"
+
++#ifndef RLIMIT_RTTIME
++#define RLIMIT_RTTIME 15
++#endif
++
+ #ifndef CLONE_IO
+ #define CLONE_IO 0x80000000 /* Clone io context */
+ #endif
diff --git a/srcpkgs/qemu/patches/xxx-ppcle.patch b/srcpkgs/qemu/patches/xxx-ppcle.patch
index 3e1159c74ed9..7418ca8d2c63 100644
--- a/srcpkgs/qemu/patches/xxx-ppcle.patch
+++ b/srcpkgs/qemu/patches/xxx-ppcle.patch
@@ -29,35 +29,16 @@ index 18c26e0..03d3e18 100755
fi
elif check_define __mips__ ; then
cpu="mips"
-@@ -683,6 +687,9 @@ ARCH=
- case "$cpu" in
- ppc|ppc64|s390x|sparc64|x32|riscv32|riscv64)
- ;;
+@@ -638,6 +642,9 @@
+
+ ppc)
+ CPU_CFLAGS="-m32" ;;
+ ppcle)
-+ ARCH="ppc"
-+ ;;
++ cpu="ppc"
++ CPU_CFLAGS="-m32 -mlittle-endian" ;;
+ ppc64)
+ CPU_CFLAGS="-m64 -mbig-endian" ;;
ppc64le)
- ARCH="ppc64"
- ;;
-@@ -6783,7 +6790,7 @@ if test "$linux" = "yes" ; then
- i386|x86_64|x32)
- linux_arch=x86
- ;;
-- ppc|ppc64|ppc64le)
-+ ppc|ppcle|ppc64|ppc64le)
- linux_arch=powerpc
- ;;
- s390x)
-@@ -6960,6 +6967,9 @@ if test -n "$cross_prefix"; then
- x86_64|x32)
- echo "cpu_family = 'x86_64'" >> $cross
- ;;
-+ ppcle)
-+ echo "cpu_family = 'ppc'" >> $cross
-+ ;;
- ppc64le)
- echo "cpu_family = 'ppc64'" >> $cross
- ;;
diff --git a/configs/targets/ppcle-linux-user.mak b/configs/targets/ppcle-linux-user.mak
new file mode 100644
index 0000000..2259243
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 823caa111ba9..b851a51b064d 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,8 +1,8 @@
# Template file for 'qemu'
# This package should be updated together with qemu-user-static
pkgname=qemu
-version=6.2.0
-revision=3
+version=7.0.0
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
@@ -28,7 +28,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=2fde1a30a7dcc15dde0875319ecaf3dc249072dee46ba7ad1f7c8df1faece93f
+checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
ignore_elf_dirs="/usr/share/qemu"
nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf
From 13f92f74057e516349ac24e95906a2d9a5e762d3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 21 Apr 2022 23:15:32 +1100
Subject: [PATCH 234/608] qemu-user-static: update to 7.0.0.
---
srcpkgs/qemu-user-static/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index cca001f8835b..34de456db4a9 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,8 +1,8 @@
# Template file for 'qemu-user-static'
# This package should be updated together with qemu
pkgname=qemu-user-static
-version=6.2.0
-revision=2
+version=7.0.0
+revision=1
wrksrc="qemu-${version}"
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=2fde1a30a7dcc15dde0875319ecaf3dc249072dee46ba7ad1f7c8df1faece93f
+checksum=a83032c6ce0dba35479610a4e11a7d8c4a6dffb17152653c183eec3c58616d4e
_fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k
From acdeeee9ac63464d6e54a149be3282e32e3050e4 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Sat, 16 Apr 2022 12:59:31 +0200
Subject: [PATCH 235/608] hitori: update to 3.38.4
---
srcpkgs/hitori/patches/meson-0.61.patch | 41 -------------------------
srcpkgs/hitori/template | 4 +--
2 files changed, 2 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/hitori/patches/meson-0.61.patch
diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
deleted file mode 100644
index 37adaa0116e6..000000000000
--- a/srcpkgs/hitori/patches/meson-0.61.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <pwithnall@endlessos.org>
-Date: Tue, 2 Nov 2021 12:04:29 +0000
-Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Meson never took positional arguments in this function, but didn’t warn
-about it until Meson 0.60. Drop the unnecessary arguments to fix the
-warning.
-
-Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
----
- data/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 97b8e68..c66a233 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,6 +1,6 @@
- subdir('icons')
-
--desktop_file = i18n.merge_file('desktop-file',
-+desktop_file = i18n.merge_file(
- type: 'desktop',
- input: '@0@.desktop.in'.format(application_id),
- output: '@0@.desktop'.format(application_id),
-@@ -20,7 +20,7 @@ if desktop_file_validate.found()
- )
- endif
-
--appdata_file = i18n.merge_file('appdata-file',
-+appdata_file = i18n.merge_file(
- input: '@0@.appdata.xml.in'.format(application_id),
- output: '@0@.appdata.xml'.format(application_id),
- po_dir: join_paths(meson.source_root(), 'po'),
---
-GitLab
-
diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index b5fc5662126e..6e22c5d9a92f 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -1,6 +1,6 @@
# Template file for 'hitori'
pkgname=hitori
-version=3.38.3
+version=3.38.4
revision=1
build_style=meson
hostmakedepends="gettext glib-devel intltool itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Hitori"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f7d7103cb0633fb013730131a98c3ae3a2162b9fb9499fc7f19512d581bf6569
+checksum=8993cc91fb923788e389e03ec2aa7876d15c12bad9204cf65b2ffa0ed3922f7d
From 077e360dd7a37b7e484b441b10fe1b4ebb447ea3 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 11 Apr 2022 03:15:20 +0300
Subject: [PATCH 236/608] openrazer-meta: update to 3.3.0.
---
srcpkgs/openrazer-meta/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index 3cd401cb9878..81c08b768467 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,7 +1,7 @@
# Template file for 'openrazer-meta'
pkgname=openrazer-meta
-version=3.0.1
-revision=3
+version=3.3.0
+revision=1
wrksrc="openrazer-${version}"
build_style=gnu-makefile
make_install_target="setup_dkms udev_install daemon_install xdg_install
@@ -13,7 +13,7 @@ maintainer="Luca Weiss <luca@z3ntu.xyz>"
license="GPL-2.0-or-later"
homepage="https://openrazer.github.io"
distfiles="https://github.com/openrazer/openrazer/releases/download/v${version}/openrazer-${version}.tar.xz"
-checksum=b27a7ab459e5290f9fe4d56f49922f97ed83fc92ba2bc0154aff8c4cdd1de73f
+checksum=cb7bc5c4761f601c1f0da36022153382384058f61fb72b23ee02c575ec41546a
do_build() {
:
From 2cae548b3f9de468d3e80a84bea58861fc0e05be Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Mon, 18 Apr 2022 14:29:25 +0200
Subject: [PATCH 237/608] ART: update to 1.13.
---
srcpkgs/ART/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
index 920204efb1e5..2ec4041b3907 100644
--- a/srcpkgs/ART/template
+++ b/srcpkgs/ART/template
@@ -1,6 +1,6 @@
# Template file for 'ART'
pkgname=ART
-version=1.12.1
+version=1.13
revision=1
build_style=cmake
hostmakedepends="pkg-config"
@@ -12,4 +12,4 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
license="GPL-3.0-or-later"
homepage="https://bitbucket.org/agriggio/art/wiki/Home"
distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=1f9e175d6f414ed52e9a89650331f8c82da4b8bba3da54ca8df8127a919675e0
+checksum=7a6ade552c42d45970fe6618be61e61621e0867a7a2baef2d3d7092badba36e5
From abdfef23812d644a15da3fb56139599bc19c0c7e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 29 Jun 2022 22:44:51 +0200
Subject: [PATCH 238/608] openconnect: update to 9.01.
Closes: https://github.com/void-linux/void-packages/pull/36631
---
srcpkgs/openconnect/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 70ba6962cd01..91283b8397dc 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -1,7 +1,7 @@
# Template file for 'openconnect'
pkgname=openconnect
-version=8.10
-revision=2
+version=9.01
+revision=1
build_style=gnu-configure
configure_args="--with-vpnc-script=/usr/libexec/vpnc-scripts/vpnc-script"
hostmakedepends="gettext pkg-config"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=30e64c6eca4be47bbf1d61f53dc003c6621213738d4ea7a35e5cf1ac2de9bab1
+checksum=b3d7faf830e9793299d6a41e81d84cd4a3e2789c148c9e598e4585010090e4c7
openconnect-devel_package() {
short_desc+=" - development files"
From 889f75d2e84f7d0946288985d0fe840a3086b450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 9 Apr 2022 16:05:27 +0200
Subject: [PATCH 239/608] cargo-edit: update to 0.9.1.
---
srcpkgs/cargo-edit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index f8221ebccdc6..35191055d322 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,6 +1,6 @@
# Template file for 'cargo-edit'
pkgname=cargo-edit
-version=0.8.0
+version=0.9.1
revision=1
archs="x86_64* i686* aarch64* arm*" # uses ring
build_style=cargo
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/killercup/cargo-edit"
distfiles="https://github.com/killercup/cargo-edit/archive/v${version}.tar.gz"
-checksum=4a08e914c17204cb3ab303b62362ca30d44cf457b3b1d7bde117b8ab4cb2fa64
+checksum=bae2a59dcf6110fe0c8bf8562e58d550b2b3b3a02e89b233af5a3be12d41cdf0
post_install() {
vlicense LICENSE
From 09e175d5514e3eb60baae8b85be85454b1a6e456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 7 Apr 2022 21:21:21 +0200
Subject: [PATCH 240/608] kopia: update to 0.10.7.
---
srcpkgs/kopia/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 056235ef545f..8bd4f08fc359 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,6 +1,6 @@
# Template file for 'kopia'
pkgname=kopia
-version=0.10.6
+version=0.10.7
revision=1
build_style=go
build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="Apache-2.0"
homepage="https://kopia.io/"
distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
-checksum=07df866ff4a2662f503a1348fe02bb62e6cf195260217d7e1234b03ff7b27797
+checksum=d797330d39c099c10e8d7bdb4654b254790ea180543971214e8aeec31ad66da4
post_install() {
for shell in bash zsh; do
From 6ec302cb53011c3589070ad83c47c7e5feae8fcc Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Tue, 5 Apr 2022 10:45:59 +0100
Subject: [PATCH 241/608] lfe: update to 2.0.1.
---
srcpkgs/lfe/patches/no-install-on-build.patch | 11 -----------
srcpkgs/lfe/template | 13 +++++--------
2 files changed, 5 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/lfe/patches/no-install-on-build.patch
diff --git a/srcpkgs/lfe/patches/no-install-on-build.patch b/srcpkgs/lfe/patches/no-install-on-build.patch
deleted file mode 100644
index 863aa45ba113..000000000000
--- a/srcpkgs/lfe/patches/no-install-on-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile 2018-01-15 14:49:00.426539554 +0100
-+++ b/Makefile 2018-01-15 14:49:04.968584026 +0100
-@@ -118,7 +118,7 @@ comp_opts.mk:
- -include comp_opts.mk
-
- $(BINDIR)/lfe%:
-- $(INSTALL_BIN) $@ $(DESTBINDIR)
-+ : $(INSTALL_BIN) $@ $(DESTBINDIR)
-
- install: compile install-man
- rm -Rf $(DESTEBINDIR)
diff --git a/srcpkgs/lfe/template b/srcpkgs/lfe/template
index 31f33e64eeaf..528ef58467da 100644
--- a/srcpkgs/lfe/template
+++ b/srcpkgs/lfe/template
@@ -1,19 +1,16 @@
# Template file for 'lfe'
pkgname=lfe
-version=1.3
-revision=3
+version=2.0.1
+revision=1
+build_style=gnu-makefile
hostmakedepends="erlang"
depends="erlang"
short_desc="Lisp flavoured erlang"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="http://lfe.io/"
-distfiles="https://github.com/rvirding/lfe/archive/v${version}.tar.gz"
-checksum=04634f2c700ecedb55f4369962837792669e6be809dba90d81974198fc2b7b72
-
-do_build() {
- make
-}
+distfiles="https://github.com/lfe/lfe/archive/v${version}.tar.gz"
+checksum=d64a5c0b626411afe67f146b56094337801c596d9b0cdfeabaf61223c479985f
do_install() {
for b in lfe lfec lfescript; do
From 0697dccf69f9578ec499d094a87f8ae7a33deb3f Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 29 Mar 2022 14:24:46 +1100
Subject: [PATCH 242/608] jitterentropy: update to 3.4.0, fix license, -O0.
explicitly disable building with optimizations
jitterentropy-rngd-1.2.7 raises error during build without `CFLAGS=-O0`
---
srcpkgs/jitterentropy/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index e90089d9a99d..a4b19b5be597 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,16 +1,18 @@
# Template file for 'jitterentropy'
pkgname=jitterentropy
-version=3.3.1
+version=3.4.0
revision=1
wrksrc="${pkgname}-library-${version}"
build_style=gnu-makefile
make_use_env=yes
short_desc="Hardware RNG based on CPU timing jitter"
maintainer="Piraty <piraty1@inbox.ru>"
-license="BSD-3-Clause"
+license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.chronox.de/jent.html"
-distfiles="https://github.com/smuellerDD/jitterentropy-library/archive/v${version}.tar.gz"
-checksum=4a50cb02b4836cd5550016e2fc2263e6982abaa11467a9e1cea260c1c2f7d487
+distfiles="https://www.chronox.de/jent/${pkgname}-library-${version}.tar.xz"
+checksum=979fa4277decf9792f3422b142237e77d8b6ca41e50474083eb2f0976f2479b3
+
+CFLAGS="-O0"
post_install() {
vlicense LICENSE
From f4f3ac105ee1aae6dd284c3411de3a4523082bd7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 29 Jun 2022 13:25:04 -0700
Subject: [PATCH 243/608] ibus: fix memory leaks and double unref
---
.../patches/src-Fix-refcounting-issues.patch | 267 ++++++++++++++++++
srcpkgs/ibus/template | 2 +-
2 files changed, 268 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
diff --git a/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch b/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
new file mode 100644
index 000000000000..d1923f71a18e
--- /dev/null
+++ b/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
@@ -0,0 +1,267 @@
+From 17648f0522910480b6c5dd4f5356ca1f6c160bf5 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue, 29 Mar 2022 22:48:19 +0200
+Subject: [PATCH] src: Fix refcounting issues
+
+Commit 5a455b1ead attempted to fix both GLib warnings around
+floating references and other presumed refcounting issues. However
+it missed 2 kinds of bugs:
+
+- The places that take an IBusText created from a static string
+ were made to avoid freeing it afterwards, but the staticness refers
+ to the string content, not the object itself.
+- The places that are documented to emit signals on floating object
+ references used to do the following after signal emission:
+
+ if (g_object_is_floating (object))
+ g_object_unref (object)
+
+ And did possibly trigger GLib warnings were changed to:
+
+ if (g_object_is_floating (object))
+ g_object_sink_ref (object);
+ g_object_unref (object);
+
+ Which fixes the GLib warning for floating references, but do
+ unintendedly steal one reference away for non floating references.
+
+This commit is essentially a revert of commit 5a455b1ead, but
+addressing both things differently:
+
+- All label/tooltip/symbol IBusText properties in IBusProperty do
+ now always sink the reference of the stored object.
+
+- All places documented as maybe using objects with a floating reference
+ on signals changed to doing:
+
+ if (g_object_is_floating (object)) {
+ g_object_ref_sink (object);
+ g_object_unref (object);
+ }
+
+ So the floating reference is owned and unreferenced without warnings,
+ but already owned references are left unchanged.
+
+This addresses the possible GLib warnings, fixes the possible double
+unrefs happening on IBusText used in signals, and fixes the missing
+unrefs on IBusText objects created from static strings.
+
+BUG=https://github.com/ibus/ibus/issues/2393
+BUG=https://github.com/ibus/ibus/issues/2387
+---
+ src/ibusinputcontext.c | 35 +++++++++++++++++++++--------------
+ src/ibusproperty.c | 32 +++++++++++++++++---------------
+ 2 files changed, 38 insertions(+), 29 deletions(-)
+
+diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
+index 4b27551bd..7981de381 100644
+--- a/src/ibusinputcontext.c
++++ b/src/ibusinputcontext.c
+@@ -549,9 +549,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ g_variant_unref (variant);
+ g_signal_emit (context, context_signals[COMMIT_TEXT], 0, text);
+
+- if (g_object_is_floating (text))
++ if (g_object_is_floating (text)) {
+ g_object_ref_sink (text);
+- g_object_unref (text);
++ g_object_unref (text);
++ }
+ return;
+ }
+ if (g_strcmp0 (signal_name, "UpdatePreeditText") == 0) {
+@@ -569,9 +570,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ cursor_pos,
+ visible);
+
+- if (g_object_is_floating (text))
++ if (g_object_is_floating (text)) {
+ g_object_ref_sink (text);
+- g_object_unref (text);
++ g_object_unref (text);
++ }
+ return;
+ }
+ if (g_strcmp0 (signal_name, "UpdatePreeditTextWithMode") == 0) {
+@@ -592,9 +594,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ visible,
+ mode);
+
+- if (g_object_is_floating (text))
++ if (g_object_is_floating (text)) {
+ g_object_ref_sink (text);
+- g_object_unref (text);
++ g_object_unref (text);
++ }
+ return;
+ }
+
+@@ -621,9 +624,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ 0,
+ text,
+ visible);
+- if (g_object_is_floating (text))
++ if (g_object_is_floating (text)) {
+ g_object_ref_sink (text);
+- g_object_unref (text);
++ g_object_unref (text);
++ }
+ return;
+ }
+
+@@ -640,9 +644,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ 0,
+ table,
+ visible);
+- if (g_object_is_floating (table))
++ if (g_object_is_floating (table)) {
+ g_object_ref_sink (table);
+- g_object_unref (table);
++ g_object_unref (table);
++ }
+ return;
+
+ }
+@@ -659,9 +664,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+ 0,
+ prop_list);
+
+- if (g_object_is_floating (prop_list))
++ if (g_object_is_floating (prop_list)) {
+ g_object_ref_sink (prop_list);
+- g_object_unref (prop_list);
++ g_object_unref (prop_list);
++ }
+ return;
+ }
+
+@@ -673,9 +679,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
+
+ g_signal_emit (context, context_signals[UPDATE_PROPERTY], 0, prop);
+
+- if (g_object_is_floating (prop))
++ if (g_object_is_floating (prop)) {
+ g_object_ref_sink (prop);
+- g_object_unref (prop);
++ g_object_unref (prop);
++ }
+ return;
+ }
+
+diff --git a/src/ibusproperty.c b/src/ibusproperty.c
+index 6d4ed088e..cd8a0e2a6 100644
+--- a/src/ibusproperty.c
++++ b/src/ibusproperty.c
+@@ -336,20 +336,17 @@ ibus_property_destroy (IBusProperty *prop)
+ prop->priv->icon = NULL;
+
+ if (prop->priv->label) {
+- if (!ibus_text_get_is_static (prop->priv->label))
+- g_object_unref (prop->priv->label);
++ g_object_unref (prop->priv->label);
+ prop->priv->label = NULL;
+ }
+
+ if (prop->priv->symbol) {
+- if (!ibus_text_get_is_static (prop->priv->symbol))
+- g_object_unref (prop->priv->symbol);
++ g_object_unref (prop->priv->symbol);
+ prop->priv->symbol = NULL;
+ }
+
+ if (prop->priv->tooltip) {
+- if (!ibus_text_get_is_static (prop->priv->tooltip))
+- g_object_unref (prop->priv->tooltip);
++ g_object_unref (prop->priv->tooltip);
+ prop->priv->tooltip = NULL;
+ }
+
+@@ -404,7 +401,7 @@ ibus_property_deserialize (IBusProperty *prop,
+ g_variant_get_child (variant, retval++, "u", &prop->priv->type);
+
+ GVariant *subvar = g_variant_get_child_value (variant, retval++);
+- if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
++ if (prop->priv->label) {
+ g_object_unref (prop->priv->label);
+ }
+ prop->priv->label = IBUS_TEXT (ibus_serializable_deserialize (subvar));
+@@ -414,7 +411,7 @@ ibus_property_deserialize (IBusProperty *prop,
+ ibus_g_variant_get_child_string (variant, retval++, &prop->priv->icon);
+
+ subvar = g_variant_get_child_value (variant, retval++);
+- if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
++ if (prop->priv->tooltip) {
+ g_object_unref (prop->priv->tooltip);
+ }
+ prop->priv->tooltip = IBUS_TEXT (ibus_serializable_deserialize (subvar));
+@@ -435,7 +432,7 @@ ibus_property_deserialize (IBusProperty *prop,
+
+ /* Keep the serialized order for the compatibility when add new members. */
+ subvar = g_variant_get_child_value (variant, retval++);
+- if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
++ if (prop->priv->symbol) {
+ g_object_unref (prop->priv->symbol);
+ }
+ prop->priv->symbol = IBUS_TEXT (ibus_serializable_deserialize (subvar));
+@@ -567,7 +564,7 @@ ibus_property_set_label (IBusProperty *prop,
+ g_assert (IBUS_IS_PROPERTY (prop));
+ g_return_if_fail (label == NULL || IBUS_IS_TEXT (label));
+
+- if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
++ if (prop->priv->label) {
+ g_object_unref (prop->priv->label);
+ }
+
+@@ -575,8 +572,10 @@ ibus_property_set_label (IBusProperty *prop,
+ prop->priv->label = ibus_text_new_from_static_string ("");
+ }
+ else {
+- prop->priv->label = g_object_ref_sink (label);
++ prop->priv->label = label;
+ }
++
++ g_object_ref_sink (prop->priv->label);
+ }
+
+ void
+@@ -586,7 +585,7 @@ ibus_property_set_symbol (IBusProperty *prop,
+ g_assert (IBUS_IS_PROPERTY (prop));
+ g_return_if_fail (symbol == NULL || IBUS_IS_TEXT (symbol));
+
+- if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
++ if (prop->priv->symbol) {
+ g_object_unref (prop->priv->symbol);
+ }
+
+@@ -594,8 +593,10 @@ ibus_property_set_symbol (IBusProperty *prop,
+ prop->priv->symbol = ibus_text_new_from_static_string ("");
+ }
+ else {
+- prop->priv->symbol = g_object_ref_sink (symbol);
++ prop->priv->symbol = symbol;
+ }
++
++ g_object_ref_sink (prop->priv->symbol);
+ }
+
+ void
+@@ -615,7 +616,7 @@ ibus_property_set_tooltip (IBusProperty *prop,
+ g_assert (IBUS_IS_PROPERTY (prop));
+ g_assert (tooltip == NULL || IBUS_IS_TEXT (tooltip));
+
+- if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
++ if (prop->priv->tooltip) {
+ g_object_unref (prop->priv->tooltip);
+ }
+
+@@ -624,8 +625,9 @@ ibus_property_set_tooltip (IBusProperty *prop,
+ }
+ else {
+ prop->priv->tooltip = tooltip;
+- g_object_ref_sink (prop->priv->tooltip);
+ }
++
++ g_object_ref_sink (prop->priv->tooltip);
+ }
+
+ void
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 750470cea083..f43a62b6bf1a 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,7 +1,7 @@
# Template file for 'ibus'
pkgname=ibus
version=1.5.26
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--enable-ui --enable-gtk3 --enable-gtk4
From bc3f354675f6fe1c5075c53df0d01e1f43f550b1 Mon Sep 17 00:00:00 2001
From: Barbaross <cullen.ross@proton.me>
Date: Wed, 29 Jun 2022 21:00:54 -0400
Subject: [PATCH 244/608] bemenu: update to 0.6.8.
---
srcpkgs/bemenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 2937a4482968..976318e83361 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,6 +1,6 @@
# Template file for 'bemenu'
pkgname=bemenu
-version=0.6.7
+version=0.6.8
revision=1
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -13,7 +13,7 @@ maintainer="Issam Maghni <me@concati.me>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/Cloudef/bemenu"
distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
-checksum=8982ffbeebb0f642e0a68d3ab5a16078b2f43548ddca70a5ad30a597529ff142
+checksum=d68c0c35c63c1dc26e3f2e67be1008f1f66a1ecdf7d3c9ccb261523175f22156
bemenu-devel_package() {
depends="bemenu-${version}_${revision}"
From 801fd734934b1c3477fed3115c42ea2c3bbf48bb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 01:12:08 +0200
Subject: [PATCH 245/608] openjpeg2: update to 2.5.0.
---
...c27e7c91f745a1dda9991b5deea3cbef2072.patch | 31 -------------------
...49edad7fb31ebbf03c60a45b72aaa7b7412b.patch | 26 ----------------
srcpkgs/openjpeg2/template | 13 +++-----
3 files changed, 5 insertions(+), 65 deletions(-)
delete mode 100644 srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
delete mode 100644 srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
diff --git a/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch b/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
deleted file mode 100644
index 28d654fa8885..000000000000
--- a/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 7 Jan 2021 14:09:50 +0100
-Subject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes
- uclouvain#1174)"
-
-This reverts commit 65586374d639cfc0104419992f9022174b412594 which
-breaks cross-compilation of poppler under buildroot (because of
-DESTDIR usage).
----
- cmake/OpenJPEGConfig.cmake.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
-index 8a726697a..2925108ad 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
- # This is an install tree
- include(${SELF_DIR}/OpenJPEGTargets.cmake)
-
-+ # We find a relative path from the PKG directory to header files.
-+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
-+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-+
-+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
-
- else()
- if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
diff --git a/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch b/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
deleted file mode 100644
index 18907a5d74d2..000000000000
--- a/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 7 Jan 2021 14:11:26 +0100
-Subject: [PATCH] cmake/OpenJPEGConfig.cmake: replace ABSOLUTE by REALPATH
-
-Fix #1174 by replacing ABSOLUTE by REALPATH which will resolve symlinks:
-https://cmake.org/cmake/help/latest/command/get_filename_component.html
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- cmake/OpenJPEGConfig.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
-index 2925108ad..6e88036c6 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
- file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-
-- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
-+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" REALPATH)
-
- else()
- if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template
index 4e6f16ac7ced..b1b293ae474c 100644
--- a/srcpkgs/openjpeg2/template
+++ b/srcpkgs/openjpeg2/template
@@ -1,21 +1,16 @@
# Template file for 'openjpeg2'
pkgname=openjpeg2
-version=2.4.0
-revision=2
+version=2.5.0
+revision=1
wrksrc="openjpeg-${version}"
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=None"
makedepends="libpng-devel lcms2-devel tiff-devel"
short_desc="Open-source JPEG 2000 codec written in C language (Version 2)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://www.openjpeg.org/"
distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
-checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
-
-post_install() {
- vlicense LICENSE
-}
+checksum=0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a
libopenjpeg2-devel_package() {
short_desc+=" - development files"
@@ -28,9 +23,11 @@ libopenjpeg2-devel_package() {
vmove usr/lib/pkgconfig
}
}
+
libopenjpeg2_package() {
short_desc+=" - library files"
pkg_install() {
vmove "usr/lib/*.so.*"
+ vlicense LICENSE
}
}
From 3715ae1bf291a583f64ab3f127a36b1377e479a5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 11:52:50 +0200
Subject: [PATCH 246/608] privoxy: update to 3.0.33.
---
srcpkgs/privoxy/files/privoxy/log/run | 2 +-
srcpkgs/privoxy/template | 26 +++++++++++++++-----------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/privoxy/files/privoxy/log/run b/srcpkgs/privoxy/files/privoxy/log/run
index 4923ee6f11cf..fa590adf4e6a 100755
--- a/srcpkgs/privoxy/files/privoxy/log/run
+++ b/srcpkgs/privoxy/files/privoxy/log/run
@@ -1,2 +1,2 @@
#!/bin/sh
-exec logger -t privoxy
+exec vlogger -t privoxy
diff --git a/srcpkgs/privoxy/template b/srcpkgs/privoxy/template
index ddaefd75abea..c35c4ad23ac1 100644
--- a/srcpkgs/privoxy/template
+++ b/srcpkgs/privoxy/template
@@ -1,19 +1,23 @@
# Template file for 'privoxy'
pkgname=privoxy
-version=3.0.32
+version=3.0.33
revision=1
wrksrc="${pkgname}-${version}-stable"
build_style=gnu-configure
-configure_args="--sysconfdir=/etc/privoxy --enable-compression --enable-dynamic-pcre --sbindir=/usr/bin"
+configure_args="
+ --sysconfdir=/etc/privoxy
+ --enable-compression
+ --enable-dynamic-pcre
+ --sbindir=/usr/bin"
make_install_args="STRIP="
conf_files="
- /etc/privoxy/config
- /etc/privoxy/default.action
- /etc/privoxy/match-all.action
- /etc/privoxy/user.filter
- /etc/privoxy/trust
- /etc/privoxy/default.filter
- /etc/privoxy/user.action"
+ /etc/privoxy/config
+ /etc/privoxy/default.action
+ /etc/privoxy/match-all.action
+ /etc/privoxy/user.filter
+ /etc/privoxy/trust
+ /etc/privoxy/default.filter
+ /etc/privoxy/user.action"
hostmakedepends="autoconf"
makedepends="pcre-devel zlib-devel"
short_desc="Non-caching web proxy with advanced filtering capabilities"
@@ -21,14 +25,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.privoxy.org/"
distfiles="${SOURCEFORGE_SITE}/ijbswa/${pkgname}-${version}-stable-src.tar.gz"
-checksum=c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7
+checksum=04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae
system_accounts="privoxy"
privoxy_homedir="/etc/privoxy"
pre_configure() {
autoheader && autoconf
- sed -e 's|^confdir .*|confdir /etc/privoxy|' \
+ vsed -e 's|^confdir .*|confdir /etc/privoxy|' \
-e 's|^logdir .*|logdir /var/log/privoxy|' \
-e 's|^\(logfile .*\)|# \1|' \
-i config
From 732faa62e5b3252fb8aebdc81499722a22aacc67 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 11:55:20 +0200
Subject: [PATCH 247/608] speex: update to 1.2.1.
---
srcpkgs/speex/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/speex/template b/srcpkgs/speex/template
index a380f999427f..7509f7385c7f 100644
--- a/srcpkgs/speex/template
+++ b/srcpkgs/speex/template
@@ -1,7 +1,7 @@
# Template file for 'speex'
pkgname=speex
-version=1.2.0
-revision=2
+version=1.2.1
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="fftw-devel libogg-devel speexdsp-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.speex.org"
distfiles="http://downloads.xiph.org/releases/speex/speex-$version.tar.gz"
-checksum=eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094
+checksum=4b44d4f2b38a370a2d98a78329fefc56a0cf93d1c1be70029217baae6628feea
post_install() {
vlicense COPYING
@@ -23,6 +23,7 @@ libspeex_package() {
vlicense COPYING
}
}
+
speex-devel_package() {
depends="speexdsp-devel libspeex-${version}_${revision}"
short_desc+=" - development files"
From 9211981b7a3bde90d03acfb020fcda8e15d6a610 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Wed, 29 Jun 2022 22:34:24 +0200
Subject: [PATCH 248/608] vale: update to 2.19.0
---
srcpkgs/vale/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index d08391061a35..eab475e687b6 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
# Template file for 'vale'
pkgname=vale
-version=2.15.2
+version=2.19.0
revision=1
build_style=go
go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://docs.errata.ai/vale/about/"
distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15c79d613c181edc99a0a35bde1658b33fbd5aa49f1ac7f1029eba779bf8d4bc
+checksum=bb2e3ffa0901ebc46686ee99ef52ec4c2634dd0c226d591fde4a7d585a44e2c6
post_install() {
vlicense LICENSE
From 7d3bf287426224707b91b0b2c764d452ca1ba7f9 Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Thu, 30 Jun 2022 06:52:20 +0200
Subject: [PATCH 249/608] emptty: update to 0.8.1.
---
srcpkgs/emptty/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 9ba3fd93c742..d2a813b83105 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
# Template file for 'emptty'
pkgname=emptty
-version=0.8.0
+version=0.8.1
revision=1
build_style=go
go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
license="MIT"
homepage="https://github.com/tvrzna/emptty"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b1c67e1661f6cde6c3d9723f6602d2ec9e7dbe8f11caf72f06102750ebd2c636
+checksum=3344c3f3a372f713a4384d37dce01fcce25bb0874c08ded3338ed34ab16839ad
conf_files="/etc/emptty/conf /etc/pam.d/emptty"
post_install() {
From 96b79ee9073224aa81cd8b82d7e010a3372654d9 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 30 Jun 2022 12:11:13 +0200
Subject: [PATCH 250/608] qdirstat: update to 1.8.1.
---
srcpkgs/qdirstat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index d297cd50e41a..fc9e04202627 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -1,7 +1,7 @@
# Template file for 'qdirstat'
pkgname=qdirstat
-version=1.8
-revision=4
+version=1.8.1
+revision=1
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="zlib-devel qt5-devel"
@@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-2.0-only"
homepage="https://github.com/shundhammer/qdirstat"
distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz"
-checksum=5dc6f6229657d101abd5448f7c4d754ff823aa5e2816e3835574e7f808cea4f8
+checksum=f41212ddeb7fab86bad43cf65cb7fbd044f4c08fc0b167f8e9eaa384e0c1561b
post_install() {
vman man/qdirstat.1
From 735e4edddf2d7f0411cdc281e87457e9e1b3030a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 12:16:37 +0200
Subject: [PATCH 251/608] cifs-utils: update to 6.15.
---
srcpkgs/cifs-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index 796b2ae69f80..85785998b102 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -1,6 +1,6 @@
# Template file for 'cifs-utils'
pkgname=cifs-utils
-version=6.13
+version=6.15
revision=1
build_style=gnu-configure
configure_args="--disable-systemd"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=43d8786c8613caccfa84913081c1d62bc2409575854cf895b05b48af0863d056
+checksum=a7b6940e93250c1676a6fa66b6ead91b78cd43a5fee99cc462459c8b9cf1e6f4
python_version=3
pre_configure() {
From d3e347581d2498e6cfd151fbabfd5c60d6a17490 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:14:54 +0200
Subject: [PATCH 252/608] freerdp: update to 2.7.0.
---
srcpkgs/freerdp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index da6703547a83..5d9932f83028 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.6.1
+version=2.7.0
revision=1
wrksrc="FreeRDP-${version}"
build_style=cmake
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2ff86a839c1cf678a24d9bf435c83745aafbd5f0d19b637b733e306acede96e3
+checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 0ca666d38f788a6bb47698b05d9ed5bd1cc3f8ac Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Tue, 17 May 2022 14:12:01 +0000
Subject: [PATCH 253/608] epub2txt: update to 2.06.
---
srcpkgs/epub2txt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/epub2txt/template b/srcpkgs/epub2txt/template
index 5f37e28ade6e..961fa0157525 100644
--- a/srcpkgs/epub2txt/template
+++ b/srcpkgs/epub2txt/template
@@ -1,6 +1,6 @@
# Template file for 'epub2txt'
pkgname=epub2txt
-version=2.01
+version=2.06
revision=1
wrksrc=epub2txt2-$version
build_style=gnu-makefile
@@ -9,4 +9,4 @@ maintainer="Paper <paper@tilde.institute>"
license="GPL-3.0-only"
homepage="https://github.com/kevinboone/epub2txt2"
distfiles="https://github.com/kevinboone/epub2txt2/archive/v$version.tar.gz"
-checksum=82c96c713c8a6e10d7b37e96db83a9d5f50fcb4b65034b4a1df1024776b6591f
+checksum=d45ad76a1adca6b62bf0ccbc1aed3a527c3bc2a790516e8de82cc1e6545548b6
From 36bf47577446931bbf6ebf051e07a6a1cc17d027 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 01:57:02 +0100
Subject: [PATCH 254/608] libepoxy: update to 1.5.10.
---
srcpkgs/libepoxy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libepoxy/template b/srcpkgs/libepoxy/template
index 7b8e393fb6cc..a8d7c939a83c 100644
--- a/srcpkgs/libepoxy/template
+++ b/srcpkgs/libepoxy/template
@@ -1,6 +1,6 @@
# Template file for 'libepoxy'
pkgname=libepoxy
-version=1.5.9
+version=1.5.10
revision=1
build_style=meson
hostmakedepends="pkg-config xorg-util-macros"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/anholt/libepoxy"
changelog="https://github.com/anholt/libepoxy/releases"
distfiles="https://github.com/anholt/libepoxy/archive/${version}.tar.gz"
-checksum=ee8048d20179a2e86156ac842ddb6428732d9cd7a2cfc2eca905165bf24887a2
+checksum=a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
post_install() {
vlicense COPYING
From d87978453e86998b4d9cce08d75cc323f28c0f12 Mon Sep 17 00:00:00 2001
From: Tomasz Kramkowski <tomasz@kramkow.ski>
Date: Wed, 15 Jun 2022 01:58:49 +0100
Subject: [PATCH 255/608] nim: update to 1.6.6.
Closes: #37567 [via git-merge-pr]
Co-Authored-By: Duncaen <duncaen@voidlinux.org>
---
srcpkgs/nim/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index d7534c97c223..4e69e1fab2b7 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,6 +1,6 @@
# Template file for 'nim'
pkgname=nim
-version=1.6.0
+version=1.6.6
revision=1
_c1version=561b417c65791cd8356b5f73620914ceff845d10
_nimbleversion=0.13.1
@@ -11,11 +11,10 @@ short_desc="Nim programming language"
maintainer="allan <mail@may.mooo.com>"
license="MIT"
homepage="https://nim-lang.org/"
-_ghsite="https://github.com/nim-lang"
-distfiles="${_ghsite}/Nim/archive/v${version}.tar.gz
- ${_ghsite}/csources_v1/archive/${_c1version}.tar.gz>csources_v1-${_c1version}.tar.gz
- ${_ghsite}/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
-checksum="c202cfd24a24480da1cf851e1265b87edb22710bb42286a57b1a99c83b6a8315
+distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz
+ https://github.com/nim-lang/csources_v1/archive/${_c1version}.tar.gz>csources_v1-${_c1version}.tar.gz
+ https://github.com/nim-lang/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz"
+checksum="59836a85c1291b59af699a121b0b765703d6a0e44ed9f3ede363ff2b3e09d527
71c823444c794a12da9027d19d6a717dd7759521ecbbe28190b08372142607ec
e6aa8d9ee4b3ed0321dca329b4a38fa546771b9729984482fb50fe73d3777f5d"
From 5e8ae9da817a425e24d91e7dcba71993eefcda46 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:34:48 +0200
Subject: [PATCH 256/608] gst-libav: update to 1.20.3.
---
srcpkgs/gst-libav/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index 333636d0657a..e9a79dc650a5 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,8 +1,7 @@
# Template file for 'gst-libav'
pkgname=gst-libav
-version=1.20.1
+version=1.20.3
revision=1
-wrksrc="${pkgname}-${version}"
build_style=meson
hostmakedepends="pkg-config yasm"
makedepends="orc-devel gst-plugins-base1-devel ffmpeg-devel"
@@ -12,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7
+checksum=3fedd10560fcdfaa1b6462cbf79a38c4e7b57d7f390359393fc0cef6dbf27dfe
case "$XBPS_TARGET_MACHINE" in
*-musl) # Required by musl for M_SQRT1_2
From 093bfd6cfc5c205be399b63cbd096e1f539bbd16 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:34:52 +0200
Subject: [PATCH 257/608] gst-omx: update to 1.20.3.
---
srcpkgs/gst-omx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index d657aff289a7..893535c463da 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,6 +1,6 @@
# Template file for 'gst-omx'
pkgname=gst-omx
-version=1.20.1
+version=1.20.3
revision=1
build_style=meson
configure_args="-Dexamples=disabled -Dtarget=generic"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c
+checksum=8db48040bb41f09edf8d17ff6d16c54888d7777ba4501c2c69f0083350ea9a15
From ecc7f181c6115cfbb164dfaab1a2d57708b36382 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:34:56 +0200
Subject: [PATCH 258/608] gst-plugins-bad1: update to 1.20.3.
---
srcpkgs/gst-plugins-bad1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index da678bce821f..35bd90f32021 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
-version=1.20.1
-revision=2
+version=1.20.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
@@ -37,7 +37,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848
+checksum=7a11c13b55dd1d2386dd902219e41cbfcdda8e1e0aa3e738186c95074b35da4f
build_options="gir gme"
build_options_default="gir"
From d7b7d84f63a36681362095b9edf6ce50f7f47c6a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:00 +0200
Subject: [PATCH 259/608] gst-plugins-base1: update to 1.20.3.
---
srcpkgs/gst-plugins-base1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 538f4111a74e..43629c9f27c9 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-base1'
pkgname=gst-plugins-base1
-version=1.20.1
-revision=3
+version=1.20.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
build_helper="gir"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204
+checksum=7e30b3dd81a70380ff7554f998471d6996ff76bbe6fc5447096f851e24473c9f
build_options="cdparanoia gir sndio"
build_options_default="cdparanoia gir"
From aab4c19c26adfdb1eaadcabbcd4e414f18d0624b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:04 +0200
Subject: [PATCH 260/608] gst-plugins-good1: update to 1.20.3.
---
srcpkgs/gst-plugins-good1/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index aba03519e450..8d0d6c828672 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
-version=1.20.1
-revision=2
+version=1.20.3
+revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa
+checksum=f8f3c206bf5cdabc00953920b47b3575af0ef15e9f871c0b6966f6d0aa5868b7
build_options="gtk3"
build_options_default="gtk3"
From 8d65f74726e365dd89f3b7552c9cde861d9ebdfc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:08 +0200
Subject: [PATCH 261/608] gst-plugins-ugly1: update to 1.20.3.
---
srcpkgs/gst-plugins-ugly1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index ad8c128ef726..434beb7e2756 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,6 +1,6 @@
# Template file for 'gst-plugins-ugly1'
pkgname=gst-plugins-ugly1
-version=1.20.1
+version=1.20.3
revision=1
wrksrc="${pkgname/1/}-${version}"
build_style=meson
@@ -16,4 +16,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19
+checksum=8caa20789a09c304b49cf563d33cca9421b1875b84fcc187e4a385fa01d6aefd
From d1d8040099bd8e6f6662104057551c5d69076f3f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:12 +0200
Subject: [PATCH 262/608] gst-rtsp-server: update to 1.20.3.
---
srcpkgs/gst-rtsp-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-rtsp-server/template b/srcpkgs/gst-rtsp-server/template
index 7fc2d57201f5..32659000e723 100644
--- a/srcpkgs/gst-rtsp-server/template
+++ b/srcpkgs/gst-rtsp-server/template
@@ -1,6 +1,6 @@
# Template file for 'gst-rtsp-server'
pkgname=gst-rtsp-server
-version=1.20.1
+version=1.20.3
revision=1
build_style=meson
hostmakedepends="pkg-config python3"
@@ -11,4 +11,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${version}.tar.xz"
-checksum=4745bc528ad7de711a41d576ddce7412266e66d05c4cfcc636c9ba4da5521509
+checksum=ee402718be9b127f0e5e66ca4c1b4f42e4926ec93ba307b7ccca5dc6cc9794ca
From 46bb9ef712ddd2f955ac1238feea145580d31e6f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:17 +0200
Subject: [PATCH 263/608] gst1-editing-services: update to 1.20.3.
---
srcpkgs/gst1-editing-services/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index ad2318c059ae..1740db07e976 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,6 +1,6 @@
# Template file for 'gst1-editing-services'
pkgname=gst1-editing-services
-version=1.20.1
+version=1.20.3
revision=1
wrksrc="${pkgname/gst1/gst}-${version}"
build_style=meson
@@ -13,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
-checksum=6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df
+checksum=5fd896de69fbe24421eb6b0ff8d2f8b4c3cba3f3025ceacd302172f39a8abaa2
do_check() {
: # Tests fail in older versions as well
From 52ada5dc8dda79496dcac7becb5b11908acb4fbd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:22 +0200
Subject: [PATCH 264/608] gst1-python3: update to 1.20.3.
---
srcpkgs/gst1-python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 4f6ead444091..3936929447a7 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,6 +1,6 @@
# Template file for 'gst1-python3'
pkgname=gst1-python3
-version=1.20.1
+version=1.20.3
revision=1
wrksrc="gst-python-${version}"
build_style=meson
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422
+checksum=db348120eae955b8cc4de3560a7ea06e36d6e1ddbaa99a7ad96b59846601cfdc
From 4022813a87674401c3e97bfeb8a86233c4a4fd93 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:26 +0200
Subject: [PATCH 265/608] gstreamer-vaapi: update to 1.20.3.
---
srcpkgs/gstreamer-vaapi/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 1a934c852d1b..3cc4e057559a 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,18 +1,17 @@
# Template file for 'gstreamer-vaapi'
pkgname=gstreamer-vaapi
-version=1.20.1
+version=1.20.3
revision=1
build_style=meson
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libva-devel MesaLib-devel gst-plugins-bad1-devel"
-checkdepends="$makedepends"
short_desc="VA-API plugins for GStreamer 1.x"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137
+checksum=6ee99eb316abdde9ad37002915bd8c3867918f6fdc74b7cf2ac4c1ae0d690b45
pre_check() {
# Seems to need certain hardware to pass
From 6b3dcd051dda8f368a1be828b1a667513639990d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 13:35:30 +0200
Subject: [PATCH 266/608] gstreamer1: update to 1.20.3.
---
srcpkgs/gstreamer1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index ababbeeb987d..e3bf384483ba 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,6 +1,6 @@
# Template file for 'gstreamer1'
pkgname=gstreamer1
-version=1.20.1
+version=1.20.3
revision=1
wrksrc="gstreamer-${version}"
build_style=meson
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031
+checksum=607daf64bbbd5fb18af9d17e21c0d22c4d702fffe83b23cb22d1b1af2ca23a2a
pre_check() {
# gst_gstdatetime is known to fail according to LFS
From d1c510a5a00871a18f71fc765506dab6c8d03934 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 16:08:46 +0200
Subject: [PATCH 267/608] varnish: unbreak i686
---
srcpkgs/varnish/template | 4 ----
1 file changed, 4 deletions(-)
diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index fff05f21f786..cc04089231f7 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -24,10 +24,6 @@ system_accounts="_varnish _vcache"
_varnish_homedir="/var/lib/varnish"
_vcache_pgroup="_varnish"
-if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
- broken="vcltest failure on i686 in c00059.vtc"
-fi
-
if [ yes = "$(vopt_if pcrejit yes)" ]; then
# Don't permit cross builds if pcrejit is set.
nocross="Cannot run test program when cross compiling (PCRE_JIT)"
From ee35f70b1e9c1032fd70e58a0ef2be428db640a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 16:43:55 +0200
Subject: [PATCH 268/608] varnish: update to 7.1.0.
---
common/shlibs | 2 +-
srcpkgs/varnish/template | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a7540ef7b2db..728f5083018c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3714,7 +3714,7 @@ libnozzle.so.1 libnozzle1-1.11_4
libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
libluv.so.1 libluv-1.30.1.0_1
libarmadillo.so.11 armadillo-11.0.1_1
-libvarnishapi.so.2 libvarnishapi-6.3.0_1
+libvarnishapi.so.3 libvarnishapi-7.1.0_1
libicns.so.1 libicns-0.8.1_1
librabbitmq.so.4 rabbitmq-c-0.10.0_2
libuInputPlus.so.0 libuInputPlus-0.1.3_1
diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index cc04089231f7..db6bc9c73ccb 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -1,17 +1,17 @@
# Template file for 'varnish'
pkgname=varnish
-version=6.6.0
+version=7.1.0
revision=1
build_style=gnu-configure
configure_args="--cache-file=config.void --disable-static $(vopt_enable pcrejit pcre-jit)"
hostmakedepends="pkg-config python3 python3-docutils python3-Sphinx"
-makedepends="pcre-devel readline-devel"
+makedepends="pcre2-devel readline-devel"
short_desc="Fast caching HTTP reverse proxy"
maintainer="Noel Cower <ncower@nil.dev>"
license="BSD-2-Clause"
homepage="https://varnish-cache.org/"
distfiles="https://varnish-cache.org/_downloads/${pkgname}-${version}.tgz"
-checksum=d5ff82f2041276dfaeb9a652a88b6d7287cfcf7ca345bb02c438fb65d2bca2e5
+checksum=f54ab88685667664e5b3c39eb56ac8c624b6c1093436a7f8c555491144c69eba
lib32disabled=yes
build_options="pcrejit"
@@ -24,6 +24,10 @@ system_accounts="_varnish _vcache"
_varnish_homedir="/var/lib/varnish"
_vcache_pgroup="_varnish"
+if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+ broken="vcltest failure on i686 in c00059.vtc and more"
+fi
+
if [ yes = "$(vopt_if pcrejit yes)" ]; then
# Don't permit cross builds if pcrejit is set.
nocross="Cannot run test program when cross compiling (PCRE_JIT)"
From f1c99d797b68f80595ef489de6d14098a48d7a24 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 26 Mar 2022 04:14:10 +0100
Subject: [PATCH 269/608] nheko: update to 0.9.3
---
srcpkgs/nheko/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index ed2f7f05dc75..47efea844493 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
-version=0.9.2
-revision=2
+version=0.9.3
+revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
@@ -16,7 +16,7 @@ license="GPL-3.0-or-later"
homepage="https://nheko-reborn.github.io"
changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=207243e1c0d0e879066233488b766e30d1902a24fd8f848850567d88408ce8ce
+checksum=9dc7e009366f96da9d9f1632cad96393a370073949e67bc811622f3567274ffb
case "$XBPS_TARGET_MACHINE" in
armv*-musl)
From 011d4797f46c97fbe21e23b8068a847b5bed18e5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:09:22 +1100
Subject: [PATCH 270/608] fasm: update to 1.73.30.
---
srcpkgs/fasm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fasm/template b/srcpkgs/fasm/template
index 00a6b954c30b..a0a125c04531 100644
--- a/srcpkgs/fasm/template
+++ b/srcpkgs/fasm/template
@@ -1,6 +1,6 @@
# Template file for 'fasm'
pkgname=fasm
-version=1.73.29
+version=1.73.30
revision=1
archs="i686* x86_64*"
wrksrc=fasm
@@ -9,7 +9,7 @@ maintainer="Dmitry Bogatov <KAction@disroot.org>"
license="BSD-2-Clause"
homepage="https://flatassembler.net"
distfiles="https://flatassembler.net/fasm-${version}.tgz"
-checksum=6328f4d83468f704e4274d6e90ec04947af56726453ce31389bc32024a98212b
+checksum=75195051a5881dbbbe0f0401161e937f8a36bb42d3470fc4869da14fd2c2f101
nostrip=yes
case ${XBPS_TARGET_MACHINE} in
From ede0d92efa99f4bfdf86838e47ac35fcaa027ce2 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 22 Mar 2022 07:39:30 +0100
Subject: [PATCH 271/608] ipp-usb: update to 0.9.22.
---
srcpkgs/ipp-usb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 98b472d15998..b32f515c8a27 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,6 +1,6 @@
# Template file for 'ipp-usb'
pkgname=ipp-usb
-version=0.9.19
+version=0.9.22
revision=1
build_style=go
go_import_path="github.com/OpenPrinting/ipp-usb"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="BSD-2-Clause"
homepage="https://github.com/OpenPrinting/ipp-usb"
distfiles="https://github.com/OpenPrinting/ipp-usb/archive/$version.tar.gz"
-checksum=06855b4da0bcaad430a42534c117a3f3224c4f6b0f6321da898e3422ae97ae15
+checksum=57f9bea4b41deb0f43957e24b3cf3a3a71050238abaea64d916b2e9a294d7aaf
post_install() {
vsv ipp-usb
From 4bbfdab6f835e21bb56994e6524458380cb136a0 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 19 Mar 2022 15:55:23 +0100
Subject: [PATCH 272/608] python3-aiorpcx: update to 0.22.1.
---
srcpkgs/python3-aiorpcx/template | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-aiorpcx/template b/srcpkgs/python3-aiorpcx/template
index 25a707330172..2f540305ec02 100644
--- a/srcpkgs/python3-aiorpcx/template
+++ b/srcpkgs/python3-aiorpcx/template
@@ -1,7 +1,7 @@
# Template file for 'python3-aiorpcx'
pkgname=python3-aiorpcx
-version=0.18.7
-revision=2
+version=0.22.1
+revision=1
wrksrc="aiorpcX-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,11 +14,8 @@ license="MIT"
homepage="https://github.com/kyuupichan/aiorpcX"
# missing license in PyPI tarball
distfiles="https://github.com/kyuupichan/aiorpcX/archive/${version}.tar.gz"
-checksum=ce98d20a22535651c1479dd66a0e68674e1677632cb43e9706908a4c1e04deb9
-
-do_check() {
- python3 -m pytest
-}
+checksum=f72034c4854daf32d83c06ca940d39336908d55ad6a2fe17c039124d51b89430
+make_check=ci-skip # Tests using IPv6 fail on Github Actions, pass locally
post_install() {
vlicense LICENCE
From f5aa01b9d748d24ab3af24d38cc9eb0170075741 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 19 Mar 2022 15:55:28 +0100
Subject: [PATCH 273/608] electrum: update to 4.2.0.
---
srcpkgs/electrum/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 59575350f955..4060f69a3075 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,7 +1,7 @@
# Template file for 'electrum'
pkgname=electrum
-version=4.1.5
-revision=2
+version=4.2.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
@@ -20,10 +20,10 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
license="MIT"
homepage="https://electrum.org/"
distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=3a24c7ed7a2bb47888f308380b8624a3fff3cf3882fd63d904cd9c3ec543fb3b
post_install() {
- sed -i -e 's|electrum %u|electrum|' \
+ vsed -i -e 's|electrum %u|electrum|' \
-e 's|testnet %u|testnet|' \
${DESTDIR}/usr/share/applications/electrum.desktop
vlicense LICENCE
From d25b9533b839f91a403953b5916b4f973ac908bf Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Fri, 8 Apr 2022 08:31:50 +0000
Subject: [PATCH 274/608] python3-audioread: update to 2.1.9
---
srcpkgs/python3-audioread/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-audioread/template b/srcpkgs/python3-audioread/template
index ba9a6fca85c2..58ab0f1f3a6e 100644
--- a/srcpkgs/python3-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,7 +1,7 @@
# Template file for 'python3-audioread'
pkgname=python3-audioread
-version=2.1.8
-revision=6
+version=2.1.9
+revision=1
wrksrc="audioread-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/sampsyo/audioread/"
distfiles="${PYPI_SITE}/a/audioread/audioread-${version}.tar.gz"
-checksum=073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168
+checksum=a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089
post_patch() {
# Build doesn't actually require pytest-runner and Void doesn't offer it
From e4434a6365fff34a5def90f7ac53a783f0121dca Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Wed, 25 May 2022 03:37:50 +0300
Subject: [PATCH 275/608] mobile-broadband-provider-info: update to 20220511.
---
srcpkgs/mobile-broadband-provider-info/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template
index 45cf541e58bd..68c0a965ec48 100644
--- a/srcpkgs/mobile-broadband-provider-info/template
+++ b/srcpkgs/mobile-broadband-provider-info/template
@@ -1,6 +1,6 @@
# Template file for 'mobile-broadband-provider-info'
pkgname=mobile-broadband-provider-info
-version=20201225
+version=20220511
revision=1
build_style=gnu-configure
hostmakedepends="automake libxslt"
@@ -10,7 +10,7 @@ maintainer="Ulf <void@uw.anonaddy.com>"
license="custom:Creative Commons Public Domain"
homepage="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/"
distfiles="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/${version}/mobile-broadband-provider-info-${version}.tar.bz2"
-checksum=0616b3d0580575741d4319ac71ca67c9a378879943d32a67ac0460615767bcdf
+checksum=1ccbf314cac06048fd8c57ffad28c4e4273cc096e4eb8fca9beb38280428450f
pre_configure() {
autoreconf -fi
From 61f3a5d0e7af5927fd3b77d482d8a5a57b9c3b0f Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 27 Mar 2022 16:59:44 -0400
Subject: [PATCH 276/608] unibilium: update to 2.1.1
* change upstream to https://github.com/neovim/unibilium
---
srcpkgs/unibilium/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/unibilium/template b/srcpkgs/unibilium/template
index b744e1ae6dc2..e35ec896a90a 100644
--- a/srcpkgs/unibilium/template
+++ b/srcpkgs/unibilium/template
@@ -1,15 +1,17 @@
# Template file for 'unibilium'
pkgname=unibilium
-version=2.0.0
-revision=2
+version=2.1.1
+revision=1
build_style=gnu-makefile
+make_check_target="test"
hostmakedepends="libtool perl"
short_desc="Simple, self-contained terminfo library"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="LGPL-3.0-or-later"
-homepage="https://github.com/mauke/unibilium"
-distfiles="https://github.com/mauke/${pkgname}/archive/v${version}.tar.gz"
-checksum=78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1c1
+homepage="https://github.com/neovim/unibilium"
+changelog="https://github.com/neovim/unibilium/raw/master/Changes"
+distfiles="https://github.com/neovim/${pkgname}/archive/v${version}.tar.gz"
+checksum=6f0ee21c8605340cfbb458cbd195b4d074e6d16dd0c0e12f2627ca773f3cabf1
do_build() {
if [ "$CROSS_BUILD" ]; then
From e7fbb6104209b915e39e77e054ddbcb669ffbe2c Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Thu, 30 Jun 2022 12:37:51 +0100
Subject: [PATCH 277/608] rebar3: update to 3.19.0.
---
srcpkgs/rebar3/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rebar3/template b/srcpkgs/rebar3/template
index 99839b0b7951..da3f82deade3 100644
--- a/srcpkgs/rebar3/template
+++ b/srcpkgs/rebar3/template
@@ -1,7 +1,7 @@
# Template file for 'rebar3'
pkgname=rebar3
-version=3.14.4
-revision=2
+version=3.19.0
+revision=1
hostmakedepends=erlang
depends="erlang>=22"
short_desc="Erlang build tool to compile, test, and release applications"
@@ -9,7 +9,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
license="Apache-2.0"
homepage="https://www.rebar3.org/"
distfiles="https://github.com/erlang/rebar3/archive/${version}.tar.gz"
-checksum=8d78ed53209682899d777ee9443b26b39c9bf96c8b081fe94b3dd6693077cb9a
+checksum=ff9ef42c737480477ebdf0dd9d95ece534a14c96f05edafbf32e9af973280bc3
do_build() {
./bootstrap
From 7814eee1dafc490803af0601d7213344e85deb01 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 18:04:35 +0300
Subject: [PATCH 278/608] profanity: update to 0.12.1.
---
srcpkgs/profanity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index d5004820bcce..3aec13a9115e 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -7,10 +7,10 @@ configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
$(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins)
$(vopt_with xscreensaver) $(vopt_enable omemo) $(vopt_enable cplugins c-plugins)
ac_cv_prog_PYTHON_CONFIG_EXISTS=yes PYTHON_VERSION=3"
-hostmakedepends="pkg-config $(vopt_if python python3-devel) $(vopt_if gtk gtk+-devel)"
+hostmakedepends="pkg-config $(vopt_if python python3-devel) $(vopt_if gtk gtk+3-devel)"
makedepends="libcurl-devel libglib-devel libstrophe-devel readline-devel sqlite-devel
$(vopt_if notify libnotify-devel) $(vopt_if otr 'libotr-devel libgcrypt-devel')
- $(vopt_if pgp gpgme-devel) $(vopt_if python python3-devel) $(vopt_if gtk gtk+-devel)
+ $(vopt_if pgp gpgme-devel) $(vopt_if python python3-devel) $(vopt_if gtk gtk+3-devel)
$(vopt_if xscreensaver libXScrnSaver-devel)
$(vopt_if omemo 'libsignal-protocol-c-devel libgcrypt-devel')"
checkdepends="cmocka-devel"
From fc6271a90d8b96e12db61e9235da62693fef3f71 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 23 Apr 2022 22:41:58 +0200
Subject: [PATCH 279/608] python3-pikepdf: update to 5.1.3.
---
srcpkgs/python3-pikepdf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index ae0b2ee09ba5..b742def96c97 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pikepdf'
pkgname=python3-pikepdf
-version=5.0.1
+version=5.1.3
revision=1
wrksrc="pikepdf-${version}"
build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="MPL-2.0"
homepage="https://github.com/pikepdf/pikepdf"
distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=5fae9eeb7a0120d466fb219aea643a94a1423d68ee9171639a44cf0329ebe7aa
+checksum=c34e4239661d2ddf23caa1c4256f636c866ce8069a5052a2bf8ee06e3cae22f3
pre_build() {
vsed -e '/setuptools_scm_git_archive/d' -i setup.py
From 7530f7d50ac747b088cd734030843efdd809e412 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 22 Apr 2022 19:04:19 +0200
Subject: [PATCH 280/608] libenet: update to 1.3.17.
---
srcpkgs/libenet/template | 5 +++--
srcpkgs/libenet/update | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libenet/template b/srcpkgs/libenet/template
index 1c11d5883d41..fdaad8b9f11c 100644
--- a/srcpkgs/libenet/template
+++ b/srcpkgs/libenet/template
@@ -1,6 +1,6 @@
# Template file for 'libenet'
pkgname=libenet
-version=1.3.14
+version=1.3.17
revision=1
wrksrc="enet-${version}"
build_style=gnu-configure
@@ -8,8 +8,9 @@ short_desc="Reliable UDP networking library"
maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
license="MIT"
homepage="http://enet.bespin.org"
+changelog="https://raw.githubusercontent.com/lsalzman/enet/master/ChangeLog"
distfiles="http://enet.bespin.org/download/enet-${version}.tar.gz"
-checksum=98f6f57aab0a424469619ed3047728f0d3901ce8f0dea919c11e7966d807e870
+checksum=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/libenet/update b/srcpkgs/libenet/update
index 23ceae259b59..b04507812857 100644
--- a/srcpkgs/libenet/update
+++ b/srcpkgs/libenet/update
@@ -1 +1,2 @@
-pkgname=enet
+site="https://github.com/lsalzman/enet/tags"
+pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'
From 818636761d1294f08382fd5053e01e7c86748f7d Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Sat, 30 Apr 2022 18:11:52 +0100
Subject: [PATCH 281/608] fs-uae: update to 3.1.66.
---
srcpkgs/fs-uae/files/fs-uae.desktop | 11 -------
srcpkgs/fs-uae/template | 46 ++++++++++++++++-------------
2 files changed, 26 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/fs-uae/files/fs-uae.desktop
diff --git a/srcpkgs/fs-uae/files/fs-uae.desktop b/srcpkgs/fs-uae/files/fs-uae.desktop
deleted file mode 100644
index 388c561065dc..000000000000
--- a/srcpkgs/fs-uae/files/fs-uae.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=FS-UAE
-Comment=FS-UAE Amiga Emulator
-TryExec=fs-uae
-Exec=fs-uae %f
-StartupNotify=true
-Terminal=false
-Type=Application
-Icon=fs-uae
-Categories=Applications;Emulators;Game
-
diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template
index b4387082e153..c631a1b36270 100644
--- a/srcpkgs/fs-uae/template
+++ b/srcpkgs/fs-uae/template
@@ -1,36 +1,42 @@
# Template file for 'fs-uae'
pkgname=fs-uae
-version=3.0.5
+version=3.1.66
revision=1
build_style=gnu-configure
-hostmakedepends="automake gettext libtool pkg-config zip"
-makedepends="glew-devel libmpeg2-devel SDL2-devel MesaLib-devel
- freetype-devel libglib-devel libpng-devel libopenal-devel"
-depends="desktop-file-utils hicolor-icon-theme"
+hostmakedepends="pkg-config gettext zip"
+makedepends="libmpeg2-devel SDL2-devel libglib-devel libpng-devel libopenal-devel"
short_desc="FS-UAE Amiga Emulator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://fs-uae.net"
-distfiles="https://fs-uae.net/stable/${version}/${pkgname}-${version}.tar.gz"
-checksum=f26ec42e03cf1a7b53b6ce0d9845aa45bbf472089b5ec046b3eb784ec6859fe3
-nocross="./gen/genlinetoscr: cannot execute binary file: Exec format error"
-nopie=yes
+distfiles="https://fs-uae.net/files/FS-UAE/Stable/${version}/${pkgname}-${version}.tar.xz"
+checksum=606e1868b500413d69bd33bb469f8fd08d6c08988801f17b7dd022f3fbe23832
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) ;;
+ x86_64*|i686*) nopie=yes ;;
*) configure_args+=" --disable-jit" ;;
esac
-CFLAGS="-Wno-error -Wno-narrowing -Wno-alloc-size-larget-than"
-CXXFLAGS="${CFLAGS}"
+if [ "$CROSS_BUILD" ]; then
+ post_configure() {
+ make $makejobs \
+ CC=$CC_FOR_BUILD CFLAGS=$CFLAGS_FOR_BUILD \
+ CXX=$CXX_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD \
+ LIBS= GLIB_LIBS= LIBMPEG2_LIBS= OPENAL_LIBS= \
+ OPENGL_LIBS= PNG_LIBS= SDL2_LIBS= X11_LIBS= ZLIB_LIBS= \
+ gen/blit.h gen/blitfunc.cpp gen/blitfunc.h gen/blittable.cpp \
+ gen/compemu.cpp gen/cpudefs.cpp gen/cpuemu_0.cpp \
+ gen/linetoscr.cpp
-pre_configure() {
- grep -rlw -- -Werror | xargs -n1 -t -I% sed -i % -e "s;-Werror;-Wno-error;"
- autoreconf -fi
- cd libmpeg2
- autoreconf -fi
-}
+ rm src/readcpu.o gen/cpudefs.o
+ make $makejobs src/readcpu.o gen/cpudefs.o
+ touch gen/*
+ }
+fi
-post_install() {
- vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications
+post_extract() {
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) sed -i -e 's/| RTLD_DEEPBIND//' src/dlopen.cpp ;;
+ esac
+ sed -i -e '/^NoDisplay/d' share/applications/fs-uae.desktop
}
From 1f4faffc7163060cb752b16b512b59d694dcdec9 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Thu, 9 Jun 2022 14:06:20 +0200
Subject: [PATCH 282/608] root: update to 6.26.04
---
srcpkgs/root/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index bfc8cb6d8a3b..8f67b5af5d70 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,6 +1,6 @@
# Template file for 'root'
pkgname=root
-version=6.26.02
+version=6.26.04
revision=1
# Only i686 and x86_64 seem to be officially supported
archs="i686* x86_64*"
@@ -29,7 +29,7 @@ maintainer="Ben Jargowsky <benjar63@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://root.cern"
distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
-checksum=7ba96772271a726079506c5bf629c3ceb21bf0682567ed6145be30606d7cd9bb
+checksum=a271cf82782d6ed2c87ea5eef6681803f2e69e17b3036df9d863636e9358421e
build_options="fortran root7"
build_options_default="fortran"
python_version=3
From ff08051dece8680ed975f7946b724e014ef5b3e6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 17 Jun 2022 22:04:39 +0400
Subject: [PATCH 283/608] json-c: update to 0.16, adopt
---
...1-4e9e44-Fix-read-past-end-of-buffer.patch | 24 -------------------
srcpkgs/json-c/template | 7 +++---
2 files changed, 4 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch
diff --git a/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch b/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch
deleted file mode 100644
index bfbdce690950..000000000000
--- a/srcpkgs/json-c/patches/0001-4e9e44-Fix-read-past-end-of-buffer.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4e9e44e5258dee7654f74948b0dd5da39c28beec Mon Sep 17 00:00:00 2001
-From: Marc <34656315+MarcT512@users.noreply.github.com>
-Date: Fri, 7 Aug 2020 10:49:45 +0100
-Subject: [PATCH] Fix read past end of buffer
-
-Resolves https://github.com/json-c/json-c/issues/654
----
- apps/json_parse.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/apps/json_parse.c b/apps/json_parse.c
-index bba4622183..72b31a860a 100644
---- a/apps/json_parse.c
-+++ b/apps/json_parse.c
-@@ -82,7 +82,8 @@ static int parseit(int fd, int (*callback)(struct json_object *))
- int parse_end = json_tokener_get_parse_end(tok);
- if (obj == NULL && jerr != json_tokener_continue)
- {
-- char *aterr = &buf[start_pos + parse_end];
-+ char *aterr = (start_pos + parse_end < sizeof(buf)) ?
-+ &buf[start_pos + parse_end] : "";
- fflush(stdout);
- int fail_offset = total_read - ret + start_pos + parse_end;
- fprintf(stderr, "Failed at offset %d: %s %c\n", fail_offset,
diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template
index daafc44f97ac..dbbd2565a2a9 100644
--- a/srcpkgs/json-c/template
+++ b/srcpkgs/json-c/template
@@ -1,17 +1,18 @@
# Template file for 'json-c'
pkgname=json-c
-version=0.15
+version=0.16
revision=1
build_style=cmake
configure_args="-DENABLE_THREADING=ON -DBUILD_STATIC_LIBS=ON
-DENABLE_RDRAND=$(vopt_if rdrand ON OFF)"
hostmakedepends="doxygen"
short_desc="JSON implementation in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://json-c.github.io/json-c"
+changelog="https://raw.githubusercontent.com/json-c/json-c/master/ChangeLog"
distfiles="https://s3.amazonaws.com/json-c_releases/releases/${pkgname}-${version}.tar.gz"
-checksum=b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6
+checksum=8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b
CFLAGS="-Wno-error"
From 8833dcf33bb575e2c4e4c5da6fc28a268bb938f1 Mon Sep 17 00:00:00 2001
From: Nikolay Belikov <nb@nbelikov.com>
Date: Mon, 13 Jun 2022 20:26:06 +0300
Subject: [PATCH 284/608] New package: python3-pathvalidate-2.5.0
---
srcpkgs/python3-pathvalidate/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-pathvalidate/template
diff --git a/srcpkgs/python3-pathvalidate/template b/srcpkgs/python3-pathvalidate/template
new file mode 100644
index 000000000000..49cd093824d9
--- /dev/null
+++ b/srcpkgs/python3-pathvalidate/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pathvalidate'
+pkgname=python3-pathvalidate
+version=2.5.0
+revision=1
+wrksrc="pathvalidate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python library to sanitize/validate strings such as filenames/paths"
+maintainer="Nikolay Belikov <nb@nbelikov.com>"
+license="MIT"
+homepage="https://github.com/thombashi/pathvalidate"
+changelog="https://github.com/thombashi/pathvalidate/releases"
+distfiles="${PYPI_SITE}/p/pathvalidate/pathvalidate-${version}.tar.gz"
+checksum="119ba36be7e9a405d704c7b7aea4b871c757c53c9adc0ed64f40be1ed8da2781"
+# Tests depend on unpackaged allpairspy, faker, pytest-discord, pytest-md-report.
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From 862a7468de2b4aad75244a84feb182f3904b2614 Mon Sep 17 00:00:00 2001
From: Nikolay Belikov <nb@nbelikov.com>
Date: Mon, 13 Jun 2022 20:35:41 +0300
Subject: [PATCH 285/608] Electron-Cash: update to 4.2.10.
---
srcpkgs/Electron-Cash/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index 0e5265f3a92d..fb0cba1e6c55 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -1,19 +1,21 @@
# Template file for 'Electron-Cash'
pkgname=Electron-Cash
-version=4.2.3
-revision=2
+version=4.2.10
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil
python3-jsonrpclib python3-protobuf
python3-dnspython python3-requests python3-pysocks python3-stem
- python3-ecdsa python3-pyaes python3-pycryptodome libbitcoin-secp256k1 libzbar"
+ python3-ecdsa python3-pyaes python3-pycryptodomex libbitcoin-secp256k1 libzbar
+ python3-cryptography>=2.6 python3-pathvalidate python3-psutil"
short_desc="Lightweight Bitcoin Cash client"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://electroncash.org"
distfiles="https://github.com/Electron-Cash/Electron-Cash/releases/download/${version}/Electron-Cash-${version}.tar.gz"
-checksum=4c2ea0884ec19a73368eea2081bd763db25cd5760feb23039a4bb61512c4e802
+checksum=2c77258c0e8ccdc42d16cd9bdbc26b47f94b92d9ba8a86d63c25a17ec832b324
+make_check=no # Depends on unpackaged SimpleWebSocketServer
post_install() {
# TODO: build these binaries instead of having to remove pre-built ones
From 02c187d27f1fdf296ed8d6dc891dfb8174f83986 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:17 +0300
Subject: [PATCH 286/608] skalibs: update to 2.12.0.1.
---
common/shlibs | 2 +-
srcpkgs/skalibs/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 728f5083018c..9aeeb079cf0e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2363,7 +2363,7 @@ libgnunettransport.so.2 gnunet-0.12.2_1
libgnunettransportapplication.so.0 gnunet-0.12.2_1
libgnunettransportcore.so.0 gnunet-0.12.2_1
libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
-libskarnet.so.2.11 skalibs-2.11.0.0_1
+libskarnet.so.2.12 skalibs-2.12.0.0_1
libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
libtidy.so.58 libtidy5-5.8.0_1
libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index bac3772b161c..dccbcee327eb 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
# Template file for 'skalibs'
pkgname=skalibs
-version=2.11.2.0
+version=2.12.0.1
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/skalibs/"
changelog="https://skarnet.org/software/skalibs/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=649cf3236fe3103f45366b6196b1bcd0457c9c17ca86f2b80007696a2baa7b77
+checksum=3e228f72f18d88c17f6c4e0a66881d6d3779427b7e7e889f3142b6f26da30285
post_install() {
vlicense COPYING LICENSE
From 1c0861e67c09468cee1242298b7459e97de88afb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:23 +0300
Subject: [PATCH 287/608] execline: update to 2.9.0.0.
---
srcpkgs/execline/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index f27c5a33e5fb..5f98c27ecbe1 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
# Template file for 'execline'
pkgname=execline
-version=2.8.3.0
+version=2.9.0.0
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/execline/"
changelog="https://skarnet.org/software/execline/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=235dbecd594c82e0523c87c2eacf04c48781b39264158f57049f1a1ff8b4ad80
+checksum=d4906aad8c3671265cfdad1aef265228bda07e09abd7208b4f093ac76f615041
CFLAGS="-fPIC"
From 9bd6eccfc6d0ede8b97b39ff01b0b4b05f965a45 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:28 +0300
Subject: [PATCH 288/608] execline-man-pages: update to 2.9.0.0.1.
---
srcpkgs/execline-man-pages/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index 3bebd8f3ba1e..7369115caf4c 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,6 +1,6 @@
# Template file for 'execline-man-pages'
pkgname=execline-man-pages
-version=2.8.3.0.2
+version=2.9.0.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/execline-man-pages"
distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=7862c8918faa3e82ff0a65b5c108498a2b0b3b07b3ebfb8a7e6491890e0e84b4
+checksum=e8e7e3deacbfdbb7144574068fdb5621340522ec8c6fa7e4d32b6b44ee060b33
post_install() {
vlicense LICENSE
From cf35d3e70ec350fd510c7559942fe487b298eedf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:33 +0300
Subject: [PATCH 289/608] s6: update to 2.11.1.1.
---
srcpkgs/s6/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 5812c18784b0..d54785b251b2 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
# Template file for 's6'
pkgname=s6
-version=2.11.1.0
+version=2.11.1.1
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -15,7 +15,7 @@ license="ISC"
homepage="http://skarnet.org/software/s6/"
changelog="https://skarnet.org/software/s6/upgrade.html"
distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=ae64dc2ba208ff80e4ac4792ce90dd526b42bf19c966dc7d8eb9a6870e4bc23a
+checksum=1cef7f7b3a7e01181fbb6fe8300e6ba422d9689007221c78af1f99528acb6c38
build_options="static"
From 35e6d9e83ca169b53e8f59d6c452748a706d15d3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:44:47 +0300
Subject: [PATCH 290/608] s6-man-pages: update to 2.11.1.1.1.
---
srcpkgs/s6-man-pages/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
index 013c85787e96..308c8a8ebd2b 100644
--- a/srcpkgs/s6-man-pages/template
+++ b/srcpkgs/s6-man-pages/template
@@ -1,6 +1,6 @@
# Template file for 's6-man-pages'
pkgname=s6-man-pages
-version=2.11.1.0.1
+version=2.11.1.1.1
revision=1
build_style=gnu-makefile
short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)"
@@ -8,7 +8,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/s6-man-pages"
distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz"
-checksum=50ef3005c72fb790cf72b510b487fedc9f51c656e7f6f36a48762f9fc679344c
+checksum=794cd18cabee8c5afcb2cddfb35a5ae93240595aae5dc831acc8f4e258ca2199
post_install() {
vlicense LICENSE
From e09a7c715396c11f0435fc44aa732be331c9d249 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:04 +0300
Subject: [PATCH 291/608] s6-rc: update to 0.5.3.2.
---
srcpkgs/s6-rc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index e47ba8b92b1f..495907ef8a60 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,6 +1,6 @@
# Template file for 's6-rc'
pkgname=s6-rc
-version=0.5.3.0
+version=0.5.3.2
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -15,7 +15,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-rc/"
changelog="https://skarnet.org/software/s6-rc/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=93a31d2bd39569f684792973b556ac02723bdb60bd1ae76e9a0ea1f4a9b43f27
+checksum=4f24a4966a4aa353d2bd1a8afca9b88c7b7bd29c46b3a1a7f5305686b9d6e038
build_options="static"
From d2452d50effbcc33132081236f8d588315399849 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:14 +0300
Subject: [PATCH 292/608] s6-linux-utils: update to 2.6.0.0.
---
srcpkgs/s6-linux-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 50bcca538641..212752cc26d0 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,6 +1,6 @@
# Template file for 's6-linux-utils'
pkgname=s6-linux-utils
-version=2.5.1.7
+version=2.6.0.0
revision=1
build_style=configure
configure_args="--libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-linux-utils"
changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=86a8c2df4bf13e17fb04b86b60dd2ab355f47bc4bf3c3821637cf9f599addfd8
+checksum=6c7132734a0c8287002ee6910c469f175a97d766a8023c0c33af8ba92643ed59
build_options="static"
From 1eb98945580e68469e6919e3cf6fcce7560d4b0f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:23 +0300
Subject: [PATCH 293/608] s6-portable-utils: update to 2.2.5.0.
---
srcpkgs/s6-portable-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index e7de2cf69b93..ca0c308fb3b1 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,6 +1,6 @@
# Template file for 's6-portable-utils'
pkgname=s6-portable-utils
-version=2.2.4.0
+version=2.2.5.0
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-portable-utils/"
changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=cb1eea89f0311006f0132aa45324ff96fa7756d11a5f4366c68d084839e5a56f
+checksum=ebb39f8934fd36f25d31352e61bbd94dc02b1e9f04411850d2fd9658bd916e36
build_options="static"
From 37f13c320f8d1f064f4b60be1707ccbbba47a2b4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:27 +0300
Subject: [PATCH 294/608] s6-portable-utils-man-pages: update to 2.2.5.0.1.
---
srcpkgs/s6-portable-utils-man-pages/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-portable-utils-man-pages/template b/srcpkgs/s6-portable-utils-man-pages/template
index afce5d598f33..28c906c1a67a 100644
--- a/srcpkgs/s6-portable-utils-man-pages/template
+++ b/srcpkgs/s6-portable-utils-man-pages/template
@@ -1,6 +1,6 @@
# Template file for 's6-portable-utils-man-pages'
pkgname=s6-portable-utils-man-pages
-version=2.2.4.0.2
+version=2.2.5.0.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/s6-portable-utils-man-pages"
distfiles="https://github.com/flexibeast/s6-portable-utils-man-pages/archive/refs/tags/v${version}.tar.gz"
-checksum=af0f6b39d5b4184db08d413840b810a543ae7f9fbd19e48ea14022d5b6ac42c7
+checksum=e960dbd459285846f89900643742846848431c0d82d4645f3c4b697227abdfe4
post_install() {
vlicense LICENSE
From 6dada0f610163fd90d9440282e393cc1c635bbfa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:48 +0300
Subject: [PATCH 295/608] s6-dns: update to 2.3.5.4.
---
srcpkgs/s6-dns/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index 23f7f81ebec6..dae2279b0749 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,6 +1,6 @@
# Template file for 's6-dns'
pkgname=s6-dns
-version=2.3.5.3
+version=2.3.5.4
revision=1
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib
@@ -13,7 +13,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
license="ISC"
homepage="https://skarnet.org/software/s6-dns"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=2ac42f6771cc95c5e9b4d50e4713c3be51733d0f615dcd6c71ef1d9e059c76da
+checksum=76af222472c4754f83cdc59ad354255ce1b1e6f6833a059328463f8e51f4db43
build_options="static"
From d63b9d9cd4b161887cc521ff33260266612e548b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:45:54 +0300
Subject: [PATCH 296/608] s6-networking: update to 2.5.1.1.
---
srcpkgs/s6-networking/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index d39c9cfda98e..d06d52acf170 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,6 +1,6 @@
# Template file for 's6-networking'
pkgname=s6-networking
-version=2.5.1.0
+version=2.5.1.1
revision=1
build_style=configure
configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
@@ -16,7 +16,7 @@ license="ISC"
homepage="https://skarnet.org/software/s6-networking"
changelog="https://skarnet.org/software/s6-networking/upgrade.html"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=2507c51fea5a2d07a7a77300a6502f2af4a04b6da15131f20bf984b99091ff41
+checksum=7ac79d4de3d9c13532e444ab7497c4e04ad0fa7229d502984d9dc7d48aa64418
build_options="bearssl libtls static"
build_options_default="bearssl"
From d1b95a2c9400afd702c9621b605a8b37521fcc05 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:46:03 +0300
Subject: [PATCH 297/608] oblibs: update to 0.1.4.0.
---
srcpkgs/oblibs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index c47caaf61f44..47495454055b 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,7 +1,7 @@
# Template file for 'oblibs'
pkgname=oblibs
version=0.1.4.0
-revision=1
+revision=2
wrksrc="oblibs-v${version}"
build_style=configure
configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps"
From cb3f03698261940e8354b1477183614c7967830b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:46:07 +0300
Subject: [PATCH 298/608] 66: update to 0.6.2.0.
---
srcpkgs/66/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 7ad72f7d6411..757c7e5dfd50 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
# Template file for '66'
pkgname=66
version=0.6.2.0
-revision=1
+revision=2
wrksrc="66-v${version}"
build_style=configure
configure_args="--prefix=/usr
From d8f0f5b0d231717f094ba2e919fbf3b61056f74d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:46:12 +0300
Subject: [PATCH 299/608] 66-tools: update to 0.0.8.0.
---
srcpkgs/66-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index 1b61ce1aa874..43a5c9cf6f0a 100644
--- a/srcpkgs/66-tools/template
+++ b/srcpkgs/66-tools/template
@@ -1,7 +1,7 @@
# Template file for '66-tools'
pkgname=66-tools
version=0.0.8.0
-revision=1
+revision=2
wrksrc="66-tools-v${version}"
build_style=configure
configure_args="--prefix=/usr
From 768d028d2b134d3cdeb7b0458b95bd0936256792 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:46:59 +0300
Subject: [PATCH 300/608] s6-networking-man-pages: update to 2.5.1.1.1.
---
srcpkgs/s6-networking-man-pages/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
index 2edb8b455dc2..2480ac1440f9 100644
--- a/srcpkgs/s6-networking-man-pages/template
+++ b/srcpkgs/s6-networking-man-pages/template
@@ -1,6 +1,6 @@
# Template file for 's6-networking-man-pages'
pkgname=s6-networking-man-pages
-version=2.5.1.0.1
+version=2.5.1.1.1
revision=1
build_style=gnu-makefile
hostmakedepends="mdocml"
@@ -8,8 +8,8 @@ short_desc="Mdoc versions of the documentation for the s6-networking suite"
maintainer="mobinmob <mobinmob@disroot.org>"
license="ISC"
homepage="https://github.com/flexibeast/s6-networking-man-pages"
-distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/v${version}.tar.gz"
-checksum=0def3cc5511f20efd47f967c498e5bd6635b1c9eded738e2fece2f956cb9bc5e
+distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/refs/tags/v${version}.tar.gz"
+checksum=8502edfc01f54c7eca8131a5cb3c9a46c698c9199f9654db9183f7e307ece258
post_install() {
vlicense LICENSE
From a259f3868caee98ed41245538338036ecf4b8802 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:47:18 +0300
Subject: [PATCH 301/608] nsss: update to 0.2.0.1.
---
srcpkgs/nsss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index 3512d09597ef..b4efae672355 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,7 +1,7 @@
# Template file for 'nsss'
pkgname=nsss
version=0.2.0.1
-revision=1
+revision=2
# Only available for musl
archs="*-musl"
build_style=configure
From e9f3912845f4c358ec1bb3abfdc093f2b13701c3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 23 Jun 2022 19:47:22 +0300
Subject: [PATCH 302/608] mdevd: update to 0.1.5.2.
---
srcpkgs/mdevd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index 81d41322313f..9e66d2afc9b1 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,6 +1,6 @@
# Template file for 'mdevd'
pkgname=mdevd
-version=0.1.5.1
+version=0.1.5.2
revision=1
build_style=configure
configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -14,7 +14,7 @@ license="ISC"
homepage="https://skarnet.org/software/mdevd/"
changelog="https://skarnet.org/software/mdevd/upgrade.html"
distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=94ce95067809e8c53f3e32ce5fd0c53356085d069ce2f1d3168e4e38a64e90f5
+checksum=460372b3d3bac9f3574156ed7e48618f9f4a361cb52c4494ad9063248ab4a4ff
build_options="static"
From 107a122037515fda8677838cf5d4340b9fecb230 Mon Sep 17 00:00:00 2001
From: nyanpasu64 <nyanpasu64@tuta.io>
Date: Sun, 12 Jun 2022 17:26:17 -0700
Subject: [PATCH 303/608] kate5: update to 22.04.2.
---
srcpkgs/kate5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index dd4240f84fb4..84c794ca852e 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
# Template file for 'kate5'
pkgname=kate5
-version=22.04.1
+version=22.04.2
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://kde.org/applications/en/utilities/org.kde.kate"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=f46ec33d7edf8032efcd489cc431ebf3f93e703e0e7d88a51e93941fd8509849
+checksum=7cfec8b6391d89914aa73ead3902fdafab92f73368e0e26743cd4aab1ef117de
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
From 0d7f41f3030fe1f669f03c638576c704aeb76284 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 17:25:26 +0200
Subject: [PATCH 304/608] electrum: move INSTALL.msg to README.voidlinux
---
srcpkgs/electrum/{INSTALL.msg => files/README.voidlinux} | 0
srcpkgs/electrum/template | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
rename srcpkgs/electrum/{INSTALL.msg => files/README.voidlinux} (100%)
diff --git a/srcpkgs/electrum/INSTALL.msg b/srcpkgs/electrum/files/README.voidlinux
similarity index 100%
rename from srcpkgs/electrum/INSTALL.msg
rename to srcpkgs/electrum/files/README.voidlinux
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 4060f69a3075..8cc5b2d4bfc8 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,7 +1,7 @@
# Template file for 'electrum'
pkgname=electrum
version=4.2.0
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx
@@ -27,4 +27,5 @@ post_install() {
-e 's|testnet %u|testnet|' \
${DESTDIR}/usr/share/applications/electrum.desktop
vlicense LICENCE
+ vdoc "${FILESDIR}/README.voidlinux"
}
From aca362b748d8ffbb382f030c02fc018a310b9336 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Thu, 30 Jun 2022 01:46:17 -0700
Subject: [PATCH 305/608] nss: package libnsssysinit.so.
I needed this to be able to force Firefox to use a system-wide
nss certificate store.
---
srcpkgs/nss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 0d9c200fe637..e60b37405edd 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -4,7 +4,7 @@ _nsprver=4.34
pkgname=nss
version=3.80
-revision=1
+revision=2
hostmakedepends="perl which"
makedepends="nspr-devel sqlite-devel zlib-devel"
depends="nspr>=${_nsprver}"
@@ -110,7 +110,7 @@ do_install() {
chmod 755 ${DESTDIR}/usr/bin/nss-config
for f in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
- libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so; do
+ libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so libnsssysinit.so; do
install -m755 dist/*.OBJ/lib/${f} ${DESTDIR}/usr/lib
done
From 69ea391c164787d332a9984d2353d4f861f3d7d7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 17 Jun 2022 14:45:39 -0500
Subject: [PATCH 306/608] QMPlay2: update to 22.06.16.
---
srcpkgs/QMPlay2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 1c8571de2591..f5bc74d898b4 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
-version=22.03.19
+version=22.06.16
revision=1
wrksrc="${pkgname}-src-${version}"
build_style=cmake
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=d6cde1cec25729d32a8cc1ba925b711b98d18961941f9764a7db8a75b255004e
+checksum=cc43321142bfef434181faa030815812de758a933fabdf03ddefb254cf5fcb00
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 4e3825be47b0f00392bf7a56bdf1b2c9cb21349d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 27 Jun 2022 16:49:35 -0500
Subject: [PATCH 307/608] Amass: update to 3.19.3.
---
srcpkgs/Amass/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 7106a5c312fd..d5c07bb7d33b 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
# Template file for 'Amass'
pkgname=Amass
-version=3.19.2
+version=3.19.3
revision=1
build_style=go
go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=ef2b5303b3e92debe68ea72c03c4f60320c34f0281f50b5f7108750c7e1a7491
+checksum=1b7f15c86a3de4854fccc56dabea921518606c6db0cc278d2eed1f54d334723d
From 78e02987c2fe4dd3d306ad3dedbdd7fb9d730134 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 28 Jun 2022 16:09:32 -0500
Subject: [PATCH 308/608] jadx: update to 1.4.2.
---
srcpkgs/jadx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index a03cee61cac6..41cf6bc7744b 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,6 +1,6 @@
# Template file for 'jadx'
pkgname=jadx
-version=1.4.1
+version=1.4.2
revision=1
hostmakedepends="openjdk8 gradle"
short_desc="Decompiler for Dalvik bytecode"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/skylot/jadx"
distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=a7323458143805bc10754abbc41094d866ba3c342cfa2201b77d8ee2cdadf467
+checksum=12ddc584d1b806475b8b09e2380a70dff3256cb1283f2eb3e1dec0cccf6f4176
do_build() {
gradle copyArtifacts
From a3b2f8c6ed121235d2974f6cbdf70fc3d25f1586 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 28 Jun 2022 16:09:34 -0500
Subject: [PATCH 309/608] jc: update to 1.20.1.
---
srcpkgs/jc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index d0a1c7d9fba6..f47b5a00f270 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
# Template file for 'jc'
pkgname=jc
-version=1.20.0
+version=1.20.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/kellyjonbrazil/jc"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=79a96fc7f4eaee1792954e86cbe9e9325348a0f78e73850303f00c5c8b46720b
+checksum=e0426fc0c9f687fdf1600f7503c14f0926234d6bdf316a84af204e3d2cb999ae
From 2943c2e597779c5764e81400b832cf996432663a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 30 Jun 2022 20:07:03 +0300
Subject: [PATCH 310/608] opera: update to 88.0.4412.53.
---
srcpkgs/opera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 35645b527cae..c01a1bc005a7 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
# Template file for 'opera'
pkgname=opera
-version=88.0.4412.40
+version=88.0.4412.53
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
homepage="https://www.opera.com/computer"
distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=9f825b3040bc2c3d8b10f5d45313b2006736562f0bf86fa86345c0cea9e6bacf
+checksum=de19fbbb16f00c53867e62058f0b34b046157f5277f687dc3345b20f160a9e43
repository="nonfree"
nostrip=yes
From a6b1e54c64ae0f248f232513b356f0a1d4a0ae52 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 19:29:01 +0200
Subject: [PATCH 311/608] help2man: remove gettext from hostmakdepends, it
cycles
---
srcpkgs/help2man/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index 04762df68a96..e15df17bc455 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -3,7 +3,9 @@ pkgname=help2man
version=1.49.2
revision=1
build_style=gnu-configure
-hostmakedepends="perl-Locale-gettext gettext"
+# no 'gettext' build dependency, it creates a cycle:
+# automake -> autoconf -> help2man -> !gettext! -> automake
+hostmakedepends="perl-Locale-gettext"
depends="perl-Locale-gettext"
short_desc="GNU conversion tool to create man files"
maintainer="Orphaned <orphan@voidlinux.org>"
From de4d7ef47b7aef3ba9b28192b8d1ff60b23683e6 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 30 Jun 2022 13:39:06 +0200
Subject: [PATCH 312/608] enigma: update to 1.30.
Also:
- take maintainership
- move to SDL2.0
- use system libenet instead of the bundled one
---
.../enigma/patches/fix-ifstream_test.patch | 11 --------
srcpkgs/enigma/patches/musl-redirect.patch | 22 +++++-----------
.../enigma/patches/remove-SDL_ttf-check.patch | 25 ------------------
srcpkgs/enigma/template | 26 ++++++++-----------
4 files changed, 17 insertions(+), 67 deletions(-)
delete mode 100644 srcpkgs/enigma/patches/fix-ifstream_test.patch
delete mode 100644 srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
diff --git a/srcpkgs/enigma/patches/fix-ifstream_test.patch b/srcpkgs/enigma/patches/fix-ifstream_test.patch
deleted file mode 100644
index 3a7723f990e3..000000000000
--- a/srcpkgs/enigma/patches/fix-ifstream_test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lev/Proxy.cc 2014-12-19 22:24:37.000000000 +0100
-+++ b/src/lev/Proxy.cc 2017-09-01 16:55:50.009413332 +0200
-@@ -933,7 +933,7 @@
- } else if (haveLocalCopy) {
- // plain file
- basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in);
-- if (ifs != NULL)
-+ if (ifs)
- Readfile(ifs, extCode);
- else
- haveLocalCopy = false;
diff --git a/srcpkgs/enigma/patches/musl-redirect.patch b/srcpkgs/enigma/patches/musl-redirect.patch
index ec145fcf99f3..9e288073f098 100644
--- a/srcpkgs/enigma/patches/musl-redirect.patch
+++ b/srcpkgs/enigma/patches/musl-redirect.patch
@@ -1,31 +1,21 @@
We can't assign to *stdout and *stderr with musl libc
because both file pointers are const.
---- a/src/main.cc 2014-12-19 22:24:38.000000000 +0100
-+++ b/src/main.cc 2015-11-19 13:53:23.419299858 +0100
-@@ -301,21 +301,25 @@
- if (ap.redirect) {
- FILE *newfp;
+--- a/src/main.cc 2022-06-30 12:30:19.904327808 +0200
++++ b/src/main.cc 2022-06-30 12:30:57.351968860 +0200
+@@ -315,2 +315,3 @@ void Application::init(int argc, char **
newfp = std::freopen((userStdPath + "/Output.log").c_str(), "w", stdout);
+#if defined(__GLIBC__)
if ( newfp == NULL ) { // This happens on NT
- newfp = fopen((userStdPath + "/Output.log").c_str(), "w");
- if (newfp) { // in case stdout is a macro
- *stdout = *newfp;
- }
+@@ -321,2 +322,3 @@ void Application::init(int argc, char **
}
+#endif
setvbuf(stdout, NULL, _IOLBF, BUFSIZ); // Line buffered
-
+@@ -324,2 +326,3 @@ void Application::init(int argc, char **
newfp = std::freopen((userStdPath + "/Error.log").c_str(), "w", stderr);
+#if defined(__GLIBC__)
if ( newfp == NULL ) { // This happens on NT
- newfp = fopen((userStdPath + "/Error.log").c_str(), "w");
- if (newfp) { // in case stderr is a macro
- *stderr = *newfp;
- }
+@@ -330,2 +333,3 @@ void Application::init(int argc, char **
}
+#endif
setbuf(stderr, NULL); // No buffering
- }
-
diff --git a/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch b/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
deleted file mode 100644
index 3d1454d61fe2..000000000000
--- a/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Do not check for SDL_ttf version because it fails when
-cross compiling.
-
---- a/configure.ac 2014-12-19 22:26:06.000000000 +0100
-+++ b/configure.ac 2015-11-19 12:08:46.996789539 +0100
-@@ -176,19 +176,6 @@
- dnl ----------------------------------------
- dnl Check for SDL_ttf library
- dnl ---------------------------------------
--if test "$MINGW32" = no; then
-- AC_MSG_CHECKING([for SDL_ttf >=2.0.6])
-- AC_RUN_IFELSE([AC_LANG_SOURCE(
-- [[#include <SDL_ttf.h>
-- int main(int argc, char *argv[]) {
-- if (TTF_MAJOR_VERSION < 2)
-- return 1;
-- else if (TTF_MAJOR_VERSION == 2 && TTF_MINOR_VERSION == 0 && TTF_PATCHLEVEL < 6)
-- return 1;
-- return 0;}]])],
-- [AC_MSG_RESULT([found])],
-- [AC_MSG_ERROR([SDL_ttf >= 2.0.6 not found.])])
--fi
- AC_CHECK_LIB(SDL_ttf, main,,[AC_MSG_ERROR([SDL_ttf is required to compile Enigma])])
-
- SDL_LIBS="$SDL_LIBS -lSDL_ttf"
diff --git a/srcpkgs/enigma/template b/srcpkgs/enigma/template
index d04fa5112492..7c173c56a363 100644
--- a/srcpkgs/enigma/template
+++ b/srcpkgs/enigma/template
@@ -1,20 +1,21 @@
# Template file for 'enigma'
pkgname=enigma
-version=1.21
-revision=4
+version=1.30
+revision=1
+wrksrc="Enigma-${version}"
build_style=gnu-configure
-hostmakedepends="ImageMagick automake libtool gettext-devel SDL-devel pkg-config"
-makedepends="libcurl-devel libxerces-c-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
+configure_args="--with-system-enet"
+hostmakedepends="ImageMagick automake pkg-config texi2html SDL2-devel"
+makedepends="libcurl-devel libxerces-c-devel SDL2_mixer-devel
+ SDL2_image-devel SDL2_ttf-devel libenet-devel"
short_desc="Puzzle game inspired by Oxyd on the Atari ST"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="ologantr <mrphyber@protonmail.com>"
license="GPL-2.0-or-later"
-homepage="http://www.nongnu.org/enigma/"
-distfiles="${SOURCEFORGE_SITE}/enigma-game/Release%20${version}/${pkgname}-${version}.tar.gz"
-checksum=d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01
+homepage="https://www.nongnu.org/enigma/"
+distfiles="https://github.com/Enigma-Game/Enigma/archive/refs/tags/${version}.tar.gz"
+checksum=99af962feec553dd7e794827494a6a23428a69f83d6915fcaa25f00531357cac
replaces="enigma-data>=0"
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL"
-
pre_configure() {
local dir
for dir in . lib-src/enet lib-src/zipios++; do
@@ -24,11 +25,6 @@ pre_configure() {
autoreconf -if
}
-post_install() {
- # remove the libenet headers and static library
- rm -r ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/libenet.a
-}
-
enigma-doc_package() {
short_desc+=" - documentation"
pkg_install() {
From 5923aa2c8167c8e9da259c0975587f6468601546 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 30 Jun 2022 13:43:16 -0400
Subject: [PATCH 313/608] root: touch to build on i686
---
srcpkgs/root/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 8f67b5af5d70..38f469033b5c 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,4 +1,4 @@
-# Template file for 'root'
+# Template file for 'root'
pkgname=root
version=6.26.04
revision=1
From 691bc8f93c6b09284564a98bb053f1391fa72a56 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 19:47:24 +0200
Subject: [PATCH 314/608] suil: update to 0.10.12.
---
srcpkgs/suil/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template
index 967a68b7779c..680e1972cd43 100644
--- a/srcpkgs/suil/template
+++ b/srcpkgs/suil/template
@@ -1,6 +1,6 @@
# Template file for 'suil'
pkgname=suil
-version=0.10.10
+version=0.10.12
revision=1
build_style=waf3
hostmakedepends="pkg-config lv2"
@@ -8,9 +8,10 @@ makedepends="gtk+-devel qt5-devel gtk+3-devel"
short_desc="Lightweight C library for loading and wrapping LV2 plugin UIs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://drobilla.net/software/suil/"
+homepage="https://drobilla.net/software/suil.html"
+changelog="https://gitlab.com/lv2/suil/-/raw/master/NEWS"
distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-checksum=750f08e6b7dc941a5e694c484aab02f69af5aa90edcc9fb2ffb4fb45f1574bfb
+checksum=daa763b231b22a1f532530d3e04c1fae48d1e1e03785e23c9ac138f207b87ecd
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"
From 8efb1813572444688b7bb0039412df56e19b218b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 20:04:29 +0200
Subject: [PATCH 315/608] gdb: update to 12.1.
---
srcpkgs/gdb/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 552faa668a2a..ff7c9d9a5911 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
# Template file for 'gdb'
pkgname=gdb
-version=11.1
-revision=2
+version=12.1
+revision=1
build_style=gnu-configure
pycompile_dirs="/usr/share/gdb/python"
configure_args="--disable-werror --disable-nls --with-system-readline
@@ -17,11 +17,11 @@ makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
depends="gdb-common>=${version}_${revision}"
checkdepends="dejagnu"
short_desc="GNU Debugger"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/gdb"
distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+checksum=0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed
make_check=extended # Tests take too long, not all of them pass.
python_version=3
patch_args="-Np1"
From ae98a2e3ac696854262f4849757662c82c4b1c95 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 30 Jun 2022 14:05:31 -0400
Subject: [PATCH 316/608] zfs: fix boot on non-zfs-root systems
---
.../zfs/patches/0002-fix-dracut-root.patch | 56 +++++++++++++++++++
srcpkgs/zfs/template | 2 +-
2 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/zfs/patches/0002-fix-dracut-root.patch
diff --git a/srcpkgs/zfs/patches/0002-fix-dracut-root.patch b/srcpkgs/zfs/patches/0002-fix-dracut-root.patch
new file mode 100644
index 000000000000..384f08355f73
--- /dev/null
+++ b/srcpkgs/zfs/patches/0002-fix-dracut-root.patch
@@ -0,0 +1,56 @@
+From eefe83eaa68f7cb4a49c580dd940d3688e42c849 Mon Sep 17 00:00:00 2001
+From: Toyam Cox <aviator45003@gmail.com>
+Date: Thu, 30 Jun 2022 13:47:58 -0400
+Subject: [PATCH] dracut: fix boot on non-zfs-root systems
+
+Simply prevent overwriting root until it needs to be overwritten.
+
+Dracut could change this value before this module is called, but won't
+change the kernel command line.
+
+Reviewed-by: Andrew J. Hesford <ajh@sideband.org>
+Signed-off-by: Toyam Cox <vaelatern@voidlinux.org>
+Closes #13592
+---
+ contrib/dracut/90zfs/zfs-lib.sh.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/contrib/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in
+index e44673c2d75..3a43e514d6f 100755
+--- a/contrib/dracut/90zfs/zfs-lib.sh.in
++++ b/contrib/dracut/90zfs/zfs-lib.sh.in
+@@ -88,11 +88,11 @@ decode_root_args() {
+ return
+ fi
+
+- root=$(getarg root=)
++ xroot=$(getarg root=)
+ rootfstype=$(getarg rootfstype=)
+
+ # shellcheck disable=SC2249
+- case "$root" in
++ case "$xroot" in
+ ""|zfs|zfs:|zfs:AUTO)
+ root=zfs:AUTO
+ rootfstype=zfs
+@@ -100,7 +100,7 @@ decode_root_args() {
+ ;;
+
+ ZFS=*|zfs:*)
+- root="${root#zfs:}"
++ root="${xroot#zfs:}"
+ root="${root#ZFS=}"
+ root=$(echo "$root" | tr '+' ' ')
+ rootfstype=zfs
+@@ -109,9 +109,9 @@ decode_root_args() {
+ esac
+
+ if [ "$rootfstype" = "zfs" ]; then
+- case "$root" in
++ case "$xroot" in
+ "") root=zfs:AUTO ;;
+- *) root=$(echo "$root" | tr '+' ' ') ;;
++ *) root=$(echo "$xroot" | tr '+' ' ') ;;
+ esac
+ return 0
+ fi
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index c1e89d1e5faa..27bd02a64be0 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
# Template file for 'zfs'
pkgname=zfs
version=2.1.5
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
--with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
From c621e3ace3233475c14c193087e779e679c75843 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 20:19:58 +0200
Subject: [PATCH 317/608] monocypher: update to 3.1.3.
---
srcpkgs/monocypher/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/monocypher/template b/srcpkgs/monocypher/template
index 532e4bbb68ac..f5f201c8022a 100644
--- a/srcpkgs/monocypher/template
+++ b/srcpkgs/monocypher/template
@@ -1,15 +1,15 @@
# Template file for 'monocypher'
pkgname=monocypher
-version=3.1.2
+version=3.1.3
revision=1
build_style=gnu-makefile
short_desc="Easy to use crypto library inspired by libsodium and TweetNaCl"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-2-Clause, CC0-1.0"
homepage="https://monocypher.org"
changelog="https://monocypher.org/changelog"
distfiles="https://monocypher.org/download/monocypher-${version}.tar.gz"
-checksum=f80a2e16d553e4b119634fd0e85ff86fc42afb4c9cc4569077854d1b6f5ef4f9
+checksum=b442b577df28f8c36caa01d9ae9011b5dd9c717d94be520168a04e36d7f5016e
post_install() {
vlicense LICENCE.md
From 91b1393a2b9d5af98e76876a761a48b38e8bdd74 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 30 Jun 2022 14:53:04 -0400
Subject: [PATCH 318/608] root: disable debug on i686
---
srcpkgs/root/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 38f469033b5c..e87769061a7a 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
-# Template file for 'root'
+# Template file for 'root'
pkgname=root
version=6.26.04
-revision=1
+revision=2
# Only i686 and x86_64 seem to be officially supported
archs="i686* x86_64*"
build_style=cmake
@@ -36,6 +36,10 @@ python_version=3
shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so
libTMVA.so libMathCore.so"
+case "$XBPS_TARGET_MACHINE" in
+ i686*) configure_args+=" -DCMAKE_C_FLAGS=-g0 -DCMAKE_CXX_FLAGS=-g0" ;;
+esac
+
post_install() {
rm -v ${DESTDIR}/usr/share/root/fonts/LICENSE
rm -v ${DESTDIR}/usr/share/root/fonts/[a-mt-z]*.ttf
From c99bad995e810bacd0e866bd8335af04090a8207 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 20:48:36 +0200
Subject: [PATCH 319/608] msgpack: update to 4.0.0.
---
srcpkgs/msgpack/template | 21 ++++++++++-----------
srcpkgs/msgpack/update | 2 +-
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/msgpack/template b/srcpkgs/msgpack/template
index 1ff9732ddada..1dc41a666684 100644
--- a/srcpkgs/msgpack/template
+++ b/srcpkgs/msgpack/template
@@ -1,18 +1,17 @@
# Template file for 'msgpack'
pkgname=msgpack
-version=3.3.0
+version=4.0.0
revision=1
-wrksrc="msgpack-c-cpp-${version}"
+wrksrc="msgpack-c-${version}"
build_style=cmake
-makedepends="zlib-devel"
-checkdepends="gtest-devel"
-short_desc="Binary-based efficient object serialization library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://msgpack.org/"
-changelog="https://raw.githubusercontent.com/msgpack/msgpack-c/master/CHANGELOG.md"
-distfiles="https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"
-checksum=754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b
+checkdepends="gtest-devel zlib-devel"
+short_desc="Binary-based efficient object serialization library for C"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="BSL-1.0"
+homepage="https://github.com/msgpack/msgpack-c/tree/c_master"
+changelog="https://github.com/msgpack/msgpack-c/raw/c_master/CHANGELOG.md"
+distfiles="https://github.com/msgpack/msgpack-c/releases/download/c-${version}/msgpack-c-${version}.tar.gz"
+checksum=420fe35e7572f2a168d17e660ef981a589c9cbe77faa25eb34a520e1fcc032c8
msgpack-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/msgpack/update b/srcpkgs/msgpack/update
index d72c80250ca4..fec02f66c18f 100644
--- a/srcpkgs/msgpack/update
+++ b/srcpkgs/msgpack/update
@@ -1 +1 @@
-pkgname=cpp
+pkgname=c
From eff9df868ecabfbf42bf88c582ee4e664c0abdca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 21:02:51 +0200
Subject: [PATCH 320/608] New package: msgpack-cxx-4.1.1
---
srcpkgs/msgpack-cxx/template | 19 +++++++++++++++++++
srcpkgs/msgpack-cxx/update | 1 +
2 files changed, 20 insertions(+)
create mode 100644 srcpkgs/msgpack-cxx/template
create mode 100644 srcpkgs/msgpack-cxx/update
diff --git a/srcpkgs/msgpack-cxx/template b/srcpkgs/msgpack-cxx/template
new file mode 100644
index 000000000000..f79d1fcec972
--- /dev/null
+++ b/srcpkgs/msgpack-cxx/template
@@ -0,0 +1,19 @@
+# Template file for 'msgpack-cxx'
+pkgname=msgpack-cxx
+version=4.1.1
+revision=1
+build_style=cmake
+makedepends="boost-devel"
+checkdepends="gtest-devel zlib-devel"
+depends="boost-devel"
+short_desc="Binary-based efficient object serialization library for C++"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="BSL-1.0"
+homepage="https://github.com/msgpack/msgpack-c/tree/cpp_master"
+changelog="https://github.com/msgpack/msgpack-c/raw/cpp_master/CHANGELOG.md"
+distfiles="https://github.com/msgpack/msgpack-c/releases/download/cpp-${version}/msgpack-cxx-${version}.tar.gz"
+checksum=8115c5edcf20bc1408c798a6bdaec16c1e52b1c34859d4982a0fb03300438f0b
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DMSGPACK_BUILD_TESTS=ON"
+fi
diff --git a/srcpkgs/msgpack-cxx/update b/srcpkgs/msgpack-cxx/update
new file mode 100644
index 000000000000..d72c80250ca4
--- /dev/null
+++ b/srcpkgs/msgpack-cxx/update
@@ -0,0 +1 @@
+pkgname=cpp
From e5d9cf012664c6de907d0ed3849fb990b3ca83e3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 21:03:35 +0200
Subject: [PATCH 321/608] pymol: rebuild with msgpack-cxx-4.1.1_1
---
srcpkgs/pymol/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pymol/template b/srcpkgs/pymol/template
index 659dea5d368c..03d1147542ee 100644
--- a/srcpkgs/pymol/template
+++ b/srcpkgs/pymol/template
@@ -1,12 +1,12 @@
# Template file for 'pymol'
pkgname=pymol
version=2.5.0
-revision=1
+revision=2
wrksrc=${pkgname}-open-source-${version}
build_style="python3-module"
build_helper="numpy"
makedepends="freetype-devel glew-devel glm libfreeglut-devel libgomp-devel
- libxml2-devel mmtf-cpp msgpack-devel netcdf-devel python3-PyQt5 python3-devel"
+ libxml2-devel mmtf-cpp msgpack-cxx netcdf-devel python3-PyQt5 python3-devel"
depends="python3-numpy tcsh python3-pmw python3-tkinter python3-PyQt5"
short_desc="PyMOL molecular visualization system"
maintainer="Brenton Horne <brentonhorne77@gmail.com>"
From 6430401261d5bc57efa318b5b08d645205e2b4fe Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 21:04:10 +0200
Subject: [PATCH 322/608] opendht: rebuild with msgpack-cxx-4.1.1_1
---
srcpkgs/opendht/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index ebdbdde002cf..6b9f70d6b281 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,12 +1,12 @@
# Template file for 'opendht'
pkgname=opendht
version=2.4.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
hostmakedepends="pkg-config"
-makedepends="gnutls-devel msgpack-devel readline-devel libargon2-devel asio"
+makedepends="gnutls-devel msgpack-cxx readline-devel libargon2-devel asio"
short_desc="Distributed Hash Table implementation"
maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-3.0-or-later"
From 9a7bc03387f179969facea73d57a352efc275981 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 30 Jun 2022 21:04:30 +0200
Subject: [PATCH 323/608] mmtf-cpp: rebuild with msgpack-cxx-4.1.1_1
---
srcpkgs/mmtf-cpp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mmtf-cpp/template b/srcpkgs/mmtf-cpp/template
index 98e8a3a115b4..dba8f19236ba 100644
--- a/srcpkgs/mmtf-cpp/template
+++ b/srcpkgs/mmtf-cpp/template
@@ -1,10 +1,10 @@
# Template file for 'mmtf-cpp'
pkgname=mmtf-cpp
version=1.0.0
-revision=1
+revision=2
build_style=cmake
-makedepends="msgpack-devel"
-depends="msgpack-devel"
+makedepends="msgpack-cxx"
+depends="msgpack-cxx"
short_desc="C++ implementation of the MMTF API, decoder and encoder"
maintainer="John <me@johnnynator.dev>"
license="MIT"
From 108509dbe03bca6df5c81494ead5b9d139cc9b74 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 30 Jun 2022 16:41:53 -0500
Subject: [PATCH 324/608] mongo-c-driver: update to 1.22.0.
---
srcpkgs/mongo-c-driver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 39dc8a08ba71..71a11d533302 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
# Template file for 'mongo-c-driver'
pkgname=mongo-c-driver
-version=1.21.2
+version=1.22.0
revision=1
build_style=cmake
configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://mongoc.org"
distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=f9ba821fc646be893e9b9d4adfe7bded80f348b3c95b1361718caa7d965fe6f9
+checksum=272067f75e7e57c98f90a6f0c42500ef818b4b085539343676b6ce6831655eaf
mongo-c-driver-devel_package() {
short_desc+=" - development files"
From 988028ceca926b7ab34fa2de872fb4fa13043d5e Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 30 Jun 2022 16:53:09 +0200
Subject: [PATCH 325/608] tuxpaint: update to 0.9.28.
Also: move to SDL2.
---
srcpkgs/tuxpaint/template | 13 +++++++------
srcpkgs/tuxpaint/update | 1 +
2 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/tuxpaint/update
diff --git a/srcpkgs/tuxpaint/template b/srcpkgs/tuxpaint/template
index 05f3ebb77a66..b9d403940329 100644
--- a/srcpkgs/tuxpaint/template
+++ b/srcpkgs/tuxpaint/template
@@ -1,19 +1,20 @@
# Template file for 'tuxpaint'
pkgname=tuxpaint
-version=0.9.27
+version=0.9.28
revision=1
+wrksrc="${pkgname}-${version}-sdl2"
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
conf_files="/etc/tuxpaint/tuxpaint.conf"
hostmakedepends="gettext gperf pkg-config ImageMagick"
-makedepends="SDL-devel SDL_image-devel SDL_mixer-devel SDL_ttf-devel cairo-devel
- SDL_gfx-devel fribidi-devel libimagequant-devel libpaper-devel librsvg-devel"
+makedepends="SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel cairo-devel
+ SDL2_gfx-devel fribidi-devel libimagequant-devel libpaper-devel librsvg-devel"
short_desc="Free, award-winning drawing program for children ages 3 to 12"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
-homepage="http://www.tuxpaint.org/"
-distfiles="${SOURCEFORGE_SITE}/tuxpaint/${version}/tuxpaint-${version}.tar.gz"
-checksum=ab2b80e89df88228cd0ec0a6c90b49d543cb157aa38fb90cbd3a29f00140557a
+homepage="https://www.tuxpaint.org/"
+distfiles="${SOURCEFORGE_SITE}/tuxpaint/${version}/tuxpaint-${version}-sdl2.tar.gz"
+checksum=4f1ed9330feab324070b93630d79ced50ccc4816ab76750119f012b5d904709d
replaces="tuxpaint-data>=0"
python_version=2
diff --git a/srcpkgs/tuxpaint/update b/srcpkgs/tuxpaint/update
new file mode 100644
index 000000000000..ddfe99b7ae36
--- /dev/null
+++ b/srcpkgs/tuxpaint/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Qtuxpaint\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^-/_\s]*?)(?=(?:[-_.](?:src|source|orig|\w+))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
From 38d7931a66c0a5499391a3404b428430e362ab5f Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 30 Jun 2022 18:00:43 +0200
Subject: [PATCH 326/608] tuxpaint-stamps: update to 2022.06.04.
---
srcpkgs/tuxpaint-stamps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tuxpaint-stamps/template b/srcpkgs/tuxpaint-stamps/template
index 4eee816390de..9dd515f70972 100644
--- a/srcpkgs/tuxpaint-stamps/template
+++ b/srcpkgs/tuxpaint-stamps/template
@@ -1,15 +1,15 @@
# Template file for 'tuxpaint-stamps'
pkgname=tuxpaint-stamps
-version=2021.11.25
+version=2022.06.04
revision=1
build_style=gnu-makefile
make_install_target="install-all"
short_desc="Stamps set for tuxpaint"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
-homepage="http://www.tuxpaint.org/"
+homepage="https://www.tuxpaint.org/"
distfiles="${SOURCEFORGE_SITE}/tuxpaint/tuxpaint-stamps/${version//./-}/tuxpaint-stamps-${version}.tar.gz"
-checksum=cb55ee21b2d25b440ee216acfab0bb8d906af1c99adbc77e8db11eec30589d52
+checksum=842065576fae554358e00e51d71a492616a6490b12b592228067477c287a0bf8
pre_configure() {
vsed -i Makefile -e 's,DATA_PREFIX=,&$(DESTDIR),'
From 10b03ba6e42a44a8d66621a5e850c1f783311ad7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:04:42 +0200
Subject: [PATCH 327/608] libaom: update to 3.4.0.
---
common/shlibs | 2 +-
srcpkgs/libaom/template | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9aeeb079cf0e..439cf15127b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3458,7 +3458,7 @@ libticalcs2.so.12 libticalcs2-1.1.9_1
libhtmlcxx.so.3 htmlcxx-0.86_1
libcss_parser_pp.so.0 htmlcxx-0.86_1
libcss_parser.so.0 htmlcxx-0.86_1
-libaom.so.2 libaom-2.0.0_1
+libaom.so.3 libaom-3.4.0_1
libre.so.1 re-2.0.1_1
libtpms.so.0 libtpms-0.9.0_1
libswtpm_libtpms.so.0 libswtpm-0.6.1_1
diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template
index 657301c7309a..072a044043d3 100644
--- a/srcpkgs/libaom/template
+++ b/srcpkgs/libaom/template
@@ -1,6 +1,6 @@
# Template file for 'libaom'
pkgname=libaom
-version=2.0.1
+version=3.4.0
revision=1
create_wrksrc=yes
build_style=cmake
@@ -12,7 +12,10 @@ license="BSD-2-Clause"
homepage="https://aomedia.org/"
changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG"
distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"
-checksum=@b89acd3304531a9f6c99eba13e1de66605893ff8d08abc8c6e0586481a90033a
+# unstable checksum use content hash
+checksum=@12f82fb240e9fac8d66aa1f4850b07cb9ba025b7f899d2f94229e35122076e1d
+
+make_check=ci-skip # takes a lot of time
# aom segfaults with default musl stack size
LDFLAGS="-Wl,-z,stack-size=2097152"
@@ -35,11 +38,10 @@ pre_check() {
do_check() {
cd build
- make testdata ${makejobs}
- ../test/examples.sh --bin-path examples
-
+ ninja ${makejobs} testdata
+ ../test/examples.sh --bin-path "$PWD"
if [ "$XBPS_CHECK_PKGS" = full ]; then
- make runtests ${makejobs}
+ ninja ${makejobs} runtests
fi
}
From c0f1395d0e272c1bf16a86b548517564e33f50f1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:05:04 +0200
Subject: [PATCH 328/608] ffmpeg: rebuild for libaom-3.4.0_1
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index f42c6a1c0aa6..63d02eb3af18 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.4.2
-revision=1
+revision=2
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From c8a895cdee7f1ac55bd7105b79987f3b70b130e9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:05:04 +0200
Subject: [PATCH 329/608] gst-plugins-bad1: rebuild for libaom-3.4.0_1
---
srcpkgs/gst-plugins-bad1/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 35bd90f32021..4684ac8c4dc6 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.20.3
-revision=1
+revision=2
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
@@ -50,8 +50,12 @@ case "$XBPS_TARGET_MACHINE" in
*) build_options_default+=" gme" ;;
esac
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -Dtests=enabled"
+fi
+
do_check() {
- ninja check || msg_warn "Tests failed, but not unexpected"
+ ninja check || msg_warn "Tests failed, but not unexpected\n"
}
gst-plugins-bad1-devel_package() {
From 755112b6999e401cffdd33c61d203d95f13d3b45 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:05:05 +0200
Subject: [PATCH 330/608] libheif: rebuild for libaom-3.4.0_1
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..48b4279b9f3a 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From cd63b67571be344812760c46fe3faea78821b616 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 1 Jul 2022 00:09:43 +0200
Subject: [PATCH 331/608] speexdsp: update to 1.2.1.
---
srcpkgs/speexdsp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/speexdsp/template b/srcpkgs/speexdsp/template
index 572957a7029f..5a410216f4e6 100644
--- a/srcpkgs/speexdsp/template
+++ b/srcpkgs/speexdsp/template
@@ -1,15 +1,15 @@
# Template file for 'speexdsp'
pkgname=speexdsp
-version=1.2.0
+version=1.2.1
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
-short_desc="A free codec for free speech - DSP"
+short_desc="Free codec for free speech - DSP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://www.speex.org"
distfiles="http://downloads.xiph.org/releases/speex/speexdsp-${version}.tar.gz"
-checksum=682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771
+checksum=8c777343e4a6399569c72abc38a95b24db56882c83dbdb6c6424a5f4aeb54d3d
case "$XBPS_TARGET_MACHINE" in
aarch64*) configure_args+=" --disable-neon";;
From 2d434f75dac6e0b202f0741001f26c38a7152597 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 03:00:25 +0200
Subject: [PATCH 332/608] diffutils: fix gnulib brokenness on 32-bit ppc musl
---
srcpkgs/diffutils/patches/ppc-musl.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/diffutils/patches/ppc-musl.patch
diff --git a/srcpkgs/diffutils/patches/ppc-musl.patch b/srcpkgs/diffutils/patches/ppc-musl.patch
new file mode 100644
index 000000000000..6ba37f233591
--- /dev/null
+++ b/srcpkgs/diffutils/patches/ppc-musl.patch
@@ -0,0 +1,14 @@
+--- a/lib/sigsegv.c
++++ b/lib/sigsegv.c
+@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+ /* both should be equivalent */
+ # if 0
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+-# else
++# elif defined(__GLIBC__)
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
++# else
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
+ # endif
+ # endif
+
From 9acdd00f1d3919a95e3912253eac501198df12f2 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 30 Jun 2022 21:34:44 -0700
Subject: [PATCH 333/608] conmon: update to 2.1.2
Fixes CVE-2022-1708
Include manpage
---
srcpkgs/conmon/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index 48c937d008c8..b0182acf49eb 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,19 +1,24 @@
# Template file for 'conmon'
pkgname=conmon
-version=2.1.1
+version=2.1.2
revision=1
build_style=gnu-makefile
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config go-md2man"
makedepends="libglib-devel libseccomp-devel"
short_desc="OCI container runtime monitor"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="Apache-2.0"
homepage="https://github.com/containers/conmon"
distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
-checksum=676bcd5eb7d51cd5510ac9b7513726d9d0e42698fb01e763c25aad8f0c7edde4
+checksum=8ba76eb54c319197235fd39c3a5b5a975b5a21e02cd4be985b8619220a497a0e
+
+post_build() {
+ make -C docs GOMD2MAN=go-md2man
+}
do_install() {
vbin bin/conmon
vmkdir usr/libexec/podman
ln -sf ../../bin/conmon "${DESTDIR}/usr/libexec/podman"
+ make -C docs install DESTDIR="$DESTDIR" PREFIX=/usr
}
From 13dfff320a5116f4a6ec25f8ac3bd544496ac593 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 30 Jun 2022 22:01:46 -0500
Subject: [PATCH 334/608] Signal-Desktop: update to 5.48.0.
---
srcpkgs/Signal-Desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index fd5f31224bee..6b2d16124f78 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=5.47.0
+version=5.48.0
revision=1
# Signal officially only supports x86_64 (also due to Electron)
# discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="akierig <anelki@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=d563b9be5ea5690ec2579c688db5bedbba3787b9b46428fa4164fc172e0c9322
+checksum=17c1221c3dbf56981d894446ac3f714b0ddfbee42e6fee2fe7787be78274900a
nostrip_files="signal-desktop"
post_extract() {
From 1b22ae27d9cf8fa5cf3f2898219f1a5c410d0386 Mon Sep 17 00:00:00 2001
From: JailBird <jailbird@fdf.net>
Date: Thu, 30 Jun 2022 19:12:42 -0500
Subject: [PATCH 335/608] dnsdist: update to 1.7.2
---
srcpkgs/dnsdist/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index d08573223251..ae8f79ceb2f9 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,6 +1,6 @@
# Template file for 'dnsdist'
pkgname=dnsdist
-version=1.7.1
+version=1.7.2
revision=1
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
@@ -19,7 +19,7 @@ license="GPL-2.0-only"
homepage="https://dnsdist.org/"
changelog="https://dnsdist.org/changelog.html"
distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=273a8212be2ddfaf754f752bcda4c2abc671ca5d42f776263312eb4661ea2d66
+checksum=524bd2bb05aa2e05982a971ae8510f2812303ab4486a3861b62212d06b1127cd
system_accounts="_dnsdist"
From 109a9c8f1fa48ba889e6e450398f81aec4beb7a1 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Fri, 1 Jul 2022 03:15:25 +0300
Subject: [PATCH 336/608] flameshot: update to 12.0.0.
---
srcpkgs/flameshot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index dc3f7a8a1edb..8584155fc49a 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
# Template file for 'flameshot'
pkgname=flameshot
-version=11.0.0
+version=12.0.0
revision=1
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
license="GPL-3.0-or-later"
homepage="https://github.com/lupoDharkael/flameshot"
distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=4cd158719031e97c97ecb6db1c14dd8ded44bf531c062bce496fc63be18bc2cf
+checksum=bb2a587ea47ee2eef7cd3f617a15a63d52e502b99a2a78f82e34a271a3027133
From 033ca1023ba9bebefe2114e611e2946c7f24f22a Mon Sep 17 00:00:00 2001
From: hechos <martin.damian.fernandez@gmail.com>
Date: Thu, 30 Jun 2022 22:09:10 -0300
Subject: [PATCH 337/608] pdf.js: update to 2.14.305
---
srcpkgs/pdf.js/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pdf.js/template b/srcpkgs/pdf.js/template
index 4c1614f9a7be..b12826051555 100644
--- a/srcpkgs/pdf.js/template
+++ b/srcpkgs/pdf.js/template
@@ -1,6 +1,6 @@
# Template file for 'pdf.js'
pkgname=pdf.js
-version=2.12.313
+version=2.14.305
revision=1
create_wrksrc=yes
short_desc="Portable Document Format (PDF) viewer built with HTML5"
@@ -8,7 +8,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
license="Apache-2.0"
homepage="https://mozilla.github.io/pdf.js/"
distfiles="https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"
-checksum=f9be28b8c0bcda9d344e17f2922d02d7137488cdfce37e7639ccc582305b4822
+checksum=1929a00d26d7cd631033ab5a06dcd7d6c283b7d3b06c76083fb840bd1e014896
do_install() {
vmkdir usr/share/$pkgname/
From 17058055739589a0e79ab603b5dd9c3120ea9888 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Fri, 1 Jul 2022 04:54:07 +0700
Subject: [PATCH 338/608] upterm: update to 0.9.0
---
srcpkgs/upterm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index fd99190dedb9..9990011d08c8 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,6 +1,6 @@
# Template file for 'upterm'
pkgname=upterm
-version=0.8.2
+version=0.9.0
revision=1
build_style=go
go_import_path="github.com/owenthereal/upterm"
@@ -10,7 +10,7 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
license="Apache-2.0"
homepage="https://github.com/owenthereal/upterm/"
distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz"
-checksum=4b85cf8207ffce051f2c391905fd58514c98c3fd5ff890d7340fcfd3a0ea7b8e
+checksum=1da4adcf80efff58ee8caadf402f86b4eead4bcc2783a76eb58a6b7b8b685f45
post_install() {
vcompletion etc/completion/upterm.zsh_completion zsh
From 1eff1bc478d72b50eb8cc0246ab45525a9d0c745 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 30 Jun 2022 11:44:01 +0200
Subject: [PATCH 339/608] mpg123: update to 1.30.0.
---
srcpkgs/mpg123/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 561ecb5d3a7d..6327b7ab9513 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,11 +1,10 @@
# Template file for 'mpg123'
pkgname=mpg123
-version=1.29.3
+version=1.30.0
revision=1
build_style=gnu-configure
# --with-cpu not necessary, upstream detects features correctly
-configure_args="--with-optimization=0 --with-default-audio=alsa
- --enable-ipv6=yes --enable-network=yes"
+configure_args="--with-optimization=0 --with-default-audio=alsa"
hostmakedepends="pkg-config"
makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel SDL2-devel"
short_desc="Fast console MPEG audio decoder/player"
@@ -13,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://www.mpg123.org/"
distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
-checksum=963885d8cc77262f28b77187c7d189e32195e64244de2530b798ddf32183e847
+checksum=397ead52f0299475f2cefd38c3835977193fd9b1db6593680346c4e9109ed61c
case "$XBPS_TARGET_MACHINE" in
# No LFS required with musl
From 4f820c2e1629bdf620376515e3c43b087cf8c05d Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 29 Jun 2022 13:13:42 -0500
Subject: [PATCH 340/608] mesa: update to 22.1.3.
---
srcpkgs/mesa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 79d1c638443f..1a0de99bd990 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
# Template file for 'mesa'
pkgname=mesa
-version=22.1.2
+version=22.1.3
revision=1
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -22,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=0971226b4a6a3d10cfc255736b33e4017e18c14c9db1e53863ac1f8ae0deb9ea
+checksum=b98f32ba7aa2a1ff5725fb36eb999c693079f0ca16f70aa2f103e2b6c3f093e3
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false"
From 236b964526b6adf07cbb3881eb0f9d51562af20a Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <withercubes@protonmail.com>
Date: Wed, 15 Jun 2022 22:01:58 +0530
Subject: [PATCH 341/608] nsxiv: update to 30
---
srcpkgs/nsxiv/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index a52cc2bb03f2..86500ecb020b 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,7 +1,8 @@
# Template file for 'nsxiv'
pkgname=nsxiv
-version=29
+version=30
revision=1
+wrksrc=${pkgname}
build_style=gnu-makefile
make_install_target=install-all
makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
@@ -9,9 +10,10 @@ makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
maintainer="Sanjay Pavan <withercubes@protonmail.com>"
license="GPL-2.0-or-later"
-homepage="https://github.com/nsxiv/nsxiv"
-distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
-checksum="564a17d921172336f7cd463bf313e39f84e4bcf4fdc789326f4112f848aad039"
+homepage="https://codeberg.org/nsxiv/nsxiv"
+changelog="https://codeberg.org/nsxiv/nsxiv/raw/branch/master/CHANGELOG.md"
+distfiles="https://codeberg.org/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum="a916d1385872ccf0b55fbf6b8546d05fcbbbb8b0a92579494e64c6bd22fc7941"
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
pre_build() {
From fe46f5f3789fa853b4ec9faf5d19e7ff287f05e6 Mon Sep 17 00:00:00 2001
From: Dakota Walsh <kota@nilsu.org>
Date: Sat, 16 Apr 2022 15:52:54 +1200
Subject: [PATCH 342/608] New package: hut-0.1.0
This is the official command line client for https://sourcehut.org/
It's basically the sourcehut equivalent to Github's hub or gh tools.
It's been in development for a while now, but they've put out their
first release earlier this month. I've been using it happily for a while
before this release.
---
srcpkgs/hut/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/hut/template
diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
new file mode 100644
index 000000000000..f1448fcf1f49
--- /dev/null
+++ b/srcpkgs/hut/template
@@ -0,0 +1,29 @@
+# Template file for 'hut'
+pkgname=hut
+version=0.1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=go
+build_helper=qemu
+go_import_path="git.sr.ht/~emersion/hut"
+hostmakedepends="scdoc"
+short_desc="CLI tool for sr.ht"
+maintainer="Dakota Walsh <kota@nilsu.org>"
+license="AGPL-3.0-only"
+homepage="https://git.sr.ht/~emersion/hut"
+changelog="https://git.sr.ht/~emersion/hut/log"
+distfiles="https://git.sr.ht/~emersion/hut/archive/v${version}.tar.gz"
+checksum=5af8f1111f9ec1da9a818978eb1f013dfd50ad4311c79d95b0e62ad428ac1c59
+
+post_install() {
+ hut=$(find $GOPATH/bin -name hut)
+ for sh in bash fish zsh; do
+ vtargetrun $hut completion $sh > hut.$sh
+ vcompletion hut.$sh $sh
+ done
+
+ vlicense LICENSE
+
+ scdoc < doc/hut.1.scd > doc/hut.1
+ vman doc/hut.1
+}
From 9d1a464040d040f7afb0bf6e54b78dedf7935dff Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 1 Jul 2022 02:31:12 -0400
Subject: [PATCH 343/608] hut: touch to rebuild on x86_64
---
srcpkgs/hut/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index f1448fcf1f49..545567773781 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,4 +1,4 @@
-# Template file for 'hut'
+# Template file for 'hut'
pkgname=hut
version=0.1.0
revision=1
From a2e75f7dc7a31b4dea879caccf6b09c371431894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:05:44 +0200
Subject: [PATCH 344/608] New package: python3-straight.plugin-1.5.0
---
srcpkgs/python3-straight.plugin/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-straight.plugin/template
diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template
new file mode 100644
index 000000000000..97d226d31133
--- /dev/null
+++ b/srcpkgs/python3-straight.plugin/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-straight.plugin'
+pkgname=python3-straight.plugin
+version=1.5.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python plugin loading facility"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://straightplugin.readthedocs.io/"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38
+
+post_install() {
+ vlicense LICENSE
+}
From f7f03e6d2ce504ad729e832fce167f82ac1b34b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:18 +0200
Subject: [PATCH 345/608] ansible-core: update to 2.13.1.
---
...mmand-v-instead-of-which-in-Makefile.patch | 32 ++++++++++++++++
...or-missing-git-executable-more-gener.patch | 38 +++++++++++++++++++
srcpkgs/ansible-core/template | 38 ++++++++++++-------
3 files changed, 94 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
create mode 100644 srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
diff --git a/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
new file mode 100644
index 000000000000..a6ec631de778
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0001-use-command-v-instead-of-which-in-Makefile.patch
@@ -0,0 +1,32 @@
+From 40acbda0805b0a43d723a1cc73fba8b40b624940 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 30 Jun 2022 15:33:46 +0200
+Subject: [PATCH 1/2] use 'command -v' instead of 'which' in Makefile
+
+'which' is not standardized and can even be considered problematic [1]
+
+[1] https://lwn.net/Articles/874049/
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7641344968..45421e88e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
+ # This doesn't evaluate until it's called. The -D argument is the
+ # directory of the target file ($@), kinda like `dirname`.
+ MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
+-ifneq ($(shell which rst2man 2>/dev/null),)
++ifneq ($(shell command -v rst2man 2>/dev/null),)
+ ASCII2MAN = rst2man $< $@
+-else ifneq ($(shell which rst2man.py 2>/dev/null),)
++else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
+ ASCII2MAN = rst2man.py $< $@
+ else
+ ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch b/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
new file mode 100644
index 000000000000..6fa9cfbaec5b
--- /dev/null
+++ b/srcpkgs/ansible-core/patches/0002-Make-unit-test-for-missing-git-executable-more-gener.patch
@@ -0,0 +1,38 @@
+From 9d0ab3aa9d0dd1a3d3885b44448acb262396a57d Mon Sep 17 00:00:00 2001
+From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com>
+Date: Thu, 30 Jun 2022 13:19:44 -0400
+Subject: [PATCH 2/2] Make unit test for missing git executable more generic
+ (#78173)
+
+* Make unit test for missing git executable more generic
+
+* use MagicMock side_effect to raise exception instead
+---
+ test/units/galaxy/test_collection_install.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py
+index 7525a194ca..d83fe42054 100644
+--- a/test/units/galaxy/test_collection_install.py
++++ b/test/units/galaxy/test_collection_install.py
+@@ -181,13 +181,14 @@ def test_concrete_artifact_manager_scm_no_executable(monkeypatch):
+ monkeypatch.setattr(collection.concrete_artifact_manager.subprocess, 'check_call', mock_subprocess_check_call)
+ mock_mkdtemp = MagicMock(return_value='')
+ monkeypatch.setattr(collection.concrete_artifact_manager, 'mkdtemp', mock_mkdtemp)
++ mock_get_bin_path = MagicMock(side_effect=[ValueError('Failed to find required executable')])
++ monkeypatch.setattr(collection.concrete_artifact_manager, 'get_bin_path', mock_get_bin_path)
+
+ error = re.escape(
+ "Could not find git executable to extract the collection from the Git repository `https://github.com/org/repo`"
+ )
+- with mock.patch.dict(os.environ, {"PATH": ""}):
+- with pytest.raises(AnsibleError, match=error):
+- collection.concrete_artifact_manager._extract_collection_from_git(url, version, b'path')
++ with pytest.raises(AnsibleError, match=error):
++ collection.concrete_artifact_manager._extract_collection_from_git(url, version, b'path')
+
+
+ @pytest.mark.parametrize(
+--
+2.36.1
+
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index ef59b9b653a5..23124e9fb613 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,30 +1,40 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.12.6
+version=2.13.1
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml python3-packaging python3-resolvelib"
+hostmakedepends="python3-setuptools python3-wheel python3-packaging
+ python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
+depends="python3-cryptography python3-Jinja2 python3-paramiko python3-yaml
+ python3-packaging python3-resolvelib python3-pytz git"
+checkdepends="${depends} python3-pytest python3-pytest-xdist
+ python3-pytest-forked unzip openssh python3-pytest-mock libselinux"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=5f366e851159d8f72ce68d32b8c0edda56ee537c01e9f68eca382bd1510af65d
+checksum=abd478ceff1a0aba95e94ceab8dc820f407bcc0f0033dc546840cddc29a36958
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
-post_install() {
+do_build() {
+ python setup.py build
+}
+
+do_check() {
+ TEST_FLAGS="${make_check_args}" make tests-py3
+}
+
+do_install() {
+ python setup.py install --root="${DESTDIR}"
+
+ make docs
+ for page in docs/man/man1/*.1; do
+ vman ${page}
+ done
+
vsconf examples/ansible.cfg
vsconf examples/hosts
- for m in docs/man/man1/*.1; do
- vman ${m}
- done
}
ansible-base_package() {
From 8a5d68c5833c83f8fd767262816702dd62d3960a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 13:06:20 +0200
Subject: [PATCH 346/608] ansible: update to 6.0.0.
---
srcpkgs/ansible/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 4d694f2107c9..2bce297348fd 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,17 +1,15 @@
# Template file for 'ansible'
pkgname=ansible
-version=5.9.0
+version=6.0.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style="python3-pep517"
+hostmakedepends="python3-setuptools python3-wheel"
depends="ansible-core"
short_desc="Simple deployment, configuration management and execution framework"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=6f2f762fca6cff0401a6d2119b8ba3b2f111ea1a93fd203c86df09bc75570f18
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
+checksum=641a2c27bc5768f9a8ad14880f1f6e571c1f2af1d45e76f271d76e3f74754c53
+# Relevant tests happen in ansible-core
make_check=no
From 618798f7969a49b20cc52c2d79e79321f74b0419 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 1 Jul 2022 03:25:05 -0400
Subject: [PATCH 347/608] act: update to 0.2.29.
---
srcpkgs/act/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index b2a7f5663ab0..939b9a8a0a10 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,6 +1,6 @@
# Template file for 'act'
pkgname=act
-version=0.2.28
+version=0.2.29
revision=1
build_style=go
go_import_path="github.com/nektos/act"
@@ -10,7 +10,7 @@ maintainer="0x5c <dev@0x5c.io>"
license="MIT"
homepage="https://github.com/nektos/act"
distfiles="https://github.com/nektos/act/archive/refs/tags/v${version}.tar.gz"
-checksum=010b9f02d2c431d9e09f5be1cf3099bd3fbab49043c53e34aa92b99bba8da3d1
+checksum=92c7f774395e98cff2e53c9739d8266027837cd27f437514ea342a59179c3115
post_install() {
vlicense LICENSE
From d2ff6d28c623e96c47d0d1fb0839eef0f9c55554 Mon Sep 17 00:00:00 2001
From: octeep <octeep@pm.me>
Date: Sat, 28 May 2022 02:10:16 +0100
Subject: [PATCH 348/608] libupnp: update to 1.14.12
---
srcpkgs/libupnp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index b13c99374a98..9e2da2d594c3 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -1,6 +1,6 @@
# Template file for 'libupnp'
pkgname=libupnp
-version=1.14.4
+version=1.14.12
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
@@ -8,8 +8,9 @@ short_desc="Portable Open Source UPnP Development Kit"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://pupnp.github.io/pupnp/"
+changelog="https://pupnp.github.io/pupnp/ChangeLog"
distfiles="https://github.com/pupnp/pupnp/releases/download/release-$version/$pkgname-$version.tar.bz2"
-checksum=cd649ef53070e9b88680f730ed5b3f919658582d43dd315a2ed8b6105c6fbe63
+checksum=091c80aada1e939c2294245c122be2f5e337cc932af7f7d40504751680b5b5ac
CFLAGS="-D_FILE_OFFSET_BITS=64"
From 39d4f1a1d7ac2015168176d44e2b01c424bb6d1e Mon Sep 17 00:00:00 2001
From: octeep <octeep@pm.me>
Date: Sat, 28 May 2022 02:10:35 +0100
Subject: [PATCH 349/608] gerbera: update to 1.11.0
---
srcpkgs/gerbera/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 4e0e2a94a9fb..7b4f1a5f1f3d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.6.4
-revision=5
+version=1.11.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
@@ -12,8 +12,9 @@ short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
+changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=cbe7ea78977db8c02fcca1759ed149f199a590afaf4a6d21ffcca8623d1a0cc5
+checksum=0c13049792a28ec0e3086ba61c7f9675626a1dbadb043650a452192727418be7
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 999ebe6b3fbfe8bb1b519055108d9897c09f4e5f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Fri, 1 Jul 2022 12:15:54 +0200
Subject: [PATCH 350/608] libplacebo: update to 4.192.1.
---
common/shlibs | 2 +-
srcpkgs/libplacebo/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 439cf15127b4..092894ad8d1e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3447,7 +3447,7 @@ libSoapySDR.so.0.7 SoapySDR-0.7.0_1
libeditorconfig.so.0 editorconfig-0.12.2_1
libcfitsio.so.9 cfitsio-3.480_1
libapparmor.so.1 libapparmor-2.12.0_1
-libplacebo.so.157 libplacebo-4.157.0_1
+libplacebo.so.192 libplacebo-4.192.1_1
libw2xc.so waifu2x-converter-cpp-5.2_1
libnova-0.15.so.0 libnova-0.15.0_1
libcue.so.2 libcue-2.2.0_1
diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template
index c8a7b7d79548..6375ff2aa185 100644
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@@ -1,6 +1,6 @@
# Template file for 'libplacebo'
pkgname=libplacebo
-version=4.157.0
+version=4.192.1
revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
@@ -10,11 +10,11 @@ hostmakedepends="pkg-config python3-Mako Vulkan-Headers"
makedepends="shaderc Vulkan-Headers vulkan-loader $(vopt_if lcms lcms2-devel)
$(vopt_if opengl libepoxy-devel)"
short_desc="Reusable library for GPU-accelerated video/image rendering"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://code.videolan.org/videolan/libplacebo"
distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz"
-checksum=8ee7773fb7813520b6b1e5f8f207cdf0071a7cf48ca0ce871e956ae6f4d0d538
+checksum=e6c5805cf4d955b5941dd12b00fe157b61e77995bc1786b9a86df0ca99a0edc4
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 354ef15781f02adc85a96c51cf2efe5efa66460f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Fri, 1 Jul 2022 12:22:39 +0200
Subject: [PATCH 351/608] mpv: revbump for libplacebo-4.192.1.
---
srcpkgs/mpv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f7093a16fa85..5d016e225da5 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
version=0.34.1
-revision=1
+revision=2
build_style=waf3
configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
--enable-cdda --enable-dvbin --enable-dvdnav --enable-libarchive
From e9b7dab8707003fac0656f6a6e93210471813323 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Fri, 1 Jul 2022 12:23:53 +0200
Subject: [PATCH 352/608] vlc: revbump for libplacebo-4.192.1.
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 69d14f330ed5..42f9f58c3cb9 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.17.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From a12ae5754fd8b07c2f6a22749451e95d4de98402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 14:56:28 +0200
Subject: [PATCH 353/608] tarpaulin: orphan package
---
srcpkgs/tarpaulin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index d983c3fadbd1..906c16a73721 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -8,7 +8,7 @@ make_check_args="-- --test-threads 1"
hostmakedepends="pkg-config cmake"
makedepends="openssl-devel zlib-devel"
short_desc="Code coverage tool for Rust/Cargo projects"
-maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://github.com/xd009642/tarpaulin"
distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
From c3a1ab78449f4edadab03f6932480db7591bef01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 1 Jul 2022 09:44:10 -0400
Subject: [PATCH 354/608] zfsbootmenu: drop perl-Config-IniFiles dependency
---
srcpkgs/zfsbootmenu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 3e27d86b9c0d..b5db95441392 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,11 +1,11 @@
# Template file for 'zfsbootmenu'
pkgname=zfsbootmenu
version=2.0.0
-revision=1
+revision=2
build_style=gnu-makefile
depends="dracut zfs kexec-tools fzf bash pigz mbuffer ncurses
- perl-Config-IniFiles perl-Sort-Versions perl-boolean perl-YAML-PP"
-short_desc="ZFS Boot Environment menu, implemented in Dracut"
+ perl-Sort-Versions perl-boolean perl-YAML-PP"
+short_desc="ZFS bootloader for root-on-ZFS systems"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
homepage="https://github.com/zbm-dev/zfsbootmenu"
From 5c82d109fd7355b2c0f9ccefdc04b66f21fe1480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jul 2022 20:51:59 +0700
Subject: [PATCH 355/608] git: update to 2.37.0.
---
srcpkgs/git/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 702dca4ef81f..2f22f5ae5bf7 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
# Template file for 'git'
pkgname=git
-version=2.36.1
+version=2.37.0
revision=1
hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
homepage="https://git-scm.com/"
changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370
+checksum=9f7fa1711bd00c4ec3dde2fe44407dc13f12e4772b5e3c72a58db4c07495411f
replaces="git-perl>=0"
register_shell=/usr/bin/git-shell
python_version=3
From c0f0226c4d78d3be2497ff6a57dd582678e32252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 15 Nov 2021 21:46:23 +0700
Subject: [PATCH 356/608] gmic: fix license, clean do_build
---
srcpkgs/gmic/patches/01-includedir.patch | 44 +++++++++++++++++++
srcpkgs/gmic/patches/02-opt-flags.patch | 28 ++++++++++++
.../patches/03-plugindir-and-no-wget.patch | 15 +++++++
.../gmic/patches/04-no-krita-and-order.patch | 39 ++++++++++++++++
srcpkgs/gmic/template | 31 +++----------
5 files changed, 131 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/gmic/patches/01-includedir.patch
create mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch
create mode 100644 srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch
create mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch
diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch
new file mode 100644
index 000000000000..2cf9031443e5
--- /dev/null
+++ b/srcpkgs/gmic/patches/01-includedir.patch
@@ -0,0 +1,44 @@
+Index: gmic-2.9.9/src/Makefile
+===================================================================
+--- gmic-2.9.9.orig/src/Makefile
++++ gmic-2.9.9/src/Makefile
+@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d)
+ NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\""
+
+ # Minimal set of flags mandatory to compile G'MIC.
+-MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
++MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS)
+ MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS)
+
+ ifndef NO_SRIPDLIB
+ MANDATORY_CFLAGS += -std=c++11 -pedantic
+ endif
+-MANDATORY_LIBS += -L$(USR)/$(LIB)
++MANDATORY_LIBS +=
+ ifdef IS_GCC
+ MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
+ MANDATORY_LIBS += -lm
+@@ -250,7 +250,7 @@ endif
+ # Enable faster X11 display, using XShm extension.
+ # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
+ XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
+-XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
++XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext
+
+ # Enable image display, using GDI32 (Windows).
+ GDI32_CFLAGS = -Dcimg_display=2
+@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv
+
+ # Enable support of most classical image file formats, using the GraphicsMagick++ library.
+ # (http://www.graphicsmagick.org/Magick++/)
+-MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
++MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick)
+ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
+
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR
++OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR
+ OPENEXR_LIBS = -lIlmImf -lHalf
+
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch
new file mode 100644
index 000000000000..0d3a5894e589
--- /dev/null
+++ b/srcpkgs/gmic/patches/02-opt-flags.patch
@@ -0,0 +1,28 @@
+Index: gmic-2.9.9/src/Makefile
+===================================================================
+--- gmic-2.9.9.orig/src/Makefile
++++ gmic-2.9.9/src/Makefile
+@@ -192,9 +192,9 @@ endif
+
+ # Enable optimizations for 'cli'.
+ FLTO = -flto
+-OPT_CLI_CFLAGS = -Ofast
++OPT_CLI_CFLAGS =
+ ifdef IS_GCC
+-OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO)
++OPT_CLI_CFLAGS = $(FLTO)
+ OPT_CLI_LIBS = $(FLTO)
+ endif
+ ifdef icpc
+Index: gmic-2.9.9/gmic-qt/gmic_qt.pro
+===================================================================
+--- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro
++++ gmic-2.9.9/gmic-qt/gmic_qt.pro
+@@ -445,7 +445,6 @@ translations/zh_tw.ts
+
+ # PRE_TARGETDEPS +=
+
+-QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s
+ QMAKE_LFLAGS_RELEASE += -s
+ QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3
+
diff --git a/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch
new file mode 100644
index 000000000000..5b403240efc9
--- /dev/null
+++ b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch
@@ -0,0 +1,15 @@
+Index: gmic-2.9.9/src/Makefile
+===================================================================
+--- gmic-2.9.9.orig/src/Makefile
++++ gmic-2.9.9/src/Makefile
+@@ -67,8 +67,8 @@ INCLUDE = include
+ SO = .so
+ PIC = -fPIC
+ EXE =
+-WGET = wget --no-check-certificate --quiet -O
+-PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins
++WGET = false
++PLUGINDIR = /usr/lib/gimp/2.0/plug-ins
+ VERSION = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c3)
+ VERSION1 = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c1)
+ VERSION2 = $(shell grep 'gmic_version\ ' gmic.h | tail -c3 | head -c1)
diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
new file mode 100644
index 000000000000..18ce17a97a7b
--- /dev/null
+++ b/srcpkgs/gmic/patches/04-no-krita-and-order.patch
@@ -0,0 +1,39 @@
+Index: gmic-2.9.9/src/Makefile
+===================================================================
+--- gmic-2.9.9.orig/src/Makefile
++++ gmic-2.9.9/src/Makefile
+@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard
+ #-------------------------------
+ # Define main Makefile entries.
+ #-------------------------------
+
+ # Multi-targets
+ #--------------
+-all:
++all: cli lib gimp gmic_qt libc zart
++
++gmic_qt: gimp
++
++gimp zart: cli lib libc
++
++cli lib libc: all-banner
++
++all-banner:
+ @echo "**"
+ ifeq ($(OS),Unix)
+ @echo "** Start building G'MIC with default Unix configuration."
+ else
+ ifeq ($(OS),Darwin)
+ @echo "** Start building G'MIC with default MacOSX configuration."
+ else
+ @echo "** Start building G'MIC with default Windows configuration."
+ endif
+ endif
+ @echo "**"
+- $(MAKE) cli lib gimp krita gmic_qt libc zart
+
+ native:
+ $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
+
+ # CLI (standard)
+ #---------------
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 46ce0133821f..b9871e7bbe7c 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,52 +1,31 @@
# Template file for 'gmic'
pkgname=gmic
version=2.9.9
-revision=1
+revision=2
_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
+make_build_args=NOSTRIP=yes
+make_use_env=yes
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
makedepends="fftw-devel ilmbase-devel libopenexr-devel MesaLib-devel libopencv-devel
libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel
gtk+-devel gimp-devel qt5-devel"
short_desc="GREYC's Magic for Image Computing (image processing framework)"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="CECILL-2.1"
+license="CECILL-2.1, CECILL-C"
homepage="http://gmic.eu/"
distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d"
-disable_parallel_build="yes"
+# disable_parallel_build="yes"
post_extract() {
mv ../zart-${_zart_hash} zart
}
-post_patch() {
- vsed -i Makefile -e "s,-I[\$](USR),-I$XBPS_CROSS_BASE/usr,g"
- vsed -i Makefile -e "s/-Ofast/-O2/g"
- # uses gimptool-2.0 to determine PLUGINDIR which fails in cross builds
- vsed -i Makefile -e "s,^PLUGINDIR = .*,PLUGINDIR = /usr/lib/gimp/2\.0/plug-ins,g"
- vsed -i ../gmic-qt/gmic_qt.pro -e "s/-Ofast/-O2/g"
- # Not supported on ppc but we already compile for baselines
- case "$XBPS_TARGET_MACHINE" in
- ppc*) vsed -i Makefile -e 's;-mtune=generic;;' ;;
- esac
-}
-
-do_build() {
- make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
- CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
- CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
- cli lib libc
-
- for _target in gimp gmic_qt zart; do
- make $_target
- done
-}
-
post_install() {
vlicense ../COPYING
}
From d37bea4f9228b9b70d97782b86fdf927ab51c13b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 17:19:25 +0200
Subject: [PATCH 357/608] skaffold: fix checksum
---
srcpkgs/skaffold/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 81555a927f40..e04ce3ca784d 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://skaffold.dev/"
changelog="https://github.com/GoogleContainerTools/skaffold/releases"
distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=f285e554257c914c5ab247a0a1a2e28e66926c6cda8959365869328b2af61c51
+checksum=8716bb69853c721bc4e57e3912b8eb5b31bb1850300555fce238ebf7cf57c727
From 3ef06b08c3294ec656cae6c8bdedb550eeedcb6f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 17:19:28 +0200
Subject: [PATCH 358/608] sigi: broken on ppc64 BE because of rustix junk
---
srcpkgs/sigi/template | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
index e7651b6d4dec..fd42f7fa00d5 100644
--- a/srcpkgs/sigi/template
+++ b/srcpkgs/sigi/template
@@ -10,6 +10,11 @@ homepage="https://github.com/hiljusti/sigi"
distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
checksum=81f1171495ca53246df1f271e7bc631454e94c8294b95e277f29136572bef6ad
+case "$XBPS_TARGET_MACHINE" in
+ ppc64le*) ;;
+ ppc64*) broken="some rustix junk";;
+esac
+
post_install() {
vman sigi.1
}
From 0a14e0f8375f54338dacccc6d32e0ac524dd5003 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 17:19:47 +0200
Subject: [PATCH 359/608] qemu, qemu-user-static: fix build on ppc32
---
.../qemu/patches/fix-linux-user-ppc32.patch | 117 ++++++++++++++++++
1 file changed, 117 insertions(+)
create mode 100644 srcpkgs/qemu/patches/fix-linux-user-ppc32.patch
diff --git a/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch b/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch
new file mode 100644
index 000000000000..cd47435d5aa9
--- /dev/null
+++ b/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch
@@ -0,0 +1,117 @@
+commit 37814f62c2cc7aba2eea073014d6c53dcd5bf42c
+Author: q66 <daniel@octaforge.org>
+Date: Fri Jul 1 16:53:55 2022 +0200
+
+ fix linux-user build on 32-bit ppc
+
+ Partial revert https://gitlab.com/qemu-project/qemu/-/commit/9d1401b79463e74adbfac69d836789d4e103fb61
+ and https://gitlab.com/qemu-project/qemu/-/commit/0a7e01904d407baa73c1baddbdfc9ccf2ace8356
+
+diff --git a/common-user/host/ppc/safe-syscall.inc.S b/common-user/host/ppc/safe-syscall.inc.S
+new file mode 100644
+index 0000000..e69de29
+diff --git a/common-user/safe-syscall-error.c b/common-user/safe-syscall-error.c
+index cf74b50..a36132c 100644
+--- a/common-user/safe-syscall-error.c
++++ b/common-user/safe-syscall-error.c
+@@ -12,6 +12,7 @@
+ #include "qemu/osdep.h"
+ #include "user/safe-syscall.h"
+
++#if !defined(__powerpc__) || defined(__powerpc64__)
+ /*
+ * This is intended to be invoked via tail-call on the error path
+ * from the assembly in host/arch/safe-syscall.inc.S. This takes
+@@ -23,3 +24,4 @@ long safe_syscall_set_errno_tail(int value)
+ errno = value;
+ return -1;
+ }
++#endif
+diff --git a/include/user/safe-syscall.h b/include/user/safe-syscall.h
+index 61a04e2..793fe84 100644
+--- a/include/user/safe-syscall.h
++++ b/include/user/safe-syscall.h
+@@ -125,6 +125,8 @@
+ * kinds of restartability.
+ */
+
++#if !defined(__powerpc__) || defined(__powerpc64__)
++
+ /* The core part of this function is implemented in assembly */
+ extern long safe_syscall_base(int *pending, long number, ...);
+ extern long safe_syscall_set_errno_tail(int value);
+@@ -137,4 +139,10 @@ extern char safe_syscall_end[];
+ safe_syscall_base(&((TaskState *)thread_cpu->opaque)->signal_pending, \
+ __VA_ARGS__)
+
++#else
++
++#define safe_syscall syscall
++
++#endif
++
+ #endif
+diff --git a/linux-user/include/host/ppc/host-signal.h b/linux-user/include/host/ppc/host-signal.h
+new file mode 100644
+index 0000000..b80384d
+--- /dev/null
++++ b/linux-user/include/host/ppc/host-signal.h
+@@ -0,0 +1,38 @@
++/*
++ * host-signal.h: signal info dependent on the host architecture
++ *
++ * Copyright (c) 2003-2005 Fabrice Bellard
++ * Copyright (c) 2021 Linaro Limited
++ *
++ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
++ * See the COPYING file in the top-level directory.
++ */
++
++#ifndef PPC_HOST_SIGNAL_H
++#define PPC_HOST_SIGNAL_H
++
++/* The third argument to a SA_SIGINFO handler is ucontext_t. */
++typedef ucontext_t host_sigcontext;
++
++static inline uintptr_t host_signal_pc(host_sigcontext *uc)
++{
++ return uc->uc_mcontext.regs->nip;
++}
++
++static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc)
++{
++ uc->uc_mcontext.regs->nip = pc;
++}
++
++static inline void *host_signal_mask(host_sigcontext *uc)
++{
++ return &uc->uc_sigmask;
++}
++
++static inline bool host_signal_write(siginfo_t *info, host_sigcontext *uc)
++{
++ return uc->uc_mcontext.regs->trap != 0x400
++ && (uc->uc_mcontext.regs->dsisr & 0x02000000);
++}
++
++#endif
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 092e70b..b8dfa8a 100644
+--- a/linux-user/signal.c
++++ b/linux-user/signal.c
+@@ -800,6 +800,7 @@ void queue_signal(CPUArchState *env, int sig, int si_type,
+ /* Adjust the signal context to rewind out of safe-syscall if we're in it */
+ static inline void rewind_if_in_safe_syscall(void *puc)
+ {
++#if !defined(__powerpc__) || defined(__powerpc64__)
+ host_sigcontext *uc = (host_sigcontext *)puc;
+ uintptr_t pcreg = host_signal_pc(uc);
+
+@@ -807,6 +808,7 @@ static inline void rewind_if_in_safe_syscall(void *puc)
+ && pcreg < (uintptr_t)safe_syscall_end) {
+ host_signal_set_pc(uc, (uintptr_t)safe_syscall_start);
+ }
++#endif
+ }
+
+ static void host_signal_handler(int host_sig, siginfo_t *info, void *puc)
From 3ba7326ca27bd9d7467f2f40de6a9974926a263c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Jul 2022 11:20:41 -0500
Subject: [PATCH 360/608] yara: update to 4.2.2.
---
srcpkgs/yara/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index df2a2f39937f..34db8bb94746 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
# Template file for 'yara'
pkgname=yara
-version=4.2.1
+version=4.2.2
revision=1
build_style=gnu-configure
configure_args="--enable-magic --enable-cuckoo"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://virustotal.github.io/yara/"
distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=f26d9c481e6789181431ac410665f6ba25d551c2948995f84c9e17df7a93731a
+checksum=20bd56857c4b037c4baae71587b7d22d0b7bbb075a7afa516ba35dae50fadd25
pre_configure() {
autoreconf -fi
From e6165de2fe86562a1011e6c4e304c29ed39aeb0e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Jul 2022 11:29:48 -0500
Subject: [PATCH 361/608] python3-youtubesearch: update to 1.6.6.
---
srcpkgs/python3-youtubesearch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 494188c3a466..34b0fbfd7a88 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
# Template file for 'python3-youtubesearch'
pkgname=python3-youtubesearch
-version=1.6.5
+version=1.6.6
revision=1
wrksrc="youtube-search-python-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/alexmercerind/youtube-search-python"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=5e47c2bd09829aa830bc7f855693c20dfe49d2390c3041b0a44422cc743b3f00
+checksum=6474472d1a93df9a803eea32c939be4af9bd6af6a13ea997ab3c339d0f9f2851
make_check=no # no tests defined
post_install() {
From c5ea210fdbad782e112dbccad1c5755287c3f331 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Jul 2022 11:32:05 -0500
Subject: [PATCH 362/608] ytmdl: add missing dependency
---
srcpkgs/ytmdl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 5dfe4a7636a8..2575c3ee61d1 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,7 +1,7 @@
# Template file for 'ytmdl'
pkgname=ytmdl
version=2022.03.16
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama
@@ -10,7 +10,7 @@ depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama
python3-Unidecode python3-urllib3 python3-youtube-search
python3-pyDes python3-simber python3-rich python3-musicbrainzngs
python3-typing_extensions python3-ytmusicapi python3-youtubesearch
- python3-spotipy"
+ python3-spotipy python3-redis"
short_desc="Get songs from youtube in mp3 format with all tags from itunes"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
From 581c90643e52d40144675d31e8f43cdcd3ec6532 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 1 Jul 2022 17:38:31 +0100
Subject: [PATCH 363/608] rofi-rbw: update to 1.0.1.
---
srcpkgs/rofi-rbw/patches/wofi.patch | 28 ----------------------------
srcpkgs/rofi-rbw/template | 6 +++---
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/rofi-rbw/patches/wofi.patch
diff --git a/srcpkgs/rofi-rbw/patches/wofi.patch b/srcpkgs/rofi-rbw/patches/wofi.patch
deleted file mode 100644
index 9627b6771b3c..000000000000
--- a/srcpkgs/rofi-rbw/patches/wofi.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d059d0a4f352d295c116639798f8b5e110967e4f Mon Sep 17 00:00:00 2001
-From: Fabian Winter <5821180+fdw@users.noreply.github.com>
-Date: Mon, 27 Jun 2022 20:55:21 +0200
-Subject: [PATCH] Return correct values from wofi
-
-Returning no targets might not be the best idea...
-
-Issue: #51
----
- src/rofi_rbw/selector.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/rofi_rbw/selector.py b/src/rofi_rbw/selector.py
-index d2c9844..e5d8696 100644
---- a/src/rofi_rbw/selector.py
-+++ b/src/rofi_rbw/selector.py
-@@ -198,9 +198,9 @@ def show_selection(
- encoding='utf-8'
- )
- if wofi.returncode == 0:
-- return [], DEFAULT(), wofi.stdout
-+ return DEFAULT(), DEFAULT(), wofi.stdout
- else:
-- return [], CANCEL(), wofi.stdout
-+ return CANCEL(), CANCEL(), wofi.stdout
-
- def select_target(
- self,
diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template
index 5a2ef1eedcec..d50f8ff13b21 100644
--- a/srcpkgs/rofi-rbw/template
+++ b/srcpkgs/rofi-rbw/template
@@ -1,7 +1,7 @@
# Template file for 'rofi-rbw'
pkgname=rofi-rbw
-version=1.0.0
-revision=2
+version=1.0.1
+revision=1
build_style=python3-pep517
make_install_target="rofi_rbw-${version}-py3-none-any.whl"
hostmakedepends="python3-setuptools python3-wheel"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/fdw/rofi-rbw"
changelog="https://raw.githubusercontent.com/fdw/rofi-rbw/HEAD/CHANGELOG.md"
distfiles="https://github.com/fdw/rofi-rbw/archive/${version}.tar.gz"
-checksum=25cebb7d0cbff19cd0dc54834455de0ae291c74c4d51d66a5c10a57093b49799
+checksum=37f14462a7a918df2ac9350db8e3822fc7bf9af490dddb60299ea73c976f6c97
post_install() {
vman src/rofi_rbw/docs/rofi-rbw.1
From 889a57912b644e33c52a713d37d3c66e1edb844e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 14:21:47 +0200
Subject: [PATCH 364/608] python3-ddt: update to 1.5.0.
---
srcpkgs/python3-ddt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ddt/template b/srcpkgs/python3-ddt/template
index 7b72f8743042..80b7023d7e7c 100644
--- a/srcpkgs/python3-ddt/template
+++ b/srcpkgs/python3-ddt/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ddt'
pkgname=python3-ddt
-version=1.4.4
+version=1.5.0
revision=1
wrksrc=ddt-${version}
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://ddt.readthedocs.io/"
distfiles="https://github.com/datadriventests/ddt/archive/refs/tags/${version}.tar.gz"
-checksum=658c994827f84acc1b67f0d882960724328459078d4a3fdd4737c642fe0ea090
+checksum=5ba3bad9966b832931c03fa73cf8670e886166c3684354f8826636d2961767f9
post_install() {
vlicense LICENSE.md
From 39b54dc02e5d761e006ed0873e56f5194b8f865e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 1 Jul 2022 14:15:13 -0400
Subject: [PATCH 365/608] vkQuake: update to 1.20.1.
---
srcpkgs/vkQuake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 88e2b0eaf0eb..7af2e754d21a 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
# Template file for 'vkQuake'
pkgname=vkQuake
-version=1.20.0
+version=1.20.1
revision=1
build_wrksrc="Quake"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/Novum/vkQuake"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=2ff682a4b289607c56200d9d0920e3a360fe1b8aeb8cb39d4e0f4b460f4ad744
+checksum=81ec663afba5d88e298d27cfeef5cdf40bc1aeb1d6683f13ae32021701543283
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 0d0c6bf7a952a8a9c0ab5154e8cee8de522128ef Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Jul 2022 20:26:12 +0200
Subject: [PATCH 366/608] conmon: only include docs on archs supported by go
---
srcpkgs/conmon/template | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index b0182acf49eb..763a2d6697dc 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -3,7 +3,7 @@ pkgname=conmon
version=2.1.2
revision=1
build_style=gnu-makefile
-hostmakedepends="pkg-config go-md2man"
+hostmakedepends="pkg-config"
makedepends="libglib-devel libseccomp-devel"
short_desc="OCI container runtime monitor"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
@@ -12,13 +12,23 @@ homepage="https://github.com/containers/conmon"
distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
checksum=8ba76eb54c319197235fd39c3a5b5a975b5a21e02cd4be985b8619220a497a0e
+_have_docs=no
+
+case "$XBPS_MACHINE" in
+ x86_64*|ppc64le*|aarch64*|arm*|i686*) _have_docs=yes;;
+esac
+
+if [ "$_have_docs" = "yes" ]; then
+ hostmakedepends+=" go-md2man"
+fi
+
post_build() {
- make -C docs GOMD2MAN=go-md2man
+ [ "$_have_docs" = "yes" ] && make -C docs GOMD2MAN=go-md2man || :
}
do_install() {
vbin bin/conmon
vmkdir usr/libexec/podman
ln -sf ../../bin/conmon "${DESTDIR}/usr/libexec/podman"
- make -C docs install DESTDIR="$DESTDIR" PREFIX=/usr
+ [ "$_have_docs" = "yes" ] && make -C docs install DESTDIR="$DESTDIR" PREFIX=/usr || :
}
From 588642bd10162234eccb1c8b5b7dadaf37274018 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 30 Jun 2022 12:49:03 -0400
Subject: [PATCH 367/608] openjdk11: fix memory corruption issue on musl
https://bugs.openjdk.org/browse/JDK-8289477
---
.../files/musl_patches/8289477.patch | 35 +++++++++++++++++++
srcpkgs/openjdk11/template | 3 +-
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/openjdk11/files/musl_patches/8289477.patch
diff --git a/srcpkgs/openjdk11/files/musl_patches/8289477.patch b/srcpkgs/openjdk11/files/musl_patches/8289477.patch
new file mode 100644
index 000000000000..57ac4866b578
--- /dev/null
+++ b/srcpkgs/openjdk11/files/musl_patches/8289477.patch
@@ -0,0 +1,35 @@
+From da6d1fc0e0aeb1fdb504aced4b0dba0290ec240f Mon Sep 17 00:00:00 2001
+From: Thomas Stuefe <stuefe@openjdk.org>
+Date: Thu, 30 Jun 2022 06:19:25 +0000
+Subject: [PATCH] 8289477: Memory corruption with CPU_ALLOC, CPU_FREE on muslc
+
+Reviewed-by: dholmes, clanger
+---
+ src/hotspot/os/linux/os_linux.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
+index 726926218907..8ee10e201c69 100644
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -4591,7 +4591,8 @@ static int _cpu_count(const cpu_set_t* cpus) {
+ // dynamic check - see 6515172 for details.
+ // If anything goes wrong we fallback to returning the number of online
+ // processors - which can be greater than the number available to the process.
+-int os::Linux::active_processor_count() {
++static int get_active_processor_count() {
++ // Note: keep this function, with its CPU_xx macros, *outside* the os namespace (see JDK-8289477).
+ cpu_set_t cpus; // can represent at most 1024 (CPU_SETSIZE) processors
+ cpu_set_t* cpus_p = &cpus;
+ int cpus_size = sizeof(cpu_set_t);
+@@ -4663,6 +4664,10 @@ int os::Linux::active_processor_count() {
+ return cpu_count;
+ }
+
++int os::Linux::active_processor_count() {
++ return get_active_processor_count();
++}
++
+ // Determine the active processor count from one of
+ // three different sources:
+ //
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 48be7fa6bfc8..b148ebe1e008 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,7 +1,7 @@
# Template file for 'openjdk11'
pkgname=openjdk11
version=11.0.12+7
-revision=2
+revision=3
_java_ver="${version%%.*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*"
@@ -43,6 +43,7 @@ provides="java-environment-${version}_1"
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
+disable_parallel_check=yes
build_options="docs"
case "$XBPS_TARGET_MACHINE" in
From ab6a65646fca39aa5d4c334f0330e8352bdbfbf8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 30 Jun 2022 12:49:14 -0400
Subject: [PATCH 368/608] openjdk17: fix memory corruption issue on musl
https://bugs.openjdk.org/browse/JDK-8289477
---
.../files/musl_patches/8289477.patch | 35 +++++++++++++++++++
srcpkgs/openjdk17/template | 3 +-
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/openjdk17/files/musl_patches/8289477.patch
diff --git a/srcpkgs/openjdk17/files/musl_patches/8289477.patch b/srcpkgs/openjdk17/files/musl_patches/8289477.patch
new file mode 100644
index 000000000000..57ac4866b578
--- /dev/null
+++ b/srcpkgs/openjdk17/files/musl_patches/8289477.patch
@@ -0,0 +1,35 @@
+From da6d1fc0e0aeb1fdb504aced4b0dba0290ec240f Mon Sep 17 00:00:00 2001
+From: Thomas Stuefe <stuefe@openjdk.org>
+Date: Thu, 30 Jun 2022 06:19:25 +0000
+Subject: [PATCH] 8289477: Memory corruption with CPU_ALLOC, CPU_FREE on muslc
+
+Reviewed-by: dholmes, clanger
+---
+ src/hotspot/os/linux/os_linux.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
+index 726926218907..8ee10e201c69 100644
+--- a/src/hotspot/os/linux/os_linux.cpp
++++ b/src/hotspot/os/linux/os_linux.cpp
+@@ -4591,7 +4591,8 @@ static int _cpu_count(const cpu_set_t* cpus) {
+ // dynamic check - see 6515172 for details.
+ // If anything goes wrong we fallback to returning the number of online
+ // processors - which can be greater than the number available to the process.
+-int os::Linux::active_processor_count() {
++static int get_active_processor_count() {
++ // Note: keep this function, with its CPU_xx macros, *outside* the os namespace (see JDK-8289477).
+ cpu_set_t cpus; // can represent at most 1024 (CPU_SETSIZE) processors
+ cpu_set_t* cpus_p = &cpus;
+ int cpus_size = sizeof(cpu_set_t);
+@@ -4663,6 +4664,10 @@ int os::Linux::active_processor_count() {
+ return cpu_count;
+ }
+
++int os::Linux::active_processor_count() {
++ return get_active_processor_count();
++}
++
+ // Determine the active processor count from one of
+ // three different sources:
+ //
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 03ac17c81b4d..3ae920a80676 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,7 +1,7 @@
# Template file for 'openjdk17'
pkgname=openjdk17
version=17.0.3+7
-revision=2
+revision=3
_gtest_ver=1.8.1
_java_ver="${version%%.*}"
_jdk_update="${version#*+}"
@@ -52,6 +52,7 @@ patch_args="-Np1 --directory=$build_wrksrc"
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
+disable_parallel_check=yes
build_options="docs"
case "$XBPS_TARGET_MACHINE" in
From 2113b6dc90d0ce9a700ca91d21ab3eb81bd40f71 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 24 Mar 2022 13:12:36 -0400
Subject: [PATCH 369/608] python3-ruamel.yaml: update to 0.17.21.
---
srcpkgs/python3-ruamel.yaml/template | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/python3-ruamel.yaml/template b/srcpkgs/python3-ruamel.yaml/template
index b8ad65ed0883..4f9dadaa0006 100644
--- a/srcpkgs/python3-ruamel.yaml/template
+++ b/srcpkgs/python3-ruamel.yaml/template
@@ -1,25 +1,23 @@
# Template file for 'python3-ruamel.yaml'
pkgname=python3-ruamel.yaml
-version=0.16.12
-revision=4
+version=0.17.21
+revision=1
wrksrc="ruamel.yaml-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
-depends="python3"
+depends="python3-ruamel.yaml.clib"
short_desc="YAML parser/emitter in Python 3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://yaml.readthedocs.io/"
+changelog="https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/CHANGES"
distfiles="${PYPI_SITE}/r/ruamel.yaml/ruamel.yaml-${version}.tar.gz"
-checksum=076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e
+checksum=8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af
+make_check=no # no tests included in distfiles
export RUAMEL_NO_PIP_INSTALL_CHECK=1
-do_check() {
- :
-}
-
post_install() {
vlicense LICENSE
}
From 27c738ab5e356ecc8b2800997e2beba739e4cbac Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 24 Mar 2022 13:32:43 -0400
Subject: [PATCH 370/608] whipper: add patch to support ruamel.yaml>=0.17
---
.../patches/ruamel.yaml-0.17_compat.patch | 109 ++++++++++++++++++
srcpkgs/whipper/template | 2 +-
2 files changed, 110 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch
diff --git a/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch b/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch
new file mode 100644
index 000000000000..206547e4b3e9
--- /dev/null
+++ b/srcpkgs/whipper/patches/ruamel.yaml-0.17_compat.patch
@@ -0,0 +1,109 @@
+From e0942417a1c267781a8b676789730457dcb2e6fa Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Sun, 20 Jun 2021 15:18:37 +0200
+Subject: [PATCH] Use custom YAML subclass to be compatible with
+ ruamel_yaml>=0.17
+
+Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
+---
+ whipper/common/yaml.py | 18 ++++++++++++++++++
+ whipper/result/logger.py | 11 ++++++-----
+ whipper/test/test_result_logger.py | 14 ++++++--------
+ 3 files changed, 30 insertions(+), 13 deletions(-)
+ create mode 100644 whipper/common/yaml.py
+
+diff --git a/whipper/common/yaml.py b/whipper/common/yaml.py
+new file mode 100644
+index 00000000..4edb0b36
+--- /dev/null
++++ b/whipper/common/yaml.py
+@@ -0,0 +1,18 @@
++from ruamel.yaml import YAML as ruamel_YAML
++from ruamel.yaml.compat import StringIO
++
++# https://yaml.readthedocs.io/en/latest/example.html#output-of-dump-as-a-string
++class YAML(ruamel_YAML):
++ def __init__(self, *args, **kwargs):
++ super().__init__()
++ self.width = 4000
++ self.default_flow_style = False
++
++ def dump(self, data, stream=None, **kw):
++ inefficient = False
++ if stream is None:
++ inefficient = True
++ stream = StringIO()
++ ruamel_YAML.dump(self, data, stream, **kw)
++ if inefficient:
++ return stream.getvalue()
+diff --git a/whipper/result/logger.py b/whipper/result/logger.py
+index b7043adc..f4471a00 100644
+--- a/whipper/result/logger.py
++++ b/whipper/result/logger.py
+@@ -1,12 +1,12 @@
+ import time
+ import hashlib
+ import re
+-import ruamel.yaml as yaml
+ from ruamel.yaml.comments import CommentedMap as OrderedDict
+
+ import whipper
+
+ from whipper.common import common
++from whipper.common.yaml import YAML
+ from whipper.result import result
+
+
+@@ -148,11 +148,12 @@ def logRip(self, ripResult, epoch):
+ data["EOF"] = "End of status report"
+ riplog["Conclusive status report"] = data
+
++ yaml = YAML(
++ typ="rt",
++ pure=True
++ )
+ riplog = yaml.dump(
+- riplog,
+- default_flow_style=False,
+- width=4000,
+- Dumper=yaml.RoundTripDumper
++ riplog
+ )
+ # Add a newline after the "Log creation date" line
+ riplog = re.sub(
+diff --git a/whipper/test/test_result_logger.py b/whipper/test/test_result_logger.py
+index 411b61af..98c89ab5 100644
+--- a/whipper/test/test_result_logger.py
++++ b/whipper/test/test_result_logger.py
+@@ -3,8 +3,8 @@
+ import os
+ import re
+ import unittest
+-import ruamel.yaml
+
++from whipper.common.yaml import YAML
+ from whipper.result.result import TrackResult, RipResult
+ from whipper.result.logger import WhipperLogger
+
+@@ -163,16 +163,14 @@ def testLogger(self):
+ ))
+ )
+
+- yaml = ruamel.yaml.YAML()
++ yaml = YAML(
++ typ='rt',
++ pure=True
++ )
+ parsedLog = yaml.load(actual)
+ self.assertEqual(
+ actual,
+- ruamel.yaml.dump(
+- parsedLog,
+- default_flow_style=False,
+- width=4000,
+- Dumper=ruamel.yaml.RoundTripDumper
+- )
++ yaml.dump(parsedLog)
+ )
+ log_body = "\n".join(actualLines[:-1]).encode()
+ self.assertEqual(
diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index c5bbd74cfacc..e0f5cf8b8026 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -1,7 +1,7 @@
# Template file for 'whipper'
pkgname=whipper
version=0.10.0
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
makedepends="libsndfile-devel python3-devel"
From beb6c14e566799e70e273c527741b5626f989d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 14:49:29 +0200
Subject: [PATCH 371/608] i3status-rust: update to 0.22.0.
---
srcpkgs/i3status-rust/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index e8282155e7b0..230dbca134cb 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
# Template file for 'i3status-rust'
pkgname=i3status-rust
-version=0.21.10
+version=0.22.0
revision=1
build_style=cargo
make_check_args="--bins"
@@ -11,8 +11,8 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/greshake/i3status-rust"
changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
-distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=d20d883dbd02026cd396ee5797f33606bcebbe0185cf8ca06b76bc325d854bb6
+distfiles="https://github.com/greshake/i3status-rust/archive/refs/tags/v${version}.tar.gz"
+checksum=cd28a90ccb2f9faaaef1e528619f1018981609d77f409abe4877350d810d3324
post_install() {
vmkdir usr/share/i3status-rust
From 4a3455b7505151b6ed422fe200beb75f47231839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 14:09:36 +0200
Subject: [PATCH 372/608] comrak: update to 0.13.1.
---
srcpkgs/comrak/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/comrak/template b/srcpkgs/comrak/template
index 1cf003b7127c..4a6efc39ee13 100644
--- a/srcpkgs/comrak/template
+++ b/srcpkgs/comrak/template
@@ -1,6 +1,6 @@
# Template file for 'comrak'
pkgname=comrak
-version=0.13.0
+version=0.13.1
revision=1
build_style=cargo
short_desc="CommonMark + GFM compatible Markdown parser and renderer"
@@ -8,10 +8,11 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="BSD-2-Clause"
homepage="https://github.com/kivikakk/comrak"
distfiles="https://github.com/kivikakk/comrak/archive/${version}.tar.gz"
-checksum=e4b65fd55ef0dfc3835f24a5234a52b457534a2b500971f4c2e800f4ee889a69
+checksum=a6169ba0ad7117c423ade7946d64e97fffe33217bf7094a850493c6dfba556c8
case "$XBPS_TARGET_MACHINE" in
- i686*) broken="LLVM ran out of registers during register allocation: https://pastebin.com/raw/DLCa9nEz" ;;
+# Tests don't compile on i686: ran out of registers during register allocation
+ i686*) make_check=no ;;
esac
post_patch() {
From 8d33ad8cb8bd82810ea6d01833da2d2b60aa3946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 13:24:48 +0200
Subject: [PATCH 373/608] python3-hcloud: update to 1.17.0.
---
srcpkgs/python3-hcloud/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template
index 5b2584860022..12eb46af1027 100644
--- a/srcpkgs/python3-hcloud/template
+++ b/srcpkgs/python3-hcloud/template
@@ -1,6 +1,6 @@
# Template file for 'python3-hcloud'
pkgname=python3-hcloud
-version=1.16.0
+version=1.17.0
revision=1
wrksrc="${pkgname/python3-/}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/hetznercloud/hcloud-python"
distfiles="${PYPI_SITE}/h/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc
+checksum=f8142e0438be277c6fa1ddee13aecd5da152b48c6dec7fd4970def1b5dc219e2
post_install() {
vlicense LICENSE
From b9f6d69d02da0d6d47b21b50f761796c777a79b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 26 Jun 2022 16:47:17 +0200
Subject: [PATCH 374/608] python3-jsonschema: update to 4.6.1.
---
srcpkgs/python3-jsonschema/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index 120392ad1be3..a1dd7ff5d073 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,20 +1,24 @@
# Template file for 'python3-jsonschema'
pkgname=python3-jsonschema
-version=4.4.0
+version=4.6.1
revision=1
wrksrc="jsonschema-${version}"
build_style=python3-pep517
-make_check_args="--deselect jsonschema/tests/test_cli.py::TestCLIIntegration::test_license"
-hostmakedepends="python3-setuptools_scm python3-wheel"
+hostmakedepends="hatchling hatch-vcs"
depends="python3-attrs python3-pyrsistent"
-checkdepends="python3-pytest python3-Twisted $depends"
short_desc="Implementation of JSON Schema for Python3"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/Julian/jsonschema"
changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83
+checksum=ec2802e6a37517f09d47d9ba107947589ae1d25ff557b925d83a321fc2aa5d3b
+# Tests require jsonschema to be installed already. Setting PYTHONPATH doesn't seem to do trick
+make_check=no
+
+pre_build() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
+}
post_install() {
vlicense COPYING LICENSE
From 17fdf53b7e5c791593fc6c5524881b5218ab5f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 08:53:19 +0200
Subject: [PATCH 375/608] python3-bracex: update to 2.3.post1.
---
srcpkgs/python3-bracex/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-bracex/template b/srcpkgs/python3-bracex/template
index a88b1f66737c..89025d991378 100644
--- a/srcpkgs/python3-bracex/template
+++ b/srcpkgs/python3-bracex/template
@@ -1,10 +1,10 @@
# Template file for 'python3-bracex'
pkgname=python3-bracex
-version=2.2.1
+version=2.3.post1
revision=1
wrksrc="${pkgname/python3-/}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="hatchling"
depends="python3"
checkdepends="python3-pytest"
short_desc="Bash style brace expansion for Python"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://github.com/facelessuser/bracex"
changelog="https://raw.githubusercontent.com/facelessuser/bracex/master/docs/src/markdown/about/changelog.md"
distfiles="${PYPI_SITE}/b/bracex/bracex-${version}.tar.gz"
-checksum=1c8d1296e00ad9a91030ccb4c291f9e4dc7c054f12c707ba3c5ff3e9a81bcd21
+checksum=e7b23fc8b2cd06d3dec0692baabecb249dda94e06a617901ff03a6c56fd71693
post_install() {
vlicense LICENSE.md
From 963e418a616f1d0eeb473f23783bed128db1d2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 1 Jul 2022 08:59:13 +0200
Subject: [PATCH 376/608] python3-wcmatch: update to 8.4.
---
srcpkgs/python3-wcmatch/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-wcmatch/template b/srcpkgs/python3-wcmatch/template
index d132c7721d80..60ad0128e422 100644
--- a/srcpkgs/python3-wcmatch/template
+++ b/srcpkgs/python3-wcmatch/template
@@ -1,12 +1,12 @@
# Template file for 'python3-wcmatch'
pkgname=python3-wcmatch
-version=8.3
+version=8.4
revision=1
wrksrc="${pkgname/python3-/}-${version}"
-build_style=python3-module
-make_check_args="--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_realpath
---deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_tilde"
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+#make_check_args="--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_realpath
+#--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_tilde"
+hostmakedepends="hatchling"
depends="python3-bracex"
checkdepends="python3-pytest ${depends}"
short_desc="Wilcard File Name matching library"
@@ -15,7 +15,7 @@ license="MIT"
homepage="https://github.com/facelessuser/wcmatch"
changelog="https://raw.githubusercontent.com/facelessuser/wcmatch/main/docs/src/markdown/about/changelog.md"
distfiles="${PYPI_SITE}/w/wcmatch/wcmatch-${version}.tar.gz"
-checksum=371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db
+checksum=ba4fc5558f8946bf1ffc7034b05b814d825d694112499c86035e0e4d398b6a67
post_install() {
vlicense LICENSE.md
From 6a89241542e213dae68c1c70b5a98291d24b3b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 10 Jun 2022 17:30:55 +0200
Subject: [PATCH 377/608] python3-ansible-lint: update to 6.3.0.
---
srcpkgs/python3-ansible-lint/template | 41 ++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 19b1453782e9..a2887ed6ad5c 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,13 +1,42 @@
# Template file for 'python3-ansible-lint'
pkgname=python3-ansible-lint
-version=6.2.2
+version=6.3.0
revision=1
wrksrc="${pkgname/python3-/}-${version}"
build_style=python3-pep517
+# These require ansible-lint installed properly, or they are flaky
+make_check_args="--deselect test/test_eco.py::test_eco
+ --deselect test/test_main.py::test_call_from_outside_venv
+ --deselect test/test_cli_role_paths.py::test_run_single_role_path_no_trailing_slash_script
+ --deselect test/test_cli_role_paths.py::test_run_multiple_role_path_with_trailing_slash
+ --deselect test/test_cli_role_paths.py::test_run_role_name_with_prefix
+ --deselect test/test_cli_role_paths.py::test_run_role_name_from_meta
+ --deselect test/test_cli_role_paths.py::test_run_invalid_role_name_from_meta
+ --deselect test/test_cli_role_paths.py::test_run_role_three_dir_deep
+ --deselect test/test_cli_role_paths.py::test_run_playbook
+ --deselect test/test_cli_role_paths.py::test_run_role_name_invalid
+ --deselect test/test_cli_role_paths.py::test_run_single_role_path_no_trailing_slash_module
+ --deselect test/test_cli_role_paths.py::test_run_inside_role_dir
+ --deselect test/test_cli_role_paths.py::test_run_single_role_path_with_trailing_slash
+ --deselect test/test_cli_role_paths.py::test_run_multiple_role_path_no_trailing_slash
+ --deselect test/test_cli_role_paths.py::test_run_single_role_path_with_roles_path_env
+ --deselect test/test_verbosity.py::test_default_verbosity
+ --deselect test/test_task_includes.py::test_included_tasks
+ --deselect test/test_utils.py::test_cli_auto_detect
+ --deselect test/test_list_rules.py::test_list_rules_includes_opt_in_rules
+ --deselect test/test_formatter_json.py::test_code_climate_parsable_ignored
+ --deselect test/test_examples.py::test_custom_kinds
+ --deselect src/ansiblelint/rules/only_builtins.py::test_only_builtin_fail
+ --deselect test/test_import_playbook.py::test_task_hook_import_playbook
+ --deselect test/test_rules_collection.py::test_rich_rule_listing"
+make_install_target="ansible_lint-*-*-*-*.whl"
hostmakedepends="python3-wheel python3-setuptools_scm"
depends="ansible-core python3-yamllint python3-six python3-yaml
python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch
- python3-ansible-compat"
+ python3-ansible-compat python3-jsonschema"
+checkdepends="${depends} python3-pytest black python3-flake8 python3-flaky
+ python3-mypy pylint python3-pytest-cov python3-pytest-xdist
+ python3-pytest-forked"
short_desc="Linter for Ansible files"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
# Note about licensing from upstream:
@@ -18,12 +47,10 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/ansible-community/ansible-lint"
distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=b8e2956fede90bd28150e97f209a8af787c6001f584bb6613112a1ce1aea311d
-# Tests are currently broken for ansible on python 3.10
-# See https://github.com/ansible/ansible/issues/74658
-# and https://github.com/ansible/ansible/issues/74660
-make_check=no
+checksum=f57f520ae5d810ce062157dc7d633990ad2fbec81bbbb34ccc4ce3a0c21fcd38
+make_check_pre="env PYTHONPATH=src"
post_patch() {
vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
}
From 546fb206b3064acba7e810fea58bcfaece632915 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 30 Jun 2022 14:59:30 +0200
Subject: [PATCH 378/608] bmake: update to 20220612.
---
srcpkgs/bmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index babb5d6d3938..98bbd90eab3e 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
# Template file for 'bmake'
pkgname=bmake
-version=20220418
+version=20220612
revision=1
create_wrksrc=yes
short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://www.crufty.net/help/sjg/bmake.html"
distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=6ea7de515cba74f173dc14ee17b1488ae032582028d2e86ea12f70369cc896f5
+checksum=e34bcc6375c75ae5b53551da0b1d6c1205cdee61e4f564e2cfe04081a5a682fa
python_version=3
do_configure() {
From 6bdc8ce6919c6b9c6c593ff2d30c94b07bd4ad22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Jul 2022 23:46:15 +0200
Subject: [PATCH 379/608] mathcomp: update to 1.15.0.
---
srcpkgs/mathcomp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 9c218e87e686..bfda9502f24c 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
-version=1.14.0
-revision=3
+version=1.15.0
+revision=1
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="CECILL-B"
homepage="https://github.com/math-comp/math-comp"
distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz"
-checksum=d259cc95a2f8f74c6aa5f3883858c9b79c6e87f769bde9a415115fa4876ebb31
+checksum=33105615c937ae1661e12e9bc00e0dbad143c317a6ab78b1a15e1d28339d2d95
nocross="ocaml"
do_install() {
From 282cb8302fd305524164a8ec1091deef0f7910f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 1 Jul 2022 16:38:37 +0200
Subject: [PATCH 380/608] doctl: update to 1.78.0.
---
srcpkgs/doctl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index b04f9077a4de..8d5ad0293ff4 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
# Template file for 'doctl'
pkgname=doctl
-version=1.77.0
+version=1.78.0
revision=1
build_style=go
go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/digitalocean/doctl"
distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=56514dd2d50d74703aef2c184127804e1b08ff2216130125bd066255ebe3220e
+checksum=8b2fb24f00b98db8f6a730cf8d7703b2e0b8fd0abe23cd1a64e325d4e8f49ffe
From c1978bc90fd9db44e67ae9e6fecbc5c7500cf0dd Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Fri, 1 Jul 2022 12:42:25 -0700
Subject: [PATCH 381/608] wf-recorder: update to 0.3.0.
---
srcpkgs/wf-recorder/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wf-recorder/template b/srcpkgs/wf-recorder/template
index 8ca26d6ef458..e278eb001600 100644
--- a/srcpkgs/wf-recorder/template
+++ b/srcpkgs/wf-recorder/template
@@ -1,17 +1,17 @@
# Template file for 'wf-recorder'
pkgname=wf-recorder
-version=0.2.1
+version=0.3.0
revision=1
build_style=meson
-hostmakedepends="pkg-config ninja scdoc wayland-devel"
+hostmakedepends="pkg-config scdoc wayland-devel"
makedepends="wayland-protocols wayland-devel ffmpeg-devel x264-devel
- pulseaudio-devel ocl-icd-devel"
+ pulseaudio-devel"
short_desc="Screen recorder for wlroots-based compositors"
maintainer="Jony <maybe-one-day-ubermensch@protonmail.com>"
license="MIT"
homepage="https://github.com/ammen99/wf-recorder"
distfiles="https://github.com/ammen99/${pkgname}/archive/v${version}.tar.gz"
-checksum=45cf04cf58cf241c22fa2fbb70481a3747ad33e6930e4bdba7b9cc7018789ad1
+checksum=3af1e933872653233d87167bab73d96f984d00e995385190b586be4d89dbbfdf
# silly workaround to prevent vector/bool/etc from being defined
case "$XBPS_TARGET_MACHINE" in
From 8e8004b780074c2bd7a0586ac389a5549b9e9b88 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 29 Jun 2022 15:49:52 -0700
Subject: [PATCH 382/608] libopenraw: split pixbuf loader into subpackage
The pixbuf loader can cause issues loading files and isn't always needed.
The pixbuf loader is also considered deprecated upstream, so it should probably
be split into its own package.
---
srcpkgs/libopenraw-pixbuf-loader | 1 +
srcpkgs/libopenraw/template | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libopenraw-pixbuf-loader
diff --git a/srcpkgs/libopenraw-pixbuf-loader b/srcpkgs/libopenraw-pixbuf-loader
new file mode 120000
index 000000000000..aa7a4d2d924b
--- /dev/null
+++ b/srcpkgs/libopenraw-pixbuf-loader
@@ -0,0 +1 @@
+libopenraw
\ No newline at end of file
diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template
index 5b2f7bbd814f..542d63319c58 100644
--- a/srcpkgs/libopenraw/template
+++ b/srcpkgs/libopenraw/template
@@ -1,7 +1,7 @@
# Template file for 'libopenraw'
pkgname=libopenraw
version=0.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config curl"
@@ -10,8 +10,8 @@ short_desc="Library for camera RAW files decoding"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
#changelog="https://raw.githubusercontent.com/hfiguiere/libopenraw/master/NEWS"
-homepage="https://${pkgname}.freedesktop.org/wiki/"
-distfiles="https://${pkgname}.freedesktop.org/download/${pkgname}-${version}.tar.bz2"
+homepage="https://libopenraw.freedesktop.org/wiki/"
+distfiles="https://libopenraw.freedesktop.org/download/libopenraw-${version}.tar.bz2"
checksum=6405634f555849eb01cb028e2a63936e7b841151ea2a1571ac5b5b10431cfab9
post_install() {
@@ -29,3 +29,11 @@ libopenraw-devel_package() {
vmove usr/include
}
}
+
+libopenraw-pixbuf-loader_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ description=" - pixbuf loader"
+ pkg_install() {
+ vmove "usr/lib/gdk-pixbuf-2.0"
+ }
+}
From 2139993c964e33d38cc45879387de08a3f1e9250 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jul 2022 08:20:04 +0200
Subject: [PATCH 383/608] wine: update to 7.12.
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 6f807b194d5d..e043313f260d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=7.11
+version=7.12
revision=1
_pkgver=${version/r/-r}
create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="fa28deed99efba8e4b0cd9bb56ce62e57a4d15560baebd4bd69b6754ab41dc3f
- f706e242dcd5d687e636f670415c313059fd76680c7909b7aa3d1848f14700ca"
+checksum="809cec13716636e6eafd4c3da7312456a844d316020a5578611bcdba21069c68
+ 9789d236b19724429ab213fe6c5980642f4c55003fb47023288a25e28f1ae450"
build_options="mingw staging xshm"
build_options_default="mingw xshm"
From 381f3681f31c4e6c28ef477b8b9243e88961f0ae Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jul 2022 10:09:00 +0200
Subject: [PATCH 384/608] linux5.4: update to 5.4.202.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index cda95ec80d98..13a8fb7496bf 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.201
+version=5.4.202
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=813dd73120c1f72e69feda9c029902450ebfbac6323fe4cf3c5547a298c36e61
+checksum=5ca1bce19eab6a07d7d25c9f1a9c1f27e2b7802188705957cda8095a202a533d
python_version=3
nodebug=yes # -dbg package is generated below manually
From 05a65366e9068a82d46869d01310159df29a8c2d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jul 2022 10:21:56 +0200
Subject: [PATCH 385/608] libvirt: update to 8.5.0.
---
srcpkgs/libvirt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index acccee487bee..da6bb0480fa8 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
# Template file for 'libvirt'
pkgname=libvirt
-version=8.4.0
+version=8.5.0
revision=1
build_style=meson
configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://libvirt.org"
changelog="https://libvirt.org/news.html"
distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=601a6e9bb03a43d05659f63e4a403df253ab0975b4a973f10a5607f3bbc018dd
+checksum=401e99b5e1b83de39a86347e091a85eb4dba82a87053dfcb5aa250328f97db62
# At least one test times out on CI but works locally
make_check=ci-skip
From c9ddaaa74a50374db94cf2ceccc1e100a4bda685 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 2 Jul 2022 10:25:23 +0200
Subject: [PATCH 386/608] libvirt-python3: update to 8.5.0.
---
srcpkgs/libvirt-python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 70bd2af43cfe..e7c07e23a344 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
# Template file for 'libvirt-python3'
pkgname=libvirt-python3
-version=8.4.0
+version=8.5.0
revision=1
wrksrc="libvirt-python-${version}"
build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="LGPL-2.1-or-later"
homepage="https://pypi.org/project/libvirt-python/"
distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=6d252ad4e0f765620bbde450be8f2b844e4f85c568b207ac644f52c6a982f46c
+checksum=5ceb23983bb0968250b95110f4e7a5321cc30044d7d89209654413315452777f
do_check() {
PYTHONPATH="$(cd build/lib.* && pwd)" pytest
From ee9d1de8393d84fec046a616073dc35a9643d86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 2 Jul 2022 15:41:11 +0700
Subject: [PATCH 387/608] grpc: split libgrpc, ship plugin on cross-compile
Why we're at it, clean build steps, remove all reference to absl in
pkg-config and cmake config.
---
common/shlibs | 24 ++++-----
srcpkgs/grpc/patches/absl-is-private.patch | 58 ++++++++++++++++++++++
srcpkgs/grpc/template | 30 ++++++-----
srcpkgs/libgrpc | 1 +
4 files changed, 89 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/grpc/patches/absl-is-private.patch
create mode 120000 srcpkgs/libgrpc
diff --git a/common/shlibs b/common/shlibs
index 092894ad8d1e..7e4bcbef47f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3659,18 +3659,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
libaal-1.0.so.7 libaal-1.0.7_1
libaal-minimal.so.0 libaal-1.0.7_1
libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.18 grpc-1.39.0_1
-libgpr.so.18 grpc-1.39.0_1
-libgrpc++.so.1.39 grpc-1.39.0_1
-libgrpc++_alts.so.1.39 grpc-1.39.0_1
-libgrpc++_error_details.so.1.39 grpc-1.39.0_1
-libgrpc++_reflection.so.1.39 grpc-1.39.0_1
-libgrpc++_unsecure.so.1.39 grpc-1.39.0_1
-libgrpc.so.18 grpc-1.39.0_1
-libgrpc_plugin_support.so.1.39 grpc-1.39.0_1
-libgrpc_unsecure.so.18 grpc-1.39.0_1
-libgrpcpp_channelz.so.1.39 grpc-1.39.0_1
-libupb.so.18 grpc-1.39.0_1
+libaddress_sorting.so.18 libgrpc-1.39.0_6
+libgpr.so.18 libgrpc-1.39.0_6
+libgrpc++.so.1.39 libgrpc-1.39.0_6
+libgrpc++_alts.so.1.39 libgrpc-1.39.0_6
+libgrpc++_error_details.so.1.39 libgrpc-1.39.0_6
+libgrpc++_reflection.so.1.39 libgrpc-1.39.0_6
+libgrpc++_unsecure.so.1.39 libgrpc-1.39.0_6
+libgrpc.so.18 libgrpc-1.39.0_6
+libgrpc_plugin_support.so.1.39 libgrpc-1.39.0_6
+libgrpc_unsecure.so.18 libgrpc-1.39.0_6
+libgrpcpp_channelz.so.1.39 libgrpc-1.39.0_6
+libupb.so.18 libgrpc-1.39.0_6
libircclient.so.1 libircclient-1.10_5
libFAudio.so.0 FAudio-19.05_1
libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/patches/absl-is-private.patch b/srcpkgs/grpc/patches/absl-is-private.patch
new file mode 100644
index 000000000000..a79277a26806
--- /dev/null
+++ b/srcpkgs/grpc/patches/absl-is-private.patch
@@ -0,0 +1,58 @@
+--- grpc-1.39.1.orig/CMakeLists.txt
++++ grpc-1.39.1/CMakeLists.txt
+@@ -15856,7 +15865,7 @@ generate_pkgconfig(
+ "gpr"
+ "gRPC platform support library"
+ "${gRPC_CORE_VERSION}"
+- "absl_base absl_memory absl_optional absl_status absl_str_format absl_strings absl_synchronization absl_time"
++ ""
+ "-lgpr"
+ ""
+ "gpr.pc")
+@@ -15866,7 +15875,7 @@ generate_pkgconfig(
+ "gRPC"
+ "high performance general RPC framework"
+ "${gRPC_CORE_VERSION}"
+- "gpr openssl absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
++ "gpr openssl"
+ "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
+ ""
+ "grpc.pc")
+@@ -15876,7 +15885,7 @@ generate_pkgconfig(
+ "gRPC unsecure"
+ "high performance general RPC framework without SSL"
+ "${gRPC_CORE_VERSION}"
+- "gpr absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
++ "gpr"
+ "-lgrpc_unsecure"
+ ""
+ "grpc_unsecure.pc")
+@@ -15886,7 +15895,7 @@ generate_pkgconfig(
+ "gRPC++"
+ "C++ wrapper for gRPC"
+ "${gRPC_CPP_VERSION}"
+- "grpc absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
++ "grpc"
+ "-lgrpc++"
+ ""
+ "grpc++.pc")
+@@ -15896,7 +15905,7 @@ generate_pkgconfig(
+ "gRPC++ unsecure"
+ "C++ wrapper for gRPC without SSL"
+ "${gRPC_CPP_VERSION}"
+- "grpc_unsecure absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time"
++ "grpc_unsecure"
+ "-lgrpc++_unsecure"
+ ""
+ "grpc++_unsecure.pc")
+--- grpc-1.39.1.orig/cmake/pkg-config-template.pc.in
++++ grpc-1.39.1/cmake/pkg-config-template.pc.in
+@@ -6,7 +6,7 @@ libdir=${exec_prefix}/lib
+ Name: @PC_NAME@
+ Description: @PC_DESCRIPTION@
+ Version: @PC_VERSION@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/grpc_absl
+ Requires: @PC_REQUIRES@
+ Libs: -L${libdir} @PC_LIB@
+ Libs.private: @PC_LIBS_PRIVATE@
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 9b35682fdb17..765d4213a648 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
# Template file for 'grpc'
pkgname=grpc
version=1.39.1
-revision=5
+revision=6
_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
@@ -39,23 +39,29 @@ post_extract() {
post_patch() {
# re2 doesn't install CMake config modules;
# key variables are set in configure_args
- vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d'
-}
-
-post_build() {
- # Clean up unneeded absl linker arguments from pkgconfig files
- sed -e 's/-labsl_[^[:space:]]\+[[:space:]]*//g' \
- -i build/lib/pkgconfig/*.pc
+ # also install all plugin on cross-compiling
+ vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d' \
+ -e 's/gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING/gRPC_INSTALL/'
}
post_install() {
- # Remove unnecessary absl static libs and cmake modules
+ # Remove unnecessary absl static libs, pkg-config and cmake modules
rm "${DESTDIR}"/usr/lib/libabsl*.a
+ rm -rf "${DESTDIR}/usr/lib/pkgconfig/"absl_*
rm -rf "${DESTDIR}/usr/lib/cmake/absl"
- # Add custom absl include root to grpcpp cflags
- vsed -e 's,^Cflags:.*,& -I${includedir}/grpc_absl,' \
- -i ${DESTDIR}/usr/lib/pkgconfig/grpc++*.pc
+ # Clean up unneeded absl linker arguments from cmake files
+ sed -e 's/absl::[a-zA-Z_-]*;//g' \
+ -e 's/ "absl::[a-zA-Z_-]*"/ /g' \
+ -i ${DESTDIR}/usr/lib/cmake/grpc/gRPCTargets.cmake
+}
+
+libgrpc_package() {
+ short_desc+=" - libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share
+ }
}
grpc-devel_package() {
diff --git a/srcpkgs/libgrpc b/srcpkgs/libgrpc
new file mode 120000
index 000000000000..e5f1f1766d34
--- /dev/null
+++ b/srcpkgs/libgrpc
@@ -0,0 +1 @@
+grpc
\ No newline at end of file
From 26c2e3ae91204df5fde09c0870497434265b7418 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 14:34:56 +0200
Subject: [PATCH 388/608] uftrace: update to 0.12.
---
srcpkgs/uftrace/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index bd4f9e01118f..dc02ffb24ec2 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -1,6 +1,6 @@
# Template file for 'uftrace'
pkgname=uftrace
-version=0.11
+version=0.12
revision=1
archs="x86_64* i686* aarch64* arm*"
build_style=configure
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://github.com/namhyung/uftrace"
distfiles="https://github.com/namhyung/uftrace/archive/v${version}.tar.gz"
-checksum=101dbb13cb3320ee76525ec26426f2aa1de4e3ee5af74f79cb403ae4d2c6c871
+checksum=2aad01f27d4f18717b681824c7a28ac3e1efd5e7bbed3ec888a3ea5af60e3700
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone"; export LDFLAGS=-largp;;
From 20d10795f994db91f379501362017664e9e24abe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 14:38:20 +0200
Subject: [PATCH 389/608] ugrep: update to 3.8.3.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index db31f14bbfb3..ff4fdce87528 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.8.2
+version=3.8.3
revision=1
build_style=gnu-configure
makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a5f9bf2ab204b05f34f752321ad96ab950a86a955737d313886614742e9c5fbe
+checksum=deb7e143ee07019fdaa98a4529596d965185542a195855c1bfb6779fb8dd5e55
post_install() {
vlicense LICENSE.txt LICENSE
From 76eb01fe649d325a5b752a3513df8b45bbb05a35 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 14:39:19 +0200
Subject: [PATCH 390/608] nsd: update to 4.6.0.
---
srcpkgs/nsd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 2e42a1014fb0..3ba577bb3640 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
# Template file for 'nsd'
pkgname=nsd
-version=4.5.0
+version=4.6.0
revision=1
build_style=gnu-configure
configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://www.nlnetlabs.nl/projects/nsd/"
changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5ae7a704ab92c8a49f3c8f3a29565ce194c51a721c29c75ea7d43c13372d79c5
+checksum=09062d9b83dfcdde4e4e53ec3615496d68c2821d8381d0d464ebea31a5975c81
system_accounts="nsd"
nsd_homedir=/var/db/nsd
make_dirs="/var/db/nsd 0755 nsd nsd"
From 1b6686d942a55bbe899f91fb3d641e1e9c435f80 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 14:56:56 +0200
Subject: [PATCH 391/608] sbcl: update to 2.2.6.
---
srcpkgs/sbcl/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 43e3045f5fc9..cb023f8a731d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,11 +1,11 @@
# Template file for 'sbcl'
pkgname=sbcl
-version=2.2.5
+version=2.2.6
revision=1
# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
hostmakedepends="iana-etc texinfo"
-makedepends="zlib-devel"
+makedepends="libzstd-devel zlib-devel"
conf_files="/etc/sbclrc"
short_desc="Steel Bank Common Lisp"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -13,7 +13,7 @@ license="custom:BSD+public_domain"
homepage="http://www.sbcl.org/"
changelog="http://www.sbcl.org/news.html"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8584b541370fd6ad6e58d3f97982077dfcab240f30d4e9b18f15da91c2f13ed1
+checksum=3e23048c8fa826fb913220beb2ac3697dbc5c0cdf2e89fed8db39ed1712304a0
nocross=yes
nopie=yes
@@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
case "$XBPS_TARGET_MACHINE" in
x86_64)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
- checksum+=" 9e8a2824ba2024a212f642536e6420bbfedfe07446cabe12d568ead52cdd95db"
+ checksum+=" 9fd7132a10270a4929fcd07291c8fe66bdb51cf0f024f0cbec7fc02eb9595996"
;;
arm*)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"
From f03cbe2800df5427f329ef6638b46988dc8024ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 2 Jul 2022 21:13:57 +0700
Subject: [PATCH 392/608] grpc: fix libre2 reference in cross-compiled cmake
---
srcpkgs/grpc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 765d4213a648..6410f6692a13 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,13 +1,13 @@
# Template file for 'grpc'
pkgname=grpc
version=1.39.1
-revision=6
+revision=7
_abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
-DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
-DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package
- -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
+ -D_gRPC_RE2_LIBRARIES=-lre2
-D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
hostmakedepends="which protobuf"
_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
From a9c15f886218ed40ae511ac3eb79af03bc6df47d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 17:12:36 +0200
Subject: [PATCH 393/608] sbcl: fix non-simd platforms.
---
srcpkgs/sbcl/patches/docstrings.patch | 77 +++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
create mode 100644 srcpkgs/sbcl/patches/docstrings.patch
diff --git a/srcpkgs/sbcl/patches/docstrings.patch b/srcpkgs/sbcl/patches/docstrings.patch
new file mode 100644
index 000000000000..c296e96efb1e
--- /dev/null
+++ b/srcpkgs/sbcl/patches/docstrings.patch
@@ -0,0 +1,77 @@
+From 900eff6ae477b2674b8504d5420d565ca09ac813 Mon Sep 17 00:00:00 2001
+From: Robert Schiele <rschiele@gmail.com>
+Date: Fri, 24 Jun 2022 16:50:54 +0200
+Subject: [PATCH] take contrib blocklist into account for doc generation
+
+If some contrib module is blocked for building also block it in
+documentation generation since this will fail otherwise.
+
+Additionally this fixes a shift operation that is needed
+unconditionally when parsing the script parameters since otherwise
+the first parameter is used for the second parameter as well if it
+turns out to be empty.
+---
+ doc/manual/generate-texinfo.lisp | 9 +++++----
+ doc/manual/make-tempfiles.sh | 8 +++++---
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/doc/manual/generate-texinfo.lisp b/doc/manual/generate-texinfo.lisp
+index 83451754d..44e5edca8 100644
+--- a/doc/manual/generate-texinfo.lisp
++++ b/doc/manual/generate-texinfo.lisp
+@@ -32,8 +32,9 @@
+ finally (return result)))
+
+ (defun generate-docstrings-texinfo (runtime
+- &key (docstring-directory "docstrings/"))
+- (let* ((contribs (sort (documented-contribs) #'string< :key #'car))
++ &key (docstring-directory "docstrings/")
++ (blocklist '()))
++ (let* ((contribs (sort (documented-contribs :exclude (append '("asdf") blocklist)) #'string< :key #'car))
+ (packages (sort (append *documented-packages*
+ (map 'list #'cdr contribs))
+ #'string<)))
+@@ -92,10 +93,10 @@
+ \f
+ ;;;; Entry point
+
+-(destructuring-bind (program runtime docstring-directory) *posix-argv*
++(destructuring-bind (program runtime docstring-directory blocklist) *posix-argv*
+ (declare (ignore program))
+ (generate-docstrings-texinfo
+- runtime :docstring-directory docstring-directory)
++ runtime :docstring-directory docstring-directory :blocklist (uiop:split-string blocklist))
+
+ (expand-variables)
+ (generate-external-format-texinfo))
+diff --git a/doc/manual/make-tempfiles.sh b/doc/manual/make-tempfiles.sh
+index bf36ab1ec..faf1bbbf9 100644
+--- a/doc/manual/make-tempfiles.sh
++++ b/doc/manual/make-tempfiles.sh
+@@ -26,18 +26,20 @@ if [ -z "$1" ] ; then
+ else
+ SBCLRUNTIME="`command -v sbcl`"
+ fi
++ . $SBCL_TOP/output/build-config
+ else
+ SBCLRUNTIME="$1"
+- shift
++ SBCL_CONTRIB_BLOCKLIST=
+ fi
++shift
+
+ if [ -z "$1" ] ; then
+ DOCSTRINGDIR="${DOCSTRINGDIR:-docstrings/}"
+ else
+ DOCSTRINGDIR="$1"
+- shift
+ fi
++shift
+
+ ${SBCLRUNTIME} \
+ --noinform --no-sysinit --no-userinit --noprint --disable-debugger \
+- --script generate-texinfo.lisp "${SBCLRUNTIME}" "${DOCSTRINGDIR}"
++ --script generate-texinfo.lisp "${SBCLRUNTIME}" "${DOCSTRINGDIR}" "${SBCL_CONTRIB_BLOCKLIST}"
+--
+2.36.1
+
From 27488aa54d484884b2657b366cc6bef4ae12b530 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 17:15:13 +0200
Subject: [PATCH 394/608] linux5.18: update to 5.18.9.
---
srcpkgs/linux5.18/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index be6582401d64..d32cba55c931 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.18'
pkgname=linux5.18
-version=5.18.7
+version=5.18.9
revision=1
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="51f3f1684a896e797182a0907299cc1f0ff5e5b51dd9a55478ae63a409855cee
- 783de8b66193fd9bd2acabad8fdc7a14ac74aca35b7e606b10ac94ced77b430e"
+ 8d508fd3ae9ea8921405c3ef6d9364e633f9154d88a6da0794714a78c3a884ea"
skip_extraction="patch-${version}.xz"
python_version=3
From 9ad5e562cf9774830617f65b3a4f9f401e224730 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 17:16:00 +0200
Subject: [PATCH 395/608] linux5.15: update to 5.15.52.
---
srcpkgs/linux5.15/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a54741bf8478..e2059fc5af90 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.15'
pkgname=linux5.15
-version=5.15.50
+version=5.15.52
revision=1
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 16bfe772c0ac272bc4b5be68b3e1aead51eebdab2d61b360a0d18126f52c50a8"
+ 6553acafe1e1b71ae05e32d38b5d1c4008f2833af29fc664cdcd4b6cfee46b6c"
skip_extraction="patch-${version}.xz"
python_version=3
From 2c09eb2989b117d7f20fc7b22f527bb7ecfc8a9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 17:17:21 +0200
Subject: [PATCH 396/608] linux5.10: update to 5.10.128.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 781879543adc..7aff9ab6aae8 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.125
+version=5.10.128
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=b9356ea02532c063f0b19a82e67c2afbd7c5460184fce7011222cf8667568f60
+checksum=ec59e9d208d7ddf949bf45e780f1df984763b2e31e2b8d888d7d3092741cd34b
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From e5cba7a74a330987ee2e3f332b4a82b6065ccd3d Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 2 Jul 2022 05:04:18 +0200
Subject: [PATCH 397/608] gsmartcontrol: update to 1.1.4.
---
.../{INSTALL.msg => files/README.voidlinux} | 3 +--
srcpkgs/gsmartcontrol/template | 11 ++++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
rename srcpkgs/gsmartcontrol/{INSTALL.msg => files/README.voidlinux} (73%)
diff --git a/srcpkgs/gsmartcontrol/INSTALL.msg b/srcpkgs/gsmartcontrol/files/README.voidlinux
similarity index 73%
rename from srcpkgs/gsmartcontrol/INSTALL.msg
rename to srcpkgs/gsmartcontrol/files/README.voidlinux
index 6890d48eeb0e..3b74ae753f71 100644
--- a/srcpkgs/gsmartcontrol/INSTALL.msg
+++ b/srcpkgs/gsmartcontrol/files/README.voidlinux
@@ -1,7 +1,6 @@
* gsmartcontrol needs elevated privileges, so its desktop menu entry requires
a running polkit authentication agent. Almost all desktop shell environments
- provide it. You can also use lxpolkit (from lxsession) that is a lightweighti
- polkit auth agent.
+ provide it. You can also use lxsession's lxpolkit, a light polkit auth agent.
* action "options > update Drive Database" does not work since
smartmontools package does not provide this feature.
diff --git a/srcpkgs/gsmartcontrol/template b/srcpkgs/gsmartcontrol/template
index 3574f4a63770..7f20e697a921 100644
--- a/srcpkgs/gsmartcontrol/template
+++ b/srcpkgs/gsmartcontrol/template
@@ -1,7 +1,7 @@
# Template file for 'gsmartcontrol'
pkgname=gsmartcontrol
-version=1.1.3
-revision=5
+version=1.1.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtkmm-devel pcre-devel desktop-file-utils"
@@ -9,11 +9,12 @@ depends="smartmontools hicolor-icon-theme"
short_desc="GUI to smartmontools"
maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-2.0-or-later"
-homepage="http://gsmartcontrol.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=b64f62cffa4430a90b6d06cd52ebadd5bcf39d548df581e67dfb275a673b12a9
+homepage="https://gsmartcontrol.shaduri.dev"
+distfiles="https://github.com/ashaduri/gsmartcontrol/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
+checksum=fc409f2b8a84cc40bb103d6c82401b9d4c0182d5a3b223c93959c7ad66191847
post_install() {
# license files uneeded
rm -f ${DESTDIR}/usr/share/doc/${pkgname}/LICENSE_*
+ vdoc ${FILESDIR}//README.voidlinux
}
From 85a5373c429232e6a0303f5d44f9c3bf0afac6af Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 2 Jul 2022 22:00:15 +0200
Subject: [PATCH 398/608] dino: backport fix for quote formatting.
Upstream:
https://github.com/dino/dino/commit/1309d7e2e42a1fdced3127c641f108fb72cc2fdd
---
srcpkgs/dino/patches/quote.patch | 22 ++++++++++++++++++++++
srcpkgs/dino/template | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dino/patches/quote.patch
diff --git a/srcpkgs/dino/patches/quote.patch b/srcpkgs/dino/patches/quote.patch
new file mode 100644
index 000000000000..7e469cf65180
--- /dev/null
+++ b/srcpkgs/dino/patches/quote.patch
@@ -0,0 +1,22 @@
+From 1309d7e2e42a1fdced3127c641f108fb72cc2fdd Mon Sep 17 00:00:00 2001
+From: fiaxh <git@lightrise.org>
+Date: Mon, 14 Feb 2022 23:49:45 +0100
+Subject: [PATCH] Fix quote formating to not (partially) expect a space after >
+
+---
+ main/src/ui/util/helper.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala
+index 51f0cc9c1..427c2d3a2 100644
+--- a/main/src/ui/util/helper.vala
++++ b/main/src/ui/util/helper.vala
+@@ -259,7 +259,7 @@ public static string parse_add_markup_theme(string s_, string? highlight_word, b
+ theme_dependent = true;
+ quote_match_info.fetch_pos(0, out start, out end);
+ return parse_add_markup_theme(s[0:start], highlight_word, parse_links, parse_text_markup, parse_quotes, dark_theme, ref theme_dependent, already_escaped) +
+- @"<span color='$dim_color'>$gt " + parse_add_markup_theme(s[start + gt.length + 1:end], highlight_word, parse_links, parse_text_markup, false, dark_theme, ref theme_dependent, already_escaped) + "</span>" +
++ @"<span color='$dim_color'>$gt" + parse_add_markup_theme(s[start + gt.length:end], highlight_word, parse_links, parse_text_markup, false, dark_theme, ref theme_dependent, already_escaped) + "</span>" +
+ parse_add_markup_theme(s[end:s.length], highlight_word, parse_links, parse_text_markup, parse_quotes, dark_theme, ref theme_dependent, already_escaped);
+ }
+ }
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 4c8255603289..3d4008790b24 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
# Template file for 'dino'
pkgname=dino
version=0.3.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON"
hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"
From 9e123a91e0ba81d9afcf3692784a6fdde258eadb Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Sat, 2 Jul 2022 01:44:17 -0700
Subject: [PATCH 399/608] gandi-cli: remove package.
Upstream archived August 2021.
---
srcpkgs/gandi-cli/template | 20 --------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/gandi-cli/template
diff --git a/srcpkgs/gandi-cli/template b/srcpkgs/gandi-cli/template
deleted file mode 100644
index 71cbc44cc7d7..000000000000
--- a/srcpkgs/gandi-cli/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'gandi-cli'
-pkgname=gandi-cli
-version=1.6
-revision=2
-wrksrc="gandi.cli-${version}"
-build_style=python3-module
-hostmakedepends="python3-docutils python3-setuptools"
-depends="python3-setuptools python3-IPy python3-click python3-requests python3-yaml"
-checkdepends="$depends python3-pytest-cov"
-short_desc="Command line interface to Gandi.net"
-maintainer="Lon Willett <xgit@lonw.net>"
-license="GPL-3.0-or-later"
-homepage="http://cli.gandi.net"
-distfiles="https://github.com/Gandi/gandi.cli/archive/${version}.tar.gz"
-checksum=f9a8140604c2f8ff2bef31851456906d301bfef2a36101280bbaf531a05cb52e
-
-post_install() {
- rst2man --no-generator gandicli.man.rst > gandi.1
- vman gandi.1
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f8cb33ef4098..0ccc276d6820 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -81,6 +81,7 @@ replaces="
fontmatrix<=0.6.0.20171228_2
freshplayerplugin<=0.3.9_9
fuse-usmb<=20130204_7
+ gandi-cli<=1.6_2
gconf-editor<=3.0.1_3
gegl3<=0.3.28_2
gens-gs<=2.16.7_2
From e3165058602eb00f7c5a2069d0978fc6a5a175fd Mon Sep 17 00:00:00 2001
From: Sebastian Uharek <uharek@friendship-systems.com>
Date: Fri, 1 Jul 2022 19:56:56 +0200
Subject: [PATCH 400/608] k9s: update to 0.25.21
---
srcpkgs/k9s/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 44e326c54e34..e700fe95a3c3 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
# Template file for 'k9s'
pkgname=k9s
-version=0.25.18
+version=0.25.21
revision=1
build_style=go
go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://k9scli.io/"
distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=2a911c57011164c0f11e3cdf763182abf189efde80b7a764e361aa070b7e3f46
+checksum=751525f86cf77f6fa50014dbf69dcc13c55079ffabc467a83c4c592e78479535
# fix: collect2: fatal error: cannot find 'ld'
export LDFLAGS="-fuse-ld=bfd"
From 853baf771ca9a38b211a4d4c69fdbceaacecbd2d Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Sun, 20 Feb 2022 01:41:25 +0200
Subject: [PATCH 401/608] New package: CKAN-1.30.4
---
srcpkgs/CKAN/template | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 srcpkgs/CKAN/template
diff --git a/srcpkgs/CKAN/template b/srcpkgs/CKAN/template
new file mode 100644
index 000000000000..4bc12f642bcd
--- /dev/null
+++ b/srcpkgs/CKAN/template
@@ -0,0 +1,28 @@
+# Template file for 'CKAN'
+pkgname=CKAN
+version=1.30.4
+revision=1
+archs="x86_64* i686*" # Only support archs that are supported by KSP itself
+hostmakedepends="curl msbuild-bin"
+makedepends="libgdiplus"
+depends="libgdiplus mono"
+short_desc="Find, install, and manage mods for Kerbal Space Program"
+maintainer="Eugen Zagorodniy <zag@disroot.org>"
+license="MIT"
+homepage="https://github.com/KSP-CKAN/CKAN"
+changelog="https://raw.githubusercontent.com/KSP-CKAN/CKAN/master/CHANGELOG.md"
+distfiles="https://github.com/KSP-CKAN/CKAN/archive/refs/tags/v$version.tar.gz"
+checksum=7c73543bf109fd1bc7917bb1955acaab14086e709e92351d4a6b10d780d53d23
+
+do_build() {
+ ./build --configuration=Release
+}
+
+do_install() {
+ vbin debian/ckan
+ vman debian/ckan.1
+ vlicense debian/copyright
+ vinstall _build/ckan.exe 644 /usr/lib/ckan
+ vinstall debian/ckan.desktop 644 /usr/share/applications
+ vinstall debian/ckan.ico 644 /usr/share/icons
+}
From 13a88eb0d8f041de53c9d1ee178dac5e88306bd1 Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 1 Jul 2022 18:40:44 +0300
Subject: [PATCH 402/608] msbuild-bin: update to 16.10.1.
---
srcpkgs/msbuild-bin/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/msbuild-bin/template b/srcpkgs/msbuild-bin/template
index feae5ed72e4b..e5332b295954 100644
--- a/srcpkgs/msbuild-bin/template
+++ b/srcpkgs/msbuild-bin/template
@@ -1,8 +1,8 @@
# Template file for 'msbuild-bin'
-_xamarin_rel="xamarinxplat.2020.04.29.14.43-0xamarin5+ubuntu2004b1"
+_xamarin_rel="xamarinxplat.2021.05.26.14.00-0xamarin2+ubuntu2004b1"
pkgname=msbuild-bin
-version=16.6
-revision=2
+version=16.10.1
+revision=1
build_style=fetch
depends="mono"
short_desc="Xamarin/Mono fork of the Microsoft Build system"
@@ -10,7 +10,7 @@ maintainer="Aloz1 <kno0001@gmail.com>"
license="MIT"
homepage="https://github.com/mono/msbuild"
distfiles="http://download.mono-project.com/repo/ubuntu/pool/main/m/msbuild/msbuild_${version}+${_xamarin_rel}_all.deb"
-checksum=042bb1da521877e8ff4b2dd157304a7130bb489a3abe0642a0f9e7ff37b4f099
+checksum=32f1eba1c2df67bc55920cd45ce3689c32a5c705ae01fd7ead52ca180221b469
do_extract() {
bsdtar xf ${XBPS_SRCDISTDIR}/msbuild-bin-${version}/msbuild_${version}+${_xamarin_rel}_all.deb
From 72a788506dc9a0e3d927c8e02816212c2a36c12a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Jul 2022 20:23:54 -0400
Subject: [PATCH 403/608] .github/workflows/: set token permissions
---
.github/workflows/cycles.yml | 2 ++
.github/workflows/stale.yml | 3 +++
2 files changed, 5 insertions(+)
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 0bd148e77f0a..018c0909bdb1 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -7,6 +7,8 @@ on:
jobs:
cycles:
runs-on: ubuntu-latest
+ permissions:
+ issues: write
container:
image: 'ghcr.io/void-linux/xbps-src-masterdir:20220527RC01-x86_64-musl'
steps:
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 160897fedef1..c55c7966a678 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -9,6 +9,9 @@ on:
jobs:
stale:
runs-on: ubuntu-latest
+ permissions:
+ issues: write
+ pull-requests: write
steps:
- uses: actions/stale@v4
with:
From 0a05fc3d272e98e03b2c9d5656d6db2c9a95c15d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Jul 2022 08:37:05 +0200
Subject: [PATCH 404/608] linux5.4: update to 5.4.203.
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 13a8fb7496bf..d8ff2be7236e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.4'
pkgname=linux5.4
-version=5.4.202
+version=5.4.203
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=5ca1bce19eab6a07d7d25c9f1a9c1f27e2b7802188705957cda8095a202a533d
+checksum=fc933f5b13066cfa54aacb5e86747a167bad1d8d23972e4a03ab5ee36c29798a
python_version=3
nodebug=yes # -dbg package is generated below manually
From fa68de2f395a562076dd948f37353d11882a5594 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Jul 2022 08:40:58 +0200
Subject: [PATCH 405/608] linux4.19: update to 4.19.250.
---
srcpkgs/linux4.19/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 29b67f43ea24..bae808a0e993 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
# Template file for 'linux4.19'
pkgname=linux4.19
-version=4.19.249
+version=4.19.250
revision=1
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-only"
homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=ce4bbd420271bb9b6c09842c0d7201c7ba9d136f7025cf0fd7500c95e3f55191
+checksum=6ee30a46f3fa6576602085b7b4b0c640586f99d1c110982db411819308b5755c
python_version=3
nodebug=yes # -dbg package is generated below manually
From 5907e66793f0c62827df200f424ba80961c982c9 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Sun, 3 Jul 2022 03:30:31 +0530
Subject: [PATCH 406/608] New package: xfce4-datetime-plugin-0.8.1
---
srcpkgs/xfce4-datetime-plugin/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/xfce4-datetime-plugin/template
diff --git a/srcpkgs/xfce4-datetime-plugin/template b/srcpkgs/xfce4-datetime-plugin/template
new file mode 100644
index 000000000000..a0cad51eea8e
--- /dev/null
+++ b/srcpkgs/xfce4-datetime-plugin/template
@@ -0,0 +1,15 @@
+# Template file for 'xfce4-datetime-plugin'
+pkgname=xfce4-datetime-plugin
+version=0.8.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="xfce4-panel-devel"
+short_desc="Date and time display plugin for the Xfce panel"
+maintainer="Ishaan Bhimwal <ishaanbhimwal@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-datetime-plugin/-/raw/master/NEWS"
+distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/${version%.*}/xfce4-datetime-plugin-${version}.tar.bz2"
+checksum=e9f6f15be29ceb5c45718006b46dbd19b89981617d0768b2ef942b5a70af2540
From 26e42e62a5dcd058adcd71cd4c1f7b670a570d76 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Fri, 1 Jul 2022 00:30:33 +0200
Subject: [PATCH 407/608] wayland: update to 1.21.0.
---
srcpkgs/wayland/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 5ea25eaad1ce..697663da10f8 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -1,18 +1,18 @@
# Template file for 'wayland'
pkgname=wayland
-version=1.20.0
+version=1.21.0
revision=1
build_style=meson
# "Tests must not be built with NDEBUG defined, they rely on assert()."
configure_args="-Ddocumentation=false -Db_ndebug=false"
hostmakedepends="flex pkg-config"
makedepends="expat-devel libffi-devel libfl-devel libxml2-devel"
-short_desc="Wayland protocol compositor"
+short_desc="Core Wayland window system code and protocol"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
homepage="https://wayland.freedesktop.org/"
-distfiles="https://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
-checksum=b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725
+distfiles="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/wayland-${version}.tar.xz"
+checksum=6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wayland-devel"
From 489d60a063ee382826d42bd08d1a1c8086ad7f45 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 2 Jul 2022 16:14:49 +0200
Subject: [PATCH 408/608] goatcounter: update to 2.2.3, add service
---
srcpkgs/goatcounter/files/README.voidlinux | 16 ++++++++++++++++
srcpkgs/goatcounter/files/goatcounter/log/run | 2 ++
srcpkgs/goatcounter/files/goatcounter/run | 7 +++++++
srcpkgs/goatcounter/template | 13 ++++++++++---
4 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/goatcounter/files/README.voidlinux
create mode 100755 srcpkgs/goatcounter/files/goatcounter/log/run
create mode 100755 srcpkgs/goatcounter/files/goatcounter/run
diff --git a/srcpkgs/goatcounter/files/README.voidlinux b/srcpkgs/goatcounter/files/README.voidlinux
new file mode 100644
index 000000000000..1aa1c94b83a3
--- /dev/null
+++ b/srcpkgs/goatcounter/files/README.voidlinux
@@ -0,0 +1,16 @@
+The system service /etc/sv/goatcounter runs goatcounter as system user _goatcounter.
+
+By default sqlite database is used. The database will be stored in
+/var/db/goatcounter/db.sqlite3.
+
+To initialize the database, make sure you run goatcounter as the _goatcounter user:
+
+$ sudo -u _goatcounter goatcounter db create site \
+ -user.email 'admin@domain.name' \
+ -vhost site.name \
+ -db sqlite+/var/db/goatcounter/db.sqlite3
+
+By default the service listens on 5000 port and does not use TLS. In production
+envirnment you must adjust service config by creating /var/goatcounter/conf
+
+OPTS=-listen ... -db ...
diff --git a/srcpkgs/goatcounter/files/goatcounter/log/run b/srcpkgs/goatcounter/files/goatcounter/log/run
new file mode 100755
index 000000000000..0713d90a612e
--- /dev/null
+++ b/srcpkgs/goatcounter/files/goatcounter/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.notice -t goatcounter
diff --git a/srcpkgs/goatcounter/files/goatcounter/run b/srcpkgs/goatcounter/files/goatcounter/run
new file mode 100755
index 000000000000..e8f78fc6360c
--- /dev/null
+++ b/srcpkgs/goatcounter/files/goatcounter/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+: "${OPTS:=-db sqlite+/var/db/goatcounter/db.sqlite3?_busy_timeout=200&_journal_mode=wal&cache=shared -listen :5000 -public-port 5000 -tls none}"
+
+exec chpst -u _goatcounter goatcounter serve ${OPTS}
diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index 734920ce5987..9ba8c6fda1c7 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,9 +1,9 @@
# Template file for 'goatcounter'
pkgname=goatcounter
-version=2.0.3
+version=2.2.3
revision=1
build_style=go
-go_import_path=zgo.at/goatcounter
+go_import_path=zgo.at/goatcounter/v2
go_package="${go_import_path}/cmd/goatcounter"
go_ldflags="-X zgo.at/goatcounter.Version=${version}"
depends="tzdata"
@@ -12,4 +12,11 @@ maintainer="Martin Tournoij <martin@arp242.net>"
license="EUPL-1.2"
homepage="https://www.goatcounter.com/"
distfiles="https://github.com/zgoat/goatcounter/archive/v${version}.tar.gz"
-checksum=d7477240602c4d6522fb528276378879cda35dea0ba4b174143e36a410398023
+checksum=5b3b07afda42752d7c9600a8671bbb30e70a98c656505eda99a4e67b309a94fc
+system_accounts="_goatcounter"
+make_dirs="/var/db/goatcounter 0750 _goatcounter _goatcounter"
+
+post_install() {
+ vsv goatcounter
+ vdoc $FILESDIR/README.voidlinux
+}
From 5d0855077b833b3d12f4f9ce7405a35509cb59b2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Jul 2022 19:42:05 +0200
Subject: [PATCH 409/608] RcloneBrowser: do not check for updates by default
---
.../patches/do-not-check-for-updates.patch | 51 +++++++++++++++++++
srcpkgs/RcloneBrowser/template | 2 +-
2 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/RcloneBrowser/patches/do-not-check-for-updates.patch
diff --git a/srcpkgs/RcloneBrowser/patches/do-not-check-for-updates.patch b/srcpkgs/RcloneBrowser/patches/do-not-check-for-updates.patch
new file mode 100644
index 000000000000..56f1ae667451
--- /dev/null
+++ b/srcpkgs/RcloneBrowser/patches/do-not-check-for-updates.patch
@@ -0,0 +1,51 @@
+From 2976c391098c83bce55547db0b8c5d70c046fde1 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Fri, 1 Jul 2022 19:32:55 +0200
+Subject: [PATCH] do not check for updates
+
+---
+ src/main_window.cpp | 4 ++--
+ src/preferences_dialog.cpp | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/main_window.cpp b/src/main_window.cpp
+index 3bf6340..41d4f93 100644
+--- a/src/main_window.cpp
++++ b/src/main_window.cpp
+@@ -527,7 +527,7 @@ void MainWindow::rcloneGetVersion() {
+ // during first run the key might not exist yet
+ if (!(settings->contains("Settings/checkRcloneUpdates"))) {
+ // if checkRcloneUpdates does not exist create new key
+- settings->setValue("Settings/checkRcloneUpdates", true);
++ settings->setValue("Settings/checkRcloneUpdates", false);
+ };
+
+ bool checkRcloneUpdates =
+@@ -605,7 +605,7 @@ void MainWindow::rcloneGetVersion() {
+ // during first run the key might not exist yet
+ if (!(settings->contains("Settings/checkRcloneBrowserUpdates"))) {
+ // if checkRcloneBrowserUpdates does not exist create new key
+- settings->setValue("Settings/checkRcloneBrowserUpdates", true);
++ settings->setValue("Settings/checkRcloneBrowserUpdates", false);
+ };
+
+ bool checkRcloneBrowserUpdates =
+diff --git a/src/preferences_dialog.cpp b/src/preferences_dialog.cpp
+index 1564621..76eb531 100644
+--- a/src/preferences_dialog.cpp
++++ b/src/preferences_dialog.cpp
+@@ -94,9 +94,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) : QDialog(parent) {
+ settings->value("Settings/defaultRcloneOptions").toString());
+
+ ui.checkRcloneBrowserUpdates->setChecked(
+- settings->value("Settings/checkRcloneBrowserUpdates", true).toBool());
++ settings->value("Settings/checkRcloneBrowserUpdates", false).toBool());
+ ui.checkRcloneUpdates->setChecked(
+- settings->value("Settings/checkRcloneUpdates", true).toBool());
++ settings->value("Settings/checkRcloneUpdates", false).toBool());
+
+ if (QSystemTrayIcon::isSystemTrayAvailable()) {
+ ui.alwaysShowInTray->setChecked(
+--
+2.37.0
+
diff --git a/srcpkgs/RcloneBrowser/template b/srcpkgs/RcloneBrowser/template
index b96d82b57f8c..c3fecd0afb50 100644
--- a/srcpkgs/RcloneBrowser/template
+++ b/srcpkgs/RcloneBrowser/template
@@ -1,7 +1,7 @@
# Template file for 'RcloneBrowser'
pkgname=RcloneBrowser
version=1.8.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-devel"
makedepends="qt5-devel"
From 522c4367e4bdcb9d3c916d12a6f36cedd7c0f682 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 22 Jun 2022 22:52:43 -0500
Subject: [PATCH 410/608] gns3-server: update to 2.2.33.1.
---
srcpkgs/gns3-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 9b8660a43179..db9075e7a5a7 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
# Template file for 'gns3-server'
pkgname=gns3-server
-version=2.2.32
+version=2.2.33.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://gns3.com"
changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=9e208622f91fdca217964e9b93121d85b1415f7d26ba106be035a079beb21519
+checksum=f28ca99f8970757bf036801a93ffdb174ea00da02e8d60e87d44cf43e1e72aca
# The source archive contains statically linked artifacts for x86_64
# glibc, since this is the only architecture supported by upstream, we
From a6c99866832f497d629b383174eeec66e4cf4242 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 22 Jun 2022 22:52:48 -0500
Subject: [PATCH 411/608] gns3-gui: update to 2.2.33.1.
---
srcpkgs/gns3-gui/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index b5d09ed345dc..c8c891272550 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
# Template file for 'gns3-gui'
pkgname=gns3-gui
-version=2.2.32
+version=2.2.33.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://gns3.com"
changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=a43f51567ac69db894d2ac6e41edf1549bc992ddf98979e1576c59b08571d943
+checksum=2122e6259aa1f9e831a0a8b9a327102d2360b9238966b9475be73d3110dcbca8
post_patch() {
From 7f612232b77222a0996d3ed35b051cd51ff08faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 2 Jul 2022 09:52:02 +0200
Subject: [PATCH 412/608] you-get: update to 0.4.1620.
---
srcpkgs/you-get/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index 7858ee442407..b50a0af1a29c 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,6 +1,6 @@
# Template file for 'you-get'
pkgname=you-get
-version=0.4.1612
+version=0.4.1620
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -9,8 +9,9 @@ short_desc="Dumb downloader that scrapes the web"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
homepage="https://you-get.org/"
+changelog="https://raw.githubusercontent.com/soimort/you-get/develop/CHANGELOG.rst"
distfiles="${PYPI_SITE}/y/you-get/you-get-${version}.tar.gz"
-checksum=94a133b70c27d699c02eec03880d4893df97095c8ef943286effa15eed269f9c
+checksum=c020da4fd373d59892b2a1705f53d71eae9017a7e32d123dc30bef5b172660e6
post_install() {
vlicense LICENSE.txt
From 94503ea6e61e35b54760ae2025a64f5363de27fe Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Sun, 3 Jul 2022 19:20:06 +0700
Subject: [PATCH 413/608] phoronix-test-suite: update to 10.8.4
---
srcpkgs/phoronix-test-suite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 7b1b90a927f5..def8e818c01c 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,6 +1,6 @@
# Template file for 'phoronix-test-suite'
pkgname=phoronix-test-suite
-version=10.8.3
+version=10.8.4
revision=1
wrksrc="$pkgname"
depends="php"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.phoronix-test-suite.com/"
changelog="https://raw.githubusercontent.com/phoronix-test-suite/phoronix-test-suite/master/ChangeLog"
distfiles="https://phoronix-test-suite.com/releases/${pkgname}-${version}.tar.gz"
-checksum=4b742e28a9542fe2b57aacb691159d69d3e1c77d95da6d24b7867889ce84ba80
+checksum=1f2092d536c0a3193efc53e4a50f3cee65c0ef1a78d31e5404f1c663fff7b7f4
do_install() {
vsed -e "s/^\texport PTS_DIR=.*/\texport PTS_DIR=\/usr\/share\/webapps\/${pkgname}/g" -i phoronix-test-suite
From 8d1042b59d1925076bb7aa6f77443b199ecc7f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 3 Jul 2022 19:21:58 +0200
Subject: [PATCH 414/608] sslscan: update to 2.0.15.
---
srcpkgs/sslscan/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
index 3fe1ab72e294..fc845f38897a 100644
--- a/srcpkgs/sslscan/template
+++ b/srcpkgs/sslscan/template
@@ -1,6 +1,6 @@
# Template file for 'sslscan'
pkgname=sslscan
-version=2.0.14
+version=2.0.15
revision=1
build_style=gnu-makefile
makedepends="openssl-devel"
@@ -10,6 +10,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/rbsec/sslscan"
changelog="https://github.com/rbsec/sslscan/raw/master/Changelog"
distfiles="https://github.com/rbsec/sslscan/archive/refs/tags/${version}.tar.gz"
-checksum=0dd9f7d0f08c777dfebb1fd10ba369d3a2fd9b978f262384d30e1f45845a67ba
+checksum=0986ac647098b877f24c863c261bfb7cf545a41fd1120047337dfc44812c69a0
# No test suite
make_check=no
From 3cdf17c3aff379d5e20bd7db625400ae191d788b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 29 Jun 2022 11:11:05 +0200
Subject: [PATCH 415/608] wire-desktop: update to 3.27.2944.
---
srcpkgs/wire-desktop/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index e4ba10088bc8..e2402795f070 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,16 +1,16 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
-version=3.25.2940
+version=3.27.2944
revision=1
wrksrc="${pkgname}-linux-${version}"
-hostmakedepends="nodejs yarn git"
-depends="electron10"
+hostmakedepends="nodejs-lts yarn git"
+depends="electron13"
short_desc="Wire for desktop"
maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wire.com"
distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
-checksum=d1702bb64692b3970c2b49be4621069e7ea40b367be0917632cec50e123e570c
+checksum=378c945e6933855407aa03fe49a934409675bdfc370398c8f21da1fd13832af9
case "$XBPS_MACHINE" in
x86_64*|i686*) ;;
@@ -32,7 +32,7 @@ do_install() {
vmkdir usr/bin
cat << EOF > "wire-desktop.sh"
#!/bin/sh
-exec electron10 "/usr/lib/wire-desktop/app.asar" "\$@"
+exec electron13 "/usr/lib/wire-desktop/app.asar" "\$@"
EOF
vbin wire-desktop.sh wire-desktop
vmkdir usr/share/icons/hicolor/256x256/apps
From 4284780ebbbbd6a509ec5f90e365a18dd211a9fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 29 Jun 2022 11:11:17 +0200
Subject: [PATCH 416/608] electron10: remove package
---
.../musl-patches/chromium-musl-crashpad.patch | 23 -
...omium-musl-default-pthread-stacksize.patch | 31 -
.../musl-patches/chromium-musl-sandbox.patch | 176 -
.../musl-patches/chromium-musl-string_h.patch | 10 -
...chromium-musl_canonicalize_file_name.patch | 13 -
.../musl-patches/chromium-musl_cdefs.patch | 45 -
...omium-musl_define_temp_failure_retry.patch | 18 -
.../musl-patches/chromium-musl_dns.patch | 61 -
.../musl-patches/chromium-musl_exeinfo.patch | 96 -
.../chromium-musl_getcontext.patch | 25 -
.../musl-patches/chromium-musl_mallinfo.patch | 54 -
.../chromium-musl_pread_pwrite64.patch | 18 -
.../chromium-musl_push_back.patch | 13 -
.../chromium-musl_stack_size.patch | 41 -
.../chromium-musl_stack_trace.patch | 44 -
.../chromium-musl_tcp_listen.patch | 14 -
.../chromium-musl_xxx-ppc64le-support.patch | 179 -
.../files/patches/chromium-83-gcc-10.patch | 64 -
...chromium-chromium_atk_optional.patch.patch | 15 -
.../files/patches/chromium-clang-12.patch | 16 -
.../files/patches/chromium-ffmpeg-4.3.patch | 21 -
.../files/patches/chromium-gcc-shared.patch | 20 -
.../patches/chromium-harfbuzz-3.0.0.patch | 20 -
.../files/patches/chromium-libc_malloc.patch | 24 -
.../chromium-skia-harfbuzz-3.0.0.patch | 100 -
.../files/patches/chromium-skia-harmony.patch | 14 -
.../files/patches/chromium-time64.patch | 51 -
.../patches/chromium-toolchain-host.patch | 11 -
.../chromium-xxx-ppc64le-support.patch | 3686 -----------------
.../chromium-xxx-ppc64le-swiftshader.patch | 18 -
...a-script-to-list-patch-targets.patch.patch | 42 -
.../patches/electron-Build-fixes.patch.patch | 47 -
...ectron-dont-assume-python-is-python2.patch | 17 -
...lectron-exclude-content-test-patches.patch | 10 -
.../sndio-files/audio_manager_openbsd.cc | 148 -
.../files/sndio-files/audio_manager_openbsd.h | 65 -
.../files/sndio-files/sndio_input.cc | 200 -
.../files/sndio-files/sndio_input.h | 91 -
.../files/sndio-files/sndio_output.cc | 183 -
.../files/sndio-files/sndio_output.h | 86 -
...a_audio_linux_audio_manager_linux.cc.patch | 43 -
...src_3rdparty_chromium_media_BUILD.gn.patch | 12 -
...dparty_chromium_media_audio_BUILD.gn.patch | 23 -
...ty_chromium_media_media__options.gni.patch | 12 -
srcpkgs/electron10/template | 361 --
srcpkgs/electron10/update | 2 -
srcpkgs/removed-packages/template | 1 +
47 files changed, 1 insertion(+), 6263 deletions(-)
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl-crashpad.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl-sandbox.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl-string_h.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_canonicalize_file_name.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_cdefs.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_dns.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_exeinfo.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_getcontext.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_mallinfo.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_pread_pwrite64.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_push_back.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_stack_size.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_stack_trace.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_tcp_listen.patch
delete mode 100644 srcpkgs/electron10/files/musl-patches/chromium-musl_xxx-ppc64le-support.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-chromium_atk_optional.patch.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-clang-12.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-gcc-shared.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-libc_malloc.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-skia-harmony.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-time64.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-toolchain-host.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch
delete mode 100644 srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-swiftshader.patch
delete mode 100644 srcpkgs/electron10/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
delete mode 100644 srcpkgs/electron10/files/patches/electron-Build-fixes.patch.patch
delete mode 100644 srcpkgs/electron10/files/patches/electron-dont-assume-python-is-python2.patch
delete mode 100644 srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
delete mode 100644 srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc
delete mode 100644 srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.h
delete mode 100644 srcpkgs/electron10/files/sndio-files/sndio_input.cc
delete mode 100644 srcpkgs/electron10/files/sndio-files/sndio_input.h
delete mode 100644 srcpkgs/electron10/files/sndio-files/sndio_output.cc
delete mode 100644 srcpkgs/electron10/files/sndio-files/sndio_output.h
delete mode 100644 srcpkgs/electron10/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
delete mode 100644 srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
delete mode 100644 srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
delete mode 100644 srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
delete mode 100644 srcpkgs/electron10/template
delete mode 100644 srcpkgs/electron10/update
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl-crashpad.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl-crashpad.patch
deleted file mode 100644
index 70cffa3002bb..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl-crashpad.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -26,6 +26,7 @@
-
- #if defined(ARCH_CPU_X86_FAMILY)
- #include <asm/ldt.h>
-+#include <asm/ptrace-abi.h>
- #endif
-
- namespace crashpad {
-
---- a/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-+++ b/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-@@ -17,7 +17,9 @@
-
- #include_next <sys/ptrace.h>
-
-+#if defined(__GLIBC__)
- #include <sys/cdefs.h>
-+#endif
-
- // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
- #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl-default-pthread-stacksize.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
deleted file mode 100644
index d0c1361b8ed1..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc
-index 095c49b..5044bb8 100644
---- a/base/threading/platform_thread_linux.cc
-+++ b/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,7 @@ void TerminateOnThread() {}
-
- size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
- #if !defined(THREAD_SANITIZER)
-- return 0;
-+ return (1 << 23);
- #else
- // ThreadSanitizer bloats the stack heavily. Evidence has been that the
- // default stack size isn't enough for some browser tests.
-diff --git a/chrome/app/shutdown_signal_handlers_posix.cc b/chrome/app/shutdown_signal_handlers_posix.cc
-index 621d441..be21106 100644
---- a/chrome/app/shutdown_signal_handlers_posix.cc
-+++ b/chrome/app/shutdown_signal_handlers_posix.cc
-@@ -187,11 +187,11 @@ void InstallShutdownSignalHandlers(
- g_shutdown_pipe_read_fd = pipefd[0];
- g_shutdown_pipe_write_fd = pipefd[1];
- #if !defined(ADDRESS_SANITIZER)
-- const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
-+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 *8;
- #else
- // ASan instrumentation bloats the stack frames, so we need to increase the
- // stack size to avoid hitting the guard page.
-- const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
-+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 *8;
- #endif
- ShutdownDetector* detector = new ShutdownDetector(
- g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl-sandbox.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl-sandbox.patch
deleted file mode 100644
index f485f6cc75af..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl-sandbox.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 348ab6e..4550f9e 100644
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -139,21 +139,11 @@ namespace sandbox {
- // present (as in newer versions of posix_spawn).
- ResultExpr RestrictCloneToThreadsAndEPERMFork() {
- const Arg<unsigned long> flags(0);
--
-- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
-- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
-- CLONE_SIGHAND | CLONE_THREAD |
-- CLONE_SYSVSEM;
-- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
--
-- const uint64_t kGlibcPthreadFlags =
-- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
-- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
-- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
--
-- const BoolExpr android_test =
-- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
-- flags == kGlibcPthreadFlags);
-+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-+ CLONE_THREAD | CLONE_SYSVSEM;
-+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
-+ CLONE_DETACHED;
-+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
-
- // The following two flags are the two important flags in any vfork-emulating
- // clone call. EPERM any clone call that contains both of them.
-@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
- AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
- (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
-
-- return If(IsAndroid() ? android_test : glibc_test, Allow())
-+ return If(thread_clone_ok, Allow())
- .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
- .Else(CrashSIGSYSClone());
- }
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index 7dbcc87..589262f 100644
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -391,6 +391,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__)
- case __NR_waitpid:
- #endif
-+ case __NR_set_tid_address:
- return true;
- case __NR_clone: // Should be parameter-restricted.
- case __NR_setns: // Privileged.
-@@ -403,7 +404,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
- case __NR_set_thread_area:
- #endif
-- case __NR_set_tid_address:
- case __NR_unshare:
- #if !defined(__mips__) && !defined(__aarch64__)
- case __NR_vfork:
-@@ -513,6 +513,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_mlock:
- case __NR_munlock:
- case __NR_munmap:
-+ case __NR_mremap:
-+ case __NR_membarrier:
- return true;
- case __NR_madvise:
- case __NR_mincore:
-@@ -530,7 +532,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_modify_ldt:
- #endif
- case __NR_mprotect:
-- case __NR_mremap:
- case __NR_msync:
- case __NR_munlockall:
- case __NR_readahead:
-diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h
-index 59d0eab..7ae7002 100644
---- ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-@@ -1063,4 +1063,8 @@
- #define __NR_memfd_create 279
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 283
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h b/sandbox/linux/system_headers/arm_linux_syscalls.h
-index 1addd53..7843b5e 100644
---- ./sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-index ec75815..612fcfa 100644
---- ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-@@ -1271,4 +1271,8 @@
- #define __NR_memfd_create (__NR_Linux + 314)
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux + 318)
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
-index ddbf97f..1742acd 100644
---- ./sandbox/linux/system_headers/mips_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1433,4 +1433,8 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux + 358)
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-index a6afc62..7ed0a3b 100644
---- ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1422,5 +1422,9 @@
- #define __NR_memfd_create 356
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
-
-diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-index 349504a..ea3c7c9 100644
---- ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
-
-diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index 017f13c..50aeec3 100644
---- ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -88,10 +88,10 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const {
- case __NR_sysinfo:
- case __NR_times:
- case __NR_uname:
-- return Allow();
-- case __NR_sched_getaffinity:
- case __NR_sched_getparam:
- case __NR_sched_getscheduler:
-+ return Allow();
-+ case __NR_sched_getaffinity:
- case __NR_sched_setscheduler:
- return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
- case __NR_prlimit64:
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl-string_h.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl-string_h.patch
deleted file mode 100644
index e3c8a834dd07..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl-string_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mojo/public/cpp/platform/named_platform_channel_posix.cc.orig 2020-07-19 13:26:10.696171063 -0400
-+++ b/mojo/public/cpp/platform/named_platform_channel_posix.cc 2020-07-19 13:26:43.680151714 -0400
-@@ -5,6 +5,7 @@
- #include "mojo/public/cpp/platform/named_platform_channel.h"
-
- #include <errno.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_canonicalize_file_name.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_canonicalize_file_name.patch
deleted file mode 100644
index 05614daa7576..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_canonicalize_file_name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/nasm/config/config-linux.h b/third_party/nasm/config/config-linux.h
-index 7eb7c20..882b736 100644
---- a/third_party/nasm/config/config-linux.h
-+++ b/third_party/nasm/config/config-linux.h
-@@ -117,7 +117,7 @@
- #define HAVE_ACCESS 1
-
- /* Define to 1 if you have the `canonicalize_file_name' function. */
--#define HAVE_CANONICALIZE_FILE_NAME 1
-+/* #undef HAVE_CANONICALIZE_FILE_NAME */
-
- /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
- /* #undef HAVE_CPU_TO_LE16 */
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_cdefs.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_cdefs.patch
deleted file mode 100644
index fc7dc06ff21b..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_cdefs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/base/allocator/allocator_shim_internals.h b/base/allocator/allocator_shim_internal
-s.h
-index 0196f89..bb42b5d 100644
---- a/base/allocator/allocator_shim_internals.h
-+++ b/base/allocator/allocator_shim_internals.h
-@@ -7,7 +7,9 @@
-
- #if defined(__GNUC__)
-
-+#if defined(__GLIBC__)
- #include <sys/cdefs.h> // for __THROW
-+#endif
-
- #ifndef __THROW // Not a glibc system
- #ifdef _NOEXCEPT // LLVM libc++ uses noexcept instead
-diff --git a/third_party/libsync/src/include/sync/sync.h b/third_party/libsync/src/include/sync/sync.h
-index 50ed0ac..7552a49 100644
---- a/third_party/libsync/src/include/sync/sync.h
-+++ b/third_party/libsync/src/include/sync/sync.h
-@@ -19,12 +19,13 @@
- #ifndef __SYS_CORE_SYNC_H
- #define __SYS_CORE_SYNC_H
-
--#include <sys/cdefs.h>
- #include <stdint.h>
-
- #include <linux/types.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-
- struct sync_legacy_merge_data {
- int32_t fd2;
-@@ -158,6 +159,8 @@ struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info,
- struct sync_pt_info *itr);
- void sync_fence_info_free(struct sync_fence_info_data *info);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-
- #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_define_temp_failure_retry.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
deleted file mode 100644
index 61db658f849e..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/sandbox/linux/suid/sandbox.c 2019-11-19 09:28:05.000000000 +0800
-+++ b/sandbox/linux/suid/sandbox.c 2020-04-24 11:50:12.719880728 +0800
-@@ -42,6 +42,15 @@
- #define CLONE_NEWNET 0x40000000
- #endif
-
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+ (__extension__ \
-+ ({ long int __result; \
-+ do __result = (long int) (expression); \
-+ while (__result == -1L && errno == EINTR); \
-+ __result; }))
-+#endif
-+
- static bool DropRoot();
-
- #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_dns.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_dns.patch
deleted file mode 100644
index f49d8bd0afaf..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_dns.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index 2f94832..2dd1a98 100644
---- a/net/dns/dns_config_service_posix.cc
-+++ b/net/dns/dns_config_service_posix.cc
-@@ -150,7 +150,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- #if !defined(OS_ANDROID)
- ConfigParsePosixResult result;
- // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
--#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
-+#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
- // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
- // res_init behaves the same way.
- memset(&_res, 0, sizeof(_res));
-@@ -173,7 +173,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- #else
- res_nclose(&res);
- #endif // defined(OS_MACOSX) || defined(OS_FREEBSD)
--#endif // defined(OS_OPENBSD)
-+#endif // defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
-
- #if defined(OS_MACOSX) && !defined(OS_IOS)
- ConfigParsePosixResult error = DnsConfigWatcher::CheckDnsConfig();
-diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc
-index 952cff4..4b366f4 100644
---- a/net/dns/dns_reloader.cc
-+++ b/net/dns/dns_reloader.cc
-@@ -4,7 +4,7 @@
-
- #include "net/dns/dns_reloader.h"
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
-
- #include <resolv.h>
-diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
-index e8dea46..c86a830 100644
---- a/net/dns/host_resolver_manager.cc
-+++ b/net/dns/host_resolver_manager.cc
-@@ -2386,7 +2386,7 @@ HostResolverManager::HostResolverManager(
- NetworkChangeNotifier::AddConnectionTypeObserver(this);
- if (system_dns_config_notifier_)
- system_dns_config_notifier_->AddObserver(this);
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID)
- EnsureDnsReloaderInit();
- #endif
-diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
-index 0824540..3384978 100644
---- a/net/dns/host_resolver_proc.cc
-+++ b/net/dns/host_resolver_proc.cc
-@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,
- base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
- base::BlockingType::WILL_BLOCK);
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
- DnsReloaderMaybeReload();
- #endif
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_exeinfo.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_exeinfo.patch
deleted file mode 100644
index f1afc7c1b176..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_exeinfo.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
-index de2f356..f697c66 100644
---- a/base/debug/stack_trace_posix.cc
-+++ b/base/debug/stack_trace_posix.cc
-@@ -27,7 +27,7 @@
- #if !defined(USE_SYMBOLIZE)
- #include <cxxabi.h>
- #endif
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- #include <execinfo.h>
- #endif
-
-@@ -86,7 +86,7 @@ void DemangleSymbols(std::string* text) {
- // Note: code in this function is NOT async-signal safe (std::string uses
- // malloc internally).
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- std::string::size_type search_from = 0;
- while (search_from < text->size()) {
- // Look for the start of a mangled symbol, from search_from.
-@@ -121,7 +121,7 @@ void DemangleSymbols(std::string* text) {
- search_from = mangled_start + 2;
- }
- }
--#endif // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- }
- #endif // !defined(USE_SYMBOLIZE)
-
-@@ -133,7 +133,7 @@ class BacktraceOutputHandler {
- virtual ~BacktraceOutputHandler() = default;
- };
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
- // This should be more than enough to store a 64-bit number in hex:
- // 16 hex digits + 1 for null-terminator.
-@@ -216,7 +216,7 @@ void ProcessBacktrace(void* const* trace,
- }
- #endif // defined(USE_SYMBOLIZE)
- }
--#endif // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-
- void PrintToStderr(const char* output) {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
-@@ -828,7 +828,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- // Though the backtrace API man page does not list any possible negative
- // return values, we take no chance.
- return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -841,13 +841,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- PrintBacktraceOutputHandler handler;
- ProcessBacktrace(trace_, count_, prefix_string, &handler);
- #endif
- }
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
- const char* prefix_string) const {
- StreamBacktraceOutputHandler handler(os);
-diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-index 798f150..97acc7c 100644
---- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-@@ -14,7 +14,7 @@
- #define ENABLE_CRASH_OVERRIDES 1
-
- /* Define to 1 if you have the `backtrace' function. */
--#define HAVE_BACKTRACE 1
-+/* #undef HAVE_BACKTRACE */
-
- /* Define to 1 if you have the <CrashReporterClient.h> header file. */
- /* #undef HAVE_CRASHREPORTERCLIENT_H */
-@@ -55,7 +55,7 @@
- #define HAVE_ERRNO_H 1
-
- /* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H 1
-+/* #undef HAVE_EXECINFO_H */
-
- /* Define to 1 if you have the <fcntl.h> header file. */
- #define HAVE_FCNTL_H 1
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_getcontext.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_getcontext.patch
deleted file mode 100644
index 7697243a9104..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_getcontext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index b895f6d..4f13352 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -490,7 +490,9 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
- siginfo.si_code = SI_USER;
- siginfo.si_pid = getpid();
- ucontext_t context;
-+#if defined(__GLIBC__)
- getcontext(&context);
-+#endif
- return HandleSignal(sig, &siginfo, &context);
- }
-
-@@ -675,8 +677,10 @@ bool ExceptionHandler::WriteMinidump() {
- sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
-
- CrashContext context;
-+#if defined(__GLIBC__)
- int getcontext_result = getcontext(&context.context);
- if (getcontext_result)
-+#endif
- return false;
-
- #if defined(__i386__)
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_mallinfo.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_mallinfo.patch
deleted file mode 100644
index dfe7c6595edc..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_mallinfo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/base/trace_event/malloc_dump_provider.cc.orig
-+++ b/base/trace_event/malloc_dump_provider.cc
-@@ -243,7 +243,7 @@
- allocated_objects_count = main_heap_info.block_count;
- #elif defined(OS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
--#else
-+#elif defined(__GLIBC__)
- struct mallinfo info = mallinfo();
- DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
-
---- a/base/process/process_metrics_posix.cc.orig 2019-10-24 11:10:48.553159245 -0400
-+++ b/base/process/process_metrics_posix.cc 2019-10-24 11:14:29.025025854 -0400
-@@ -110,14 +110,14 @@
- malloc_statistics_t stats = {0};
- malloc_zone_statistics(nullptr, &stats);
- return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(__GLIBC__) || defined(OS_ANDROID)
- struct mallinfo minfo = mallinfo();
- #if BUILDFLAG(USE_TCMALLOC)
- return minfo.uordblks;
- #else
- return minfo.hblkhd + minfo.arena;
- #endif
--#elif defined(OS_FUCHSIA)
-+#else
- // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
- return 0;
- #endif
---- a/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
-+++ b/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
-@@ -84,7 +84,7 @@
- }
-
- size_t Process::GetMallocUsage() {
--#if defined(HAVE_MALLINFO)
-+#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
- struct mallinfo mi;
- mi = ::mallinfo();
- return mi.uordblks;
-
---- a/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
-+++ b/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
-@@ -122,7 +122,9 @@
- /* #undef HAVE_MALLCTL */
-
- /* Define to 1 if you have the `mallinfo' function. */
-+#if defined(__GLIBC__)
- #define HAVE_MALLINFO 1
-+#endif
-
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_pread_pwrite64.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_pread_pwrite64.patch
deleted file mode 100644
index 2aeaaeb7593f..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_pread_pwrite64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
-index 5d9c2e8..2682349 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -166,6 +166,13 @@ extern "C" {
- # undef __NR_waitpid
- #endif
-
-+#ifdef pread64
-+#undef pread64
-+#endif
-+#ifdef pwrite64
-+#undef pwrite64
-+#endif
-+
- /* As glibc often provides subtly incompatible data structures (and implicit
- * wrapper functions that convert them), we provide our own kernel data
- * structures for use by the system calls.
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_push_back.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_push_back.patch
deleted file mode 100644
index cff340287da5..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_push_back.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc
-index 08bf79c..3ee5353 100644
---- a/net/socket/udp_socket_posix.cc
-+++ b/net/socket/udp_socket_posix.cc
-@@ -1194,7 +1194,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
- msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
- msgvec->reserve(buffers.size());
- for (size_t j = 0; j < buffers.size(); j++)
-- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
-+ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, nullptr, 0, 0, 0}, 0});
- int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
- SendResult send_result(0, 0, std::move(buffers));
- if (result < 0) {
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_size.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_size.patch
deleted file mode 100644
index cf41d27ade6e..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_size.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/third_party/blink/renderer/platform/wtf/stack_util.cc b/third_party/blink/renderer/platform/wtf/stack_util.cc
-index b242164..1a0b519 100644
---- a/third_party/blink/renderer/platform/wtf/stack_util.cc
-+++ b/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -28,7 +28,7 @@
- // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
- // correctly for the main thread.
-
--#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
- defined(OS_FUCHSIA)
- // pthread_getattr_np() can fail if the thread is not invoked by
- // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -55,6 +55,9 @@ size_t GetUnderestimatedStackSize() {
- pthread_attr_destroy(&attr);
- #endif
-
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+ return 0;
-+#else
- // Return a 512k stack size, (conservatively) assuming the following:
- // - that size is much lower than the pthreads default (x86 pthreads has a 2M
- // default.)
-@@ -62,6 +65,8 @@ size_t GetUnderestimatedStackSize() {
- // low as 512k.
- //
- return 512 * 1024;
-+#endif
-+
- #elif defined(OS_MACOSX)
- // pthread_get_stacksize_np() returns too low a value for the main thread on
- // OSX 10.9,
-@@ -97,7 +102,7 @@ return Threading::ThreadStackSize();
- }
-
- void* GetStackStart() {
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
- defined(OS_FUCHSIA)
- pthread_attr_t attr;
- int error;
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_trace.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_trace.patch
deleted file mode 100644
index 9a1f2b044583..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_stack_trace.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/base/debug/stack_trace.cc b/base/debug/stack_trace.cc
-index d8ca822..ffe1f08 100644
---- a/base/debug/stack_trace.cc
-+++ b/base/debug/stack_trace.cc
-@@ -225,7 +225,9 @@ void StackTrace::Print() const {
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- OutputToStreamWithPrefix(os, nullptr);
-+#endif
- }
-
- std::string StackTrace::ToString() const {
-@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const {
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
- std::stringstream stream;
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- OutputToStreamWithPrefix(&stream, prefix_string);
- #endif
- return stream.str();
- }
-
- std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
--#if !defined(__UCLIBC__) & !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) & !defined(_AIX)
- s.OutputToStream(&os);
- #else
- os << "StackTrace::OutputToStream not implemented.";
-diff --git a/base/logging.cc b/base/logging.cc
-index 36b8bfc..dd830fe 100644
---- a/base/logging.cc
-+++ b/base/logging.cc
-@@ -607,7 +607,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
- LogMessage::~LogMessage() {
- size_t stack_start = stream_.tellp();
- #if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
-- !defined(OS_AIX)
-+ !defined(OS_AIX) && defined(__GLIBC__)
- if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
- // Include a stack trace on a fatal, unless a debugger is attached.
- base::debug::StackTrace stack_trace;
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_tcp_listen.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_tcp_listen.patch
deleted file mode 100644
index fa62317b11ac..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_tcp_listen.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/content/public/common/socket_permission_request.h b/content/public/common/socket_permission_request.h
-index 7316621..6171219 100644
---- a/content/public/common/socket_permission_request.h
-+++ b/content/public/common/socket_permission_request.h
-@@ -9,6 +9,9 @@
-
- #include <string>
-
-+#ifdef TCP_LISTEN
-+#undef TCP_LISTEN
-+#endif
-
- namespace content {
-
diff --git a/srcpkgs/electron10/files/musl-patches/chromium-musl_xxx-ppc64le-support.patch b/srcpkgs/electron10/files/musl-patches/chromium-musl_xxx-ppc64le-support.patch
deleted file mode 100644
index a7d660feb023..000000000000
--- a/srcpkgs/electron10/files/musl-patches/chromium-musl_xxx-ppc64le-support.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
-index a6aec544e..2a4a7f1bc 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -16,7 +16,7 @@
- #if defined(__mips__)
- // sys/user.h in eglibc misses size_t definition
- #include <stddef.h>
--#elif defined(__powerpc64__)
-+#elif defined(__powerpc64__) && defined(__GLIBC__)
- // Manually define greg_t on ppc64
- typedef unsigned long long greg_t;
- #endif
-@@ -361,11 +361,11 @@ typedef struct pt_regs regs_struct;
- #define SECCOMP_ARCH AUDIT_ARCH_PPC64
- #endif
-
--#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
-+#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
-
- #define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
- #define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
--#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
-+#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
- #define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
- #define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
- #define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
-diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc
-index d53a7ff56..c290f0e92 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -499,9 +499,9 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
- // Same as MIPS, need to invert ret and set error register (cr0.SO)
- if (ret_val <= -1 && ret_val >= -4095) {
- ret_val = -ret_val;
-- ctx->uc_mcontext.regs->ccr |= (1 << 28);
-+ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
- } else {
-- ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
-+ ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
- }
- #endif
- SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
-diff --git third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-index cdce9bf8..73d77dda 100644
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
-
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-- defined(__powerpc__) || defined(__ppc__) || \
-+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
- defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
-diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
-index f9a60e37..25f3a0b7 100644
---- a/third_party/breakpad/BUILD.gn
-+++ b/third_party/breakpad/BUILD.gn
-@@ -637,6 +637,7 @@ if (is_linux || is_android) {
-
- if (current_cpu == "ppc64") {
- defines = [ "HAVE_GETCONTEXT" ]
-+ libs += [ "ucontext" ]
- } else {
- sources += [
- "breakpad/src/common/linux/breakpad_getcontext.S"
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index 03afec7a..0264ecf1 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-@@ -273,6 +273,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-
- #elif defined(__powerpc64__)
-
-+#include <asm/elf.h>
-+#include <asm/ptrace.h>
-+
- uintptr_t ThreadInfo::GetInstructionPointer() const {
- return mcontext.gp_regs[PT_NIP];
- }
-@@ -290,9 +293,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
- out->ctr = mcontext.gp_regs[PT_CTR];
-
- for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-- out->float_save.fpregs[i] = mcontext.fp_regs[i];
-+ out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
-
-- out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
-+ out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
-
- for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
- out->vector_save.save_vr[i] = \
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 1090470f..e580233d 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -257,6 +257,9 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
-
- #elif defined(__powerpc64__)
-
-+#include <asm/elf.h>
-+#include <asm/ptrace.h>
-+
- uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
- }
-@@ -280,9 +283,9 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
- out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
-
- for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-- out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
-+ out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
-
-- out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
-+ out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
-
- for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
- out->vector_save.save_vr[i] =
-diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index 5a7ab50c..ee8b858c 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -105,6 +105,11 @@
- #define PR_SET_PTRACER 0x59616d61
- #endif
-
-+/* musl hack, can't include asm/ptrace.h as that causes conflicts */
-+#if defined(__powerpc64__) && !defined(PT_NIP)
-+#define PT_NIP 32
-+#endif
-+
- namespace google_breakpad {
-
- namespace {
-diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index 8e335a09..b2a0f155 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -469,7 +469,7 @@ struct MContext64 {
- SignalThreadContext64 gp_regs;
- SignalFloatContext64 fp_regs;
- SignalVectorContext64 *v_regs;
-- int64_t vmx_reserve[69];
-+ int64_t vmx_reserve[101];
- };
-
- struct ContextTraits64 : public Traits64 {
-diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
-index dea0d1f3..b203e5b2 100644
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -30,6 +30,7 @@
-
- #if defined(ARCH_CPU_PPC64_FAMILY)
- #include <sys/ucontext.h>
-+#include <asm/ptrace.h>
- #endif
-
- namespace crashpad {
-diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
-index 9955ce44..4c1cc488 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -4216,9 +4216,13 @@ struct kernel_statfs {
- }
- #endif
- #if defined(__NR_fstatat64)
-+ // musl does #define fstatat64 fstatat
-+ #undef fstatat64
- LSS_INLINE _syscall4(int, fstatat64, int, d,
- const char *, p,
- struct kernel_stat64 *, b, int, f)
-+ // set it back like it was
-+ #define fstatat64 fstatat
- #endif
- #if defined(__NR_waitpid)
- // waitpid is polyfilled below when not available.
diff --git a/srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch b/srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch
deleted file mode 100644
index 974b49cde703..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-83-gcc-10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e473f41284ccc8fa4bc4622d087194b18a1ec23a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 7 Apr 2020 16:37:10 +0000
-Subject: [PATCH] GCC: fix includes for gcc-10
-
----
- chrome/browser/search/background/ntp_backgrounds.h | 1 +
- third_party/webrtc/call/rtx_receive_stream.h | 1 +
- .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
- ui/gfx/linux/drm_util_linux.h | 2 ++
- 5 files changed, 6 insertions(+)
-
-diff --git a/chrome/browser/search/background/ntp_backgrounds.h b/chrome/browser/search/background/ntp_backgrounds.h
-index 7afc0a2..ea5818e 100644
---- a/chrome/browser/search/background/ntp_backgrounds.h
-+++ b/chrome/browser/search/background/ntp_backgrounds.h
-@@ -6,6 +6,7 @@
- #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
-
- #include <array>
-+#include <cstddef>
-
- class GURL;
-
-diff --git a/third_party/webrtc/call/rtx_receive_stream.h b/third_party/webrtc/call/rtx_receive_stream.h
-index 8ffa440..113a816 100644
---- a/third_party/webrtc/call/rtx_receive_stream.h
-+++ b/third_party/webrtc/call/rtx_receive_stream.h
-@@ -12,6 +12,7 @@
- #define CALL_RTX_RECEIVE_STREAM_H_
-
- #include <map>
-+#include <cstdint>
-
- #include "call/rtp_packet_sink_interface.h"
-
-diff --git a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-index 22528c9..69e624e 100644
---- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-+++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-@@ -12,6 +12,7 @@
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
-
- #include <array>
-+#include <cstddef>
-
- namespace webrtc {
-
-diff --git a/ui/gfx/linux/drm_util_linux.h b/ui/gfx/linux/drm_util_linux.h
-index 86ff2eb..990f12c 100644
---- a/ui/gfx/linux/drm_util_linux.h
-+++ b/ui/gfx/linux/drm_util_linux.h
-@@ -7,6 +7,8 @@
-
- #include "ui/gfx/buffer_types.h"
-
-+#include <cstdint>
-+
- namespace ui {
-
- int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);
---
-2.24.1
-
diff --git a/srcpkgs/electron10/files/patches/chromium-chromium_atk_optional.patch.patch b/srcpkgs/electron10/files/patches/chromium-chromium_atk_optional.patch.patch
deleted file mode 100644
index 667b4a7a00c5..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-chromium_atk_optional.patch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/build/config/ui.gni 2020-06-25 00:39:28.000000000 +0200
-+++ - 2020-08-22 18:01:01.182749726 +0200
-@@ -47,8 +47,10 @@
- # Make sure glib is not used if building for ChromeOS/Chromecast
- assert(!use_glib || (is_linux && !is_chromeos && !is_chromecast))
-
--# Whether to use atk, the Accessibility ToolKit library
--use_atk = is_desktop_linux && !is_chromecast && use_glib
-+declare_args() {
-+ # Whether to use atk, the Accessibility ToolKit library
-+ use_atk = is_desktop_linux && !is_chromecast && use_glib
-+}
- # =============================================
- # PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
- # =============================================
diff --git a/srcpkgs/electron10/files/patches/chromium-clang-12.patch b/srcpkgs/electron10/files/patches/chromium-clang-12.patch
deleted file mode 100644
index 54b10751c430..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-clang-12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/third_party/blink/renderer/platform/disk_data_allocator.h 2020-09-21 20:39:25.000000000 +0200
-+++ - 2021-05-24 22:03:47.238393816 +0200
-@@ -36,12 +36,12 @@
- public:
- int64_t start_offset() const { return start_offset_; }
- size_t size() const { return size_; }
-- Metadata(Metadata&& other) = delete;
-
- private:
- Metadata(int64_t start_offset, size_t size)
- : start_offset_(start_offset), size_(size) {}
- Metadata(const Metadata& other) = default;
-+ Metadata(Metadata&& other) = default;
- Metadata& operator=(const Metadata& other) = default;
-
- int64_t start_offset_;
diff --git a/srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch b/srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch
deleted file mode 100644
index 6abb886ab990..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-ffmpeg-4.3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/media/base/media.cc b/media/base/media.cc
-index c282ee49a03..a298b40c79b 100644
---- a/media/base/media.cc
-+++ b/media/base/media.cc
-@@ -14,6 +14,7 @@
- #include "third_party/libyuv/include/libyuv.h"
-
- #if BUILDFLAG(ENABLE_FFMPEG)
-+#include <limits>
- #include "third_party/ffmpeg/ffmpeg_features.h" // nogncheck
- extern "C" {
- #include <libavutil/cpu.h>
-@@ -41,7 +42,7 @@ class MediaInitializer {
-
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
- // Remove allocation limit from ffmpeg, so calls go down to shim layer.
-- av_max_alloc(0);
-+ av_max_alloc(std::numeric_limits<size_t>::max());
- #endif // BUILDFLAG(USE_ALLOCATOR_SHIM)
-
- #endif // BUILDFLAG(ENABLE_FFMPEG)
diff --git a/srcpkgs/electron10/files/patches/chromium-gcc-shared.patch b/srcpkgs/electron10/files/patches/chromium-gcc-shared.patch
deleted file mode 100644
index 098b68322422..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-gcc-shared.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/build/toolchain/gcc_toolchain.gni 2019-11-19 02:27:43.000000000 +0100
-+++ - 2020-07-21 00:59:09.201421469 +0200
-@@ -371,7 +371,7 @@
- # .TOC file, overwrite it, otherwise, don't change it.
- tocfile = sofile + ".TOC"
-
-- link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\""
-+ link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -shared @\"$rspfile\""
-
- # Generate a map file to be used for binary size analysis.
- # Map file adds ~10% to the link time on a z620.
-@@ -450,7 +450,7 @@
- unstripped_sofile = sofile
- }
-
-- command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" @\"$rspfile\""
-+ command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" -shared @\"$rspfile\""
-
- if (defined(invoker.strip)) {
- strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\""
diff --git a/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch b/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
deleted file mode 100644
index c7724336bfba..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://github.com/chromium/chromium/commit/b289f6f3fcbc
-
-diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
-index 8ff0540d9a..20a7d37474 100644
---- a/components/paint_preview/common/subset_font.cc
-+++ b/components/paint_preview/common/subset_font.cc
-@@ -72,9 +72,11 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) {
- hb_set_t* glyphs =
- hb_subset_input_glyph_set(input.get()); // Owned by |input|.
- usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
-- hb_subset_input_set_retain_gids(input.get(), true);
-+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
-
-- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
-+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
-+ if (!subset_face)
-+ return nullptr;
- HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
- if (!subset_blob)
- return nullptr;
diff --git a/srcpkgs/electron10/files/patches/chromium-libc_malloc.patch b/srcpkgs/electron10/files/patches/chromium-libc_malloc.patch
deleted file mode 100644
index a5720b93ce7c..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-libc_malloc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/base/process/memory_linux.cc 2020-09-21 20:39:01.000000000 +0200
-+++ - 2020-10-02 20:23:17.972108815 +0200
-@@ -23,6 +23,12 @@
- #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
- #endif
-
-+#if defined(LIBC_GLIBC)
-+extern "C" {
-+extern void *__libc_malloc(size_t size);
-+}
-+#endif
-+
- namespace base {
-
- size_t g_oom_size = 0U;
-@@ -135,7 +141,7 @@
- (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
- *result = malloc(size);
- #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
-- *result = __libc_malloc(size);
-+ *result = ::__libc_malloc(size);
- #elif BUILDFLAG(USE_TCMALLOC)
- *result = tc_malloc_skip_new_handler(size);
- #endif
diff --git a/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch b/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch
deleted file mode 100644
index f47af201b6e4..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-# Minimal diff for harfbuzz 3.0.0 support; based on:
-# https://github.com/google/skia/commit/66684b17b382
-# https://github.com/google/skia/commit/51d83abcd24a
-
-diff --git a/gn/skia.gni b/gn/skia.gni
-index d98fdc19ee..199335d5c4 100644
---- a/third_party/skia/gn/skia.gni
-+++ b/third_party/skia/gn/skia.gni
-@@ -34,8 +34,6 @@ declare_args() {
- skia_include_multiframe_procs = false
- skia_lex = false
- skia_libgifcodec_path = "third_party/externals/libgifcodec"
-- skia_pdf_subset_harfbuzz =
-- false # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz.
- skia_qt_path = getenv("QT_PATH")
- skia_skqp_global_error_tolerance = 0
- skia_tools_require_resources = false
-@@ -99,6 +97,10 @@ declare_args() {
- skia_use_libfuzzer_defaults = true
- }
-
-+declare_args() {
-+ skia_pdf_subset_harfbuzz = skia_use_harfbuzz
-+}
-+
- declare_args() {
- skia_compile_sksl_tests = skia_compile_processors
- skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
-diff --git a/src/pdf/SkPDFSubsetFont.cpp b/src/pdf/SkPDFSubsetFont.cpp
-index 81c37eef3a..2340a7937b 100644
---- a/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
-+++ b/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
-@@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob) {
- blob.release());
- }
-
-+template<typename...> using void_t = void;
-+template<typename T, typename = void>
-+struct SkPDFHarfBuzzSubset {
-+ // This is the HarfBuzz 3.0 interface.
-+ // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of
-+ // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported.
-+ static HBFace Make(T input, hb_face_t* face) {
-+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
-+ // If it isn't known if a font is 'tricky', retain the hints.
-+ hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/);
-+ return HBFace(hb_subset_or_fail(face, input));
-+ }
-+};
-+template<typename T>
-+struct SkPDFHarfBuzzSubset<T, void_t<
-+ decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())),
-+ decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())),
-+ decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>()))
-+ >>
-+{
-+ // This is the HarfBuzz 2.0 (non-public) interface, used if it exists.
-+ // This code should be removed as soon as all users are migrated to the newer API.
-+ static HBFace Make(T input, hb_face_t* face) {
-+ hb_subset_input_set_retain_gids(input, true);
-+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
-+ // If it isn't known if a font is 'tricky', retain the hints.
-+ hb_subset_input_set_drop_hints(input, false);
-+ return HBFace(hb_subset(face, input));
-+ }
-+};
-+
- static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
- const SkPDFGlyphUse& glyphUsage,
- int ttcIndex) {
-@@ -71,11 +102,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
- hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
- glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
-
-- hb_subset_input_set_retain_gids(input.get(), true);
-- // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
-- // If it isn't known if a font is 'tricky', retain the hints.
-- hb_subset_input_set_drop_hints(input.get(), false);
-- HBFace subset(hb_subset(face.get(), input.get()));
-+ HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get());
-+ if (!subset) {
-+ return nullptr;
-+ }
- HBBlob result(hb_face_reference_blob(subset.get()));
- return to_data(std::move(result));
- }
-diff --git a/third_party/harfbuzz/BUILD.gn b/third_party/harfbuzz/BUILD.gn
-index 173830de62..4156607ef9 100644
---- a/third_party/skia/third_party/harfbuzz/BUILD.gn
-+++ b/third_party/skia/third_party/harfbuzz/BUILD.gn
-@@ -14,6 +14,9 @@ if (skia_use_system_harfbuzz) {
- "harfbuzz",
- "harfbuzz-icu",
- ]
-+ if (skia_pdf_subset_harfbuzz) {
-+ libs += [ "harfbuzz-subset" ]
-+ }
- }
- } else {
- third_party("harfbuzz") {
diff --git a/srcpkgs/electron10/files/patches/chromium-skia-harmony.patch b/srcpkgs/electron10/files/patches/chromium-skia-harmony.patch
deleted file mode 100644
index 1cb8aebf240d..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-skia-harmony.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-07-19 11:08:34.770972665 +0000
-+++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-07-19 11:08:44.274442065 +0000
-@@ -128,9 +128,9 @@ public:
- : fGetVarDesignCoordinates(nullptr)
- , fGetVarAxisFlags(nullptr)
- , fLibrary(nullptr)
-- , fIsLCDSupported(false)
-+ , fIsLCDSupported(true)
- , fLightHintingIsYOnly(false)
-- , fLCDExtra(0)
-+ , fLCDExtra(2)
- {
- if (FT_New_Library(&gFTMemory, &fLibrary)) {
- return;
diff --git a/srcpkgs/electron10/files/patches/chromium-time64.patch b/srcpkgs/electron10/files/patches/chromium-time64.patch
deleted file mode 100644
index 0330ce057f41..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-time64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: allow sandboxed code to call gettime64
- Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist
- and clock selection parameter filtering code.
-
- Add __NR_utimensat_time64 to syscall whitelist
-
- Conditionalise additions on the new calls existing, because they do not exist
- on 64-bit architectures.
-Author: Peter Michael Green <plugwash@raspbian.org>
-
-Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-===================================================================
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
- return Allow();
- #endif
-
-+#ifdef __NR_clock_gettime64
-+ if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) {
-+#else
- if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
-+#endif
- return RestrictClockID();
- }
-
-Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-===================================================================
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s
- case __NR_clock_getres: // Allowed only on Android with parameters
- // filtered by RestrictClokID().
- case __NR_clock_gettime: // Parameters filtered by RestrictClockID().
-+#ifdef __NR_clock_gettime64
-+ case __NR_clock_gettime64: // Parameters filtered by RestrictClockID().
-+ case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID().
-+#endif
- case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID().
- case __NR_clock_settime: // Privileged.
- #if defined(__i386__) || \
-@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno
- case __NR_utime:
- #endif
- case __NR_utimensat: // New.
-+#ifdef __NR_utimensat_time64
-+ case __NR_utimensat_time64:
-+#endif
- return true;
- default:
- return false;
diff --git a/srcpkgs/electron10/files/patches/chromium-toolchain-host.patch b/srcpkgs/electron10/files/patches/chromium-toolchain-host.patch
deleted file mode 100644
index 0dace261a08c..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-toolchain-host.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/build/toolchain/linux/unbundle/BUILD.gn 2020-07-21 17:36:34.064748261 +0200
-+++ - 2020-07-21 17:39:03.115740522 +0200
-@@ -35,7 +35,7 @@
- extra_ldflags = getenv("BUILD_LDFLAGS")
-
- toolchain_args = {
-- current_cpu = current_cpu
-+ current_cpu = host_cpu
- current_os = current_os
- }
- }
diff --git a/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch b/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch
deleted file mode 100644
index ba64e6e5a01a..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-support.patch
+++ /dev/null
@@ -1,3686 +0,0 @@
-commit e7944c162ca13b2c30b180c06f917f45643b8cca
-Author: q66 <daniel@octaforge.org>
-Date: Tue Aug 4 19:57:48 2020 +0200
-
- ppc64le support
-
-diff --git build/download_nacl_toolchains.py build/download_nacl_toolchains.py
-index 286a92a27..ec36a85d3 100755
---- a/build/download_nacl_toolchains.py
-+++ b/build/download_nacl_toolchains.py
-@@ -13,6 +13,10 @@ import sys
-
-
- def Main(args):
-+ # If `disable_nacl=1` is in GYP_DEFINES, exit
-+ if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
-+ return 0
-+
- script_dir = os.path.dirname(os.path.abspath(__file__))
- src_dir = os.path.dirname(script_dir)
- nacl_dir = os.path.join(src_dir, 'native_client')
-diff --git chrome/installer/linux/BUILD.gn chrome/installer/linux/BUILD.gn
-index b101b0cb2..9fd5a7617 100644
---- a/chrome/installer/linux/BUILD.gn
-+++ b/chrome/installer/linux/BUILD.gn
-@@ -92,8 +92,6 @@ packaging_files = packaging_files_binaries + [
- "$root_out_dir/xdg-mime",
- "$root_out_dir/xdg-settings",
- "$root_out_dir/locales/en-US.pak",
-- "$root_out_dir/MEIPreload/manifest.json",
-- "$root_out_dir/MEIPreload/preloaded_data.pb",
- ]
-
- action_foreach("calculate_deb_dependencies") {
-@@ -329,7 +327,6 @@ group("installer_deps") {
- ":theme_files",
- "//chrome",
- "//chrome:packed_resources",
-- "//chrome/browser/resources/media/mei_preload:component",
- "//sandbox/linux:chrome_sandbox",
- "//third_party/crashpad/crashpad/handler:crashpad_handler",
- ]
-diff --git sandbox/features.gni sandbox/features.gni
-index 09280d35f..42514157f 100644
---- a/sandbox/features.gni
-+++ b/sandbox/features.gni
-@@ -11,6 +11,7 @@ import("//build/config/nacl/config.gni")
- use_seccomp_bpf = (is_linux || is_android) &&
- (current_cpu == "x86" || current_cpu == "x64" ||
- current_cpu == "arm" || current_cpu == "arm64" ||
-- current_cpu == "mipsel" || current_cpu == "mips64el")
-+ current_cpu == "mipsel" || current_cpu == "mips64el" ||
-+ current_cpu == "ppc64")
-
- use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
-diff --git sandbox/linux/BUILD.gn sandbox/linux/BUILD.gn
-index c27351f9a..9141e1239 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -407,6 +407,8 @@ component("sandbox_services") {
-
- source_set("sandbox_services_headers") {
- sources = [
-+ "system_headers/ppc64_linux_syscalls.h",
-+ "system_headers/ppc64_linux_ucontext.h",
- "system_headers/arm64_linux_syscalls.h",
- "system_headers/arm_linux_syscalls.h",
- "system_headers/arm_linux_ucontext.h",
-diff --git sandbox/linux/bpf_dsl/linux_syscall_ranges.h sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-index 313511f22..0ca3a326f 100644
---- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-@@ -56,6 +56,13 @@
- #define MAX_PUBLIC_SYSCALL __NR_syscalls
- #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
-
-+#elif defined(__powerpc64__)
-+
-+#include <asm/unistd.h>
-+#define MIN_SYSCALL 0u
-+#define MAX_PUBLIC_SYSCALL 386u
-+#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
-+
- #else
- #error "Unsupported architecture"
- #endif
-diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
-index 1a407b952..a6aec544e 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -16,6 +16,9 @@
- #if defined(__mips__)
- // sys/user.h in eglibc misses size_t definition
- #include <stddef.h>
-+#elif defined(__powerpc64__)
-+// Manually define greg_t on ppc64
-+typedef unsigned long long greg_t;
- #endif
- #endif
-
-@@ -346,6 +349,51 @@ struct regs_struct {
- #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
- #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
- #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
-+
-+#elif defined(__powerpc64__)
-+#include <asm/ptrace.h>
-+
-+typedef struct pt_regs regs_struct;
-+
-+#ifdef ARCH_CPU_LITTLE_ENDIAN
-+#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
-+#else
-+#define SECCOMP_ARCH AUDIT_ARCH_PPC64
-+#endif
-+
-+#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
-+
-+#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
-+#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
-+#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
-+#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
-+#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
-+#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
-+#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
-+#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
-+#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
-+
-+#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
-+#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
-+#define SECCOMP_IP_MSB_IDX \
-+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
-+#define SECCOMP_IP_LSB_IDX \
-+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
-+#define SECCOMP_ARG_MSB_IDX(nr) \
-+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
-+#define SECCOMP_ARG_LSB_IDX(nr) \
-+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
-+
-+#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
-+#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
-+#define SECCOMP_PT_IP(_regs) (_regs).nip
-+#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
-+#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
-+#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
-+#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
-+#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
-+#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
-+
- #else
- #error Unsupported target platform
-
-diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-index a6d2c0dfb..37fdc179a 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) {
- SyscallSets::IsPrctl(sysno) ||
- SyscallSets::IsProcessGroupOrSession(sysno) ||
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- SyscallSets::IsSocketCall(sysno) ||
- #endif
- #if defined(__arm__)
-@@ -210,7 +211,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
- }
-
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- if (sysno == __NR_mmap)
- return RestrictMmapFlags();
- #endif
-@@ -228,7 +229,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
- return RestrictPrctl();
-
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- if (sysno == __NR_socketpair) {
- // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
- static_assert(AF_UNIX == PF_UNIX,
-@@ -268,7 +269,8 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
- }
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- if (SyscallSets::IsSocketCall(sysno))
- return RestrictSocketcallCommand();
- #endif
-diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-index fc36187c9..1affc9189 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-@@ -291,8 +291,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
- #if !defined(__aarch64__)
- TEST_BASELINE_SIGSYS(__NR_eventfd)
- TEST_BASELINE_SIGSYS(__NR_inotify_init)
-+#if !defined(__powerpc64__)
- TEST_BASELINE_SIGSYS(__NR_vserver)
- #endif
-+#endif
-
- #if defined(LIBC_GLIBC) && !defined(OS_CHROMEOS)
- BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) {
-diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index f51915edc..ca2f4f106 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -36,7 +36,8 @@
- #include <sys/ioctl.h>
- #include <sys/ptrace.h>
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(__arm__) && \
-- !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA)
-+ !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA) && \
-+ !defined(__powerpc64__)
- // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
- // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
- // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
-@@ -45,6 +46,11 @@
- #endif
- #endif // !OS_NACL_NONSFI
-
-+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
-+#ifdef __powerpc64__
-+#include <termios.h>
-+#endif
-+
- #if defined(OS_ANDROID)
-
- #if !defined(F_DUPFD_CLOEXEC)
-@@ -107,6 +113,15 @@ inline bool IsArchitectureMips() {
- #endif
- }
-
-+inline bool IsArchitecturePPC64() {
-+#if defined(__powerpc64__)
-+ return true;
-+#else
-+ return false;
-+#endif
-+}
-+
-+
- // Ubuntu's version of glibc has a race condition in sem_post that can cause
- // it to call futex(2) with bogus op arguments. To workaround this, we need
- // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
-@@ -248,6 +263,8 @@ ResultExpr RestrictFcntlCommands() {
- uint64_t kOLargeFileFlag = O_LARGEFILE;
- if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
- kOLargeFileFlag = 0100000;
-+ else if (IsArchitecturePPC64())
-+ kOLargeFileFlag = 0200000;
-
- const Arg<int> cmd(1);
- const Arg<long> long_arg(2);
-@@ -262,14 +279,23 @@ ResultExpr RestrictFcntlCommands() {
- F_SETLKW,
- F_GETLK,
- F_DUPFD,
-- F_DUPFD_CLOEXEC),
-- Allow())
-+ F_DUPFD_CLOEXEC
-+#if defined(__powerpc64__)
-+// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
-+// but glibc will sometimes still use the 32-bit versions. Allow both.
-+ ,
-+ 5, /* F_GETLK (32) */
-+ 6, /* F_SETLK (32) */
-+ 7 /* F_SETLKW (32) */
-+#endif
-+ ),
-+ Allow())
- .Case(F_SETFL,
- If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
- .Default(CrashSIGSYS());
- }
-
--#if defined(__i386__) || defined(__mips__)
-+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
- ResultExpr RestrictSocketcallCommand() {
- // Unfortunately, we are unable to restrict the first parameter to
- // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
-@@ -418,7 +444,7 @@ ResultExpr RestrictPrlimitToGetrlimit(pid_t target_pid) {
- ResultExpr RestrictPtrace() {
- const Arg<int> request(0);
- return Switch(request).CASES((
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__powerpc64__)
- PTRACE_GETREGS,
- PTRACE_GETFPREGS,
- PTRACE_GET_THREAD_AREA,
-diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-index ba4289f05..9a4d5ab2d 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-@@ -48,7 +48,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictMprotectFlags();
- // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
- SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
-
--#if defined(__i386__) || defined(__mips__)
-+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
- // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
- // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
- SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
-diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index d3693fd78..d492cf94b 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
- switch (sysno) {
- case __NR_gettimeofday:
- #if defined(__i386__) || defined(__x86_64__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_time:
- #endif
- return true;
-@@ -41,12 +42,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
- case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID().
- case __NR_clock_settime: // Privileged.
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_ftime: // Obsolete.
- #endif
- case __NR_settimeofday: // Privileged.
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_stime:
- #endif
- default:
-@@ -112,7 +115,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
- case __NR_faccessat: // EPERM not a valid errno.
- case __NR_fchmodat:
- case __NR_fchownat: // Should be called chownat ?
--#if defined(__x86_64__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
- case __NR_newfstatat: // fstatat(). EPERM not a valid errno.
- #elif defined(__i386__) || defined(__arm__) || \
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-@@ -131,7 +134,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
- case __NR_memfd_create:
- case __NR_mkdirat:
- case __NR_mknodat:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
- case __NR_oldlstat:
- case __NR_oldstat:
- #endif
-@@ -145,7 +148,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
- #endif
- case __NR_statfs: // EPERM not a valid errno.
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_statfs64:
- #endif
- case __NR_symlinkat:
-@@ -155,7 +159,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
- case __NR_truncate64:
- #endif
- case __NR_unlinkat:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_utime:
- #endif
- case __NR_utimensat: // New.
-@@ -174,7 +179,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
- #endif
- return true;
- // TODO(jln): these should be denied gracefully as well (moved below).
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_fadvise64: // EPERM not a valid errno.
- #endif
- #if defined(__i386__)
-@@ -187,11 +193,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
- case __NR_flock: // EPERM not a valid errno.
- case __NR_fstatfs: // Give information about the whole filesystem.
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_fstatfs64:
- #endif
- case __NR_fsync: // EPERM not a valid errno.
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
- case __NR_oldfstat:
- #endif
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-@@ -199,6 +206,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
- case __NR_sync_file_range: // EPERM not a valid errno.
- #elif defined(__arm__)
- case __NR_arm_sync_file_range: // EPERM not a valid errno.
-+#elif defined(__powerpc64__)
-+ case __NR_sync_file_range2: // EPERM not a valid errno.
- #endif
- default:
- return false;
-@@ -224,7 +233,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) {
- #endif
- case __NR_getdents64: // EPERM not a valid errno.
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_readdir:
- #endif
- return true;
-@@ -265,7 +275,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) {
- bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
- switch (sysno) {
- case __NR_capset:
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
- case __NR_ioperm: // Intel privilege.
- case __NR_iopl: // Intel privilege.
- #endif
-@@ -316,7 +326,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
- case __NR_rt_sigreturn:
- case __NR_rt_sigtimedwait:
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_sigaction:
- case __NR_sigprocmask:
- case __NR_sigreturn:
-@@ -332,7 +343,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
- #endif
- case __NR_signalfd4:
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_sigpending:
- case __NR_sigsuspend:
- #endif
-@@ -356,7 +368,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) {
- #endif
- case __NR_dup3:
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_shutdown:
- #endif
- return true;
-@@ -390,7 +402,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- case __NR_membarrier:
- case __NR_wait4:
- case __NR_waitid:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
- case __NR_waitpid:
- #endif
- return true;
-@@ -407,7 +419,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #endif
- case __NR_set_tid_address:
- case __NR_unshare:
--#if !defined(__mips__) && !defined(__aarch64__)
-+#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
- case __NR_vfork:
- #endif
- default:
-@@ -456,7 +468,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
- return true;
- default:
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_socketpair: // We will want to inspect its argument.
- #endif
- return false;
-@@ -466,7 +478,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
- bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
- switch (sysno) {
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_accept:
- case __NR_accept4:
- case __NR_bind:
-@@ -481,7 +493,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
- }
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- // Big multiplexing system call for sockets.
- bool SyscallSets::IsSocketCall(int sysno) {
- switch (sysno) {
-@@ -495,7 +508,8 @@ bool SyscallSets::IsSocketCall(int sysno) {
- }
- #endif
-
--#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
-+#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- bool SyscallSets::IsNetworkSocketInformation(int sysno) {
- switch (sysno) {
- case __NR_getpeername:
-@@ -520,7 +534,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
- case __NR_mincore:
- case __NR_mlockall:
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_mmap:
- #endif
- #if defined(__i386__) || defined(__arm__) || \
-@@ -550,7 +564,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
- switch (sysno) {
- case __NR_lseek:
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR__llseek:
- #endif
- #if !defined(__aarch64__)
-@@ -562,26 +577,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
- case __NR_readv:
- case __NR_pread64:
- #if defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_recv:
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_recvfrom: // Could specify source.
- case __NR_recvmsg: // Could specify source.
- #endif
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
- case __NR_select:
- #endif
--#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
- case __NR__newselect:
- #endif
- #if defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_send:
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_sendmsg: // Could specify destination.
- case __NR_sendto: // Could specify destination.
- #endif
-@@ -638,7 +655,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
- return true;
- case __NR_getpriority:
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_nice:
- #endif
- case __NR_setpriority:
-@@ -650,7 +668,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
- bool SyscallSets::IsAdminOperation(int sysno) {
- switch (sysno) {
- #if defined(__i386__) || defined(__arm__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_bdflush:
- #endif
- case __NR_kexec_load:
-@@ -666,7 +685,8 @@ bool SyscallSets::IsAdminOperation(int sysno) {
-
- bool SyscallSets::IsKernelModule(int sysno) {
- switch (sysno) {
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_create_module:
- case __NR_get_kernel_syms: // Should ENOSYS.
- case __NR_query_module:
-@@ -699,7 +719,8 @@ bool SyscallSets::IsFsControl(int sysno) {
- case __NR_swapoff:
- case __NR_swapon:
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_umount:
- #endif
- case __NR_umount2:
-@@ -715,7 +736,7 @@ bool SyscallSets::IsNuma(int sysno) {
- case __NR_getcpu:
- case __NR_mbind:
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_migrate_pages:
- #endif
- case __NR_move_pages:
-@@ -744,14 +765,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) {
- switch (sysno) {
- case __NR_acct: // Privileged.
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- case __NR_getrlimit:
- #endif
--#if defined(__i386__) || defined(__arm__)
-+#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
- case __NR_ugetrlimit:
- #endif
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_ulimit:
- #endif
- case __NR_getrusage:
-@@ -785,7 +807,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) {
- #endif
- case __NR_sysinfo:
- case __NR_uname:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
- case __NR_olduname:
- case __NR_oldolduname:
- #endif
-@@ -847,8 +869,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) {
- }
- #endif
-
-+/* shitty hack around Void's 4.19 kernel headers missing those numbers */
-+#if defined(__powerpc64__) && !defined(__NR_shmget)
-+#define __NR_shmget 395
-+#define __NR_shmctl 396
-+#define __NR_shmat 397
-+#define __NR_shmdt 398
-+#endif
-+
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
-- defined(__aarch64__) || \
-+ defined(__aarch64__) || defined(__powerpc64__) || \
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
- // These give a lot of ambient authority and bypass the setuid sandbox.
- bool SyscallSets::IsSystemVSharedMemory(int sysno) {
-@@ -880,7 +910,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
- #endif
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- // Big system V multiplexing system call.
- bool SyscallSets::IsSystemVIpc(int sysno) {
- switch (sysno) {
-@@ -900,7 +931,8 @@ bool SyscallSets::IsAnySystemV(int sysno) {
- return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
- IsSystemVSharedMemory(sysno);
- #elif defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- return IsSystemVIpc(sysno);
- #endif
- }
-@@ -953,7 +985,8 @@ bool SyscallSets::IsFaNotify(int sysno) {
- bool SyscallSets::IsTimer(int sysno) {
- switch (sysno) {
- case __NR_getitimer:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_alarm:
- #endif
- case __NR_setitimer:
-@@ -1012,18 +1045,22 @@ bool SyscallSets::IsMisc(int sysno) {
- case __NR_syncfs:
- case __NR_vhangup:
- // The system calls below are not implemented.
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_afs_syscall:
- #endif
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_break:
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_getpmsg:
- #endif
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_gtty:
- case __NR_idle:
- case __NR_lock:
-@@ -1031,20 +1068,22 @@ bool SyscallSets::IsMisc(int sysno) {
- case __NR_prof:
- case __NR_profil:
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__powerpc64__)
- case __NR_putpmsg:
- #endif
- #if defined(__x86_64__)
- case __NR_security:
- #endif
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- case __NR_stty:
- #endif
--#if defined(__x86_64__)
-+#if defined(__x86_64__) || defined(__powerpc64__)
- case __NR_tuxcall:
- #endif
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__powerpc64__)
- case __NR_vserver:
- #endif
- return true;
-diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.h sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-index 923533ec9..411f72acd 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
- static bool IsDeniedGetOrModifySocket(int sysno);
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- // Big multiplexing system call for sockets.
- static bool IsSocketCall(int sysno);
- #endif
-
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
- static bool IsNetworkSocketInformation(int sysno);
- #endif
-
-@@ -76,7 +77,7 @@ class SANDBOX_EXPORT SyscallSets {
- static bool IsSystemVSemaphores(int sysno);
- #endif
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
-- defined(__aarch64__) || \
-+ defined(__aarch64__) || defined(__powerpc64__) || \
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
- // These give a lot of ambient authority and bypass the setuid sandbox.
- static bool IsSystemVSharedMemory(int sysno);
-@@ -88,7 +89,8 @@ class SANDBOX_EXPORT SyscallSets {
- #endif
-
- #if defined(__i386__) || \
-- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+ defined(__powerpc64__)
- // Big system V multiplexing system call.
- static bool IsSystemVIpc(int sysno);
- #endif
-diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc
-index e47e98bf5..d53a7ff56 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -18,7 +18,7 @@ namespace sandbox {
- namespace {
-
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
-- defined(ARCH_CPU_MIPS_FAMILY)
-+ defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
- // Number that's not currently used by any Linux kernel ABIs.
- const int kInvalidSyscallNumber = 0x351d3;
- #else
-@@ -310,12 +310,56 @@ asm(// We need to be able to tell the kernel exactly where we made a
- // Enter the kernel
- "svc 0\n"
- "2:ret\n"
-+ ".cfi_endproc\n"
-+ ".size SyscallAsm, .-SyscallAsm\n"
-+#elif defined(__powerpc64__)
-+ ".text\n"
-+ ".align 4\n"
-+ ".type SyscallAsm @function\n"
-+ "SyscallAsm:\n"
-+ ".cfi_startproc\n"
-+
-+ // Check if r3 is negative
-+ "cmpdi 3, 0\n"
-+ "bgt 2f\n"
-+
-+ // Load address of 3f into r3 and return
-+ "mflr 10\n"
-+ "bl 1f\n"
-+ "1: mflr 3\n"
-+ "mtlr 10\n"
-+ "addi 3, 3, 4*13\n"
-+ "blr\n"
-+
-+ // Load arguments from array into r3-8
-+ // save param 3 in r10
-+ "2:\n"
-+ "mr 0, 3\n"
-+ "ld 3, 0(4)\n"
-+ "ld 5, 16(4)\n"
-+ "ld 6, 24(4)\n"
-+ "ld 7, 32(4)\n"
-+ "ld 8, 40(4)\n"
-+ "ld 4, 8(4)\n"
-+ "li 9, 0\n"
-+
-+ // Enter kernel
-+ "sc\n"
-+
-+ // Magic return address
-+ "3:\n"
-+ // Like MIPS, ppc64 return values are always positive.
-+ // Check for error in cr0.SO and negate upon error
-+ "bc 4, 3, 4f\n"
-+ "neg 3, 3\n"
-+ "4: blr\n"
-+
- ".cfi_endproc\n"
- ".size SyscallAsm, .-SyscallAsm\n"
- #endif
- ); // asm
-
--#if defined(__x86_64__)
-+#if defined(__x86_64__) || defined(__powerpc64__)
- extern "C" {
- intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
- }
-@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
- ret = inout;
- }
-
-+#elif defined(__powerpc64__)
-+ intptr_t ret = SyscallAsm(nr, args);
- #else
- #error "Unimplemented architecture"
- #endif
-@@ -445,8 +491,18 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
- // needs to be changed back.
- ret_val = -ret_val;
- SECCOMP_PARM4(ctx) = 1;
-- } else
-+ } else {
- SECCOMP_PARM4(ctx) = 0;
-+ }
-+#endif
-+#if defined(__powerpc64__)
-+ // Same as MIPS, need to invert ret and set error register (cr0.SO)
-+ if (ret_val <= -1 && ret_val >= -4095) {
-+ ret_val = -ret_val;
-+ ctx->uc_mcontext.regs->ccr |= (1 << 28);
-+ } else {
-+ ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
-+ }
- #endif
- SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
- }
-diff --git sandbox/linux/seccomp-bpf/trap.cc sandbox/linux/seccomp-bpf/trap.cc
-index 9884be8bb..98e4371aa 100644
---- a/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/sandbox/linux/seccomp-bpf/trap.cc
-@@ -232,6 +232,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
- SetIsInSigHandler();
- }
-
-+#if defined(__powerpc64__)
-+ // On ppc64+glibc, some syscalls seem to accidentally negate the first
-+ // parameter which causes checks against it to fail. For now, manually
-+ // negate them back.
-+ // TODO(shawn@anastas.io): investigate this issue further
-+ auto nr = SECCOMP_SYSCALL(ctx);
-+ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
-+ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
-+ if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
-+ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
-+ }
-+ }
-+#endif
-+
- // Copy the seccomp-specific data into a arch_seccomp_data structure. This
- // is what we are showing to TrapFnc callbacks that the system call
- // evaluator registered with the sandbox.
-diff --git sandbox/linux/services/credentials.cc sandbox/linux/services/credentials.cc
-index d7b5d8c44..4adc6d0d4 100644
---- a/sandbox/linux/services/credentials.cc
-+++ b/sandbox/linux/services/credentials.cc
-@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
- pid_t pid = -1;
- alignas(16) char stack_buf[PTHREAD_STACK_MIN];
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
-- defined(ARCH_CPU_MIPS_FAMILY)
-+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
- // The stack grows downward.
- void* stack = stack_buf + sizeof(stack_buf);
- #else
-diff --git sandbox/linux/services/syscall_wrappers.cc sandbox/linux/services/syscall_wrappers.cc
-index fcfd2aa12..f6eb32fb7 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -58,7 +58,7 @@ long sys_clone(unsigned long flags,
- #if defined(ARCH_CPU_X86_64)
- return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
- #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
-- defined(ARCH_CPU_MIPS_FAMILY)
-+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
- // CONFIG_CLONE_BACKWARDS defined.
- return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
- #endif
-diff --git sandbox/linux/syscall_broker/broker_process.cc sandbox/linux/syscall_broker/broker_process.cc
-index 8321d2379..7e5ad1de3 100644
---- a/sandbox/linux/syscall_broker/broker_process.cc
-+++ b/sandbox/linux/syscall_broker/broker_process.cc
-@@ -157,7 +157,7 @@ bool BrokerProcess::IsSyscallAllowed(int sysno) const {
- #if defined(__NR_fstatat)
- case __NR_fstatat:
- #endif
--#if defined(__x86_64__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
- case __NR_newfstatat:
- #endif
- return !fast_check_in_client_ || allowed_command_set_.test(COMMAND_STAT);
-diff --git sandbox/linux/system_headers/linux_seccomp.h sandbox/linux/system_headers/linux_seccomp.h
-index a60fe2ad3..9dccdb51d 100644
---- a/sandbox/linux/system_headers/linux_seccomp.h
-+++ b/sandbox/linux/system_headers/linux_seccomp.h
-@@ -29,6 +29,9 @@
- #ifndef EM_AARCH64
- #define EM_AARCH64 183
- #endif
-+#ifndef EM_PPC64
-+#define EM_PPC64 21
-+#endif
-
- #ifndef __AUDIT_ARCH_64BIT
- #define __AUDIT_ARCH_64BIT 0x80000000
-@@ -54,6 +57,12 @@
- #ifndef AUDIT_ARCH_AARCH64
- #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
- #endif
-+#ifndef AUDIT_ARCH_PPC64
-+#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
-+#endif
-+#ifndef AUDIT_ARCH_PPC64LE
-+#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
-+#endif
-
- // For prctl.h
- #ifndef PR_SET_SECCOMP
-diff --git sandbox/linux/system_headers/linux_signal.h sandbox/linux/system_headers/linux_signal.h
-index f5a736761..515b21a5f 100644
---- a/sandbox/linux/system_headers/linux_signal.h
-+++ b/sandbox/linux/system_headers/linux_signal.h
-@@ -13,7 +13,7 @@
- // (not undefined, but defined different values and in different memory
- // layouts). So, fill the gap here.
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
-- defined(__aarch64__)
-+ defined(__aarch64__) || defined(__powerpc64__)
-
- #define LINUX_SIGHUP 1
- #define LINUX_SIGINT 2
-diff --git sandbox/linux/system_headers/linux_syscalls.h sandbox/linux/system_headers/linux_syscalls.h
-index 2b78a0cc3..0a70f5ea5 100644
---- a/sandbox/linux/system_headers/linux_syscalls.h
-+++ b/sandbox/linux/system_headers/linux_syscalls.h
-@@ -35,5 +35,9 @@
- #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
- #endif
-
-+#if defined(__powerpc64__)
-+#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
-
-diff --git sandbox/linux/system_headers/linux_ucontext.h sandbox/linux/system_headers/linux_ucontext.h
-index 22ce78027..a69b024c2 100644
---- a/sandbox/linux/system_headers/linux_ucontext.h
-+++ b/sandbox/linux/system_headers/linux_ucontext.h
-@@ -11,6 +11,8 @@
- #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
- #elif defined(__i386__)
- #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
-+#elif defined(__powerpc64__)
-+#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
- #else
- #error "No support for your architecture in PNaCl header"
- #endif
-diff --git sandbox/linux/system_headers/ppc64_linux_syscalls.h sandbox/linux/system_headers/ppc64_linux_syscalls.h
-new file mode 100644
-index 000000000..ccacffe22
---- /dev/null
-+++ b/sandbox/linux/system_headers/ppc64_linux_syscalls.h
-@@ -0,0 +1,12 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-+
-+#include <asm/unistd.h>
-+
-+//TODO: is it necessary to redefine syscall numbers for PPC64?
-+
-+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-diff --git sandbox/linux/system_headers/ppc64_linux_ucontext.h sandbox/linux/system_headers/ppc64_linux_ucontext.h
-new file mode 100644
-index 000000000..07728e087
---- /dev/null
-+++ b/sandbox/linux/system_headers/ppc64_linux_ucontext.h
-@@ -0,0 +1,12 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-+
-+#include <sys/ucontext.h>
-+
-+//TODO: is it necessary to redefine ucontext on PPC64?
-+
-+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-diff --git services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index fb89b3356..1e984731e 100644
---- a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -15,6 +15,11 @@
- #include "sandbox/linux/system_headers/linux_syscalls.h"
- #include "services/service_manager/sandbox/linux/sandbox_linux.h"
-
-+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
-+#ifdef __powerpc64__
-+#include <termios.h>
-+#endif
-+
- // TODO(vignatti): replace the local definitions below with #include
- // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
- #include <linux/types.h>
-diff --git third_party/angle/src/compiler/translator/InfoSink.h third_party/angle/src/compiler/translator/InfoSink.h
-index 3a807e1e..5258617a 100644
---- a/third_party/angle/src/compiler/translator/InfoSink.h
-+++ b/third_party/angle/src/compiler/translator/InfoSink.h
-@@ -92,7 +92,16 @@ class TInfoSinkBase
- stream.precision(8);
- stream << f;
- }
-- sink.append(stream.str());
-+
-+ // Hack to work around a bug where negative floating point values
-+ // are rendered like '.0.5' instead of '-0.5'
-+ std::string res(stream.str());
-+
-+ if (signbit(f)) { // test if f is negative
-+ res[0] = '-';
-+ }
-+
-+ sink.append(res);
- return *this;
- }
- // Write boolean values as their names instead of integral value.
-diff --git third_party/angle/src/libANGLE/Constants.h third_party/angle/src/libANGLE/Constants.h
-index 42964cc1..6607deeb 100644
---- a/third_party/angle/src/libANGLE/Constants.h
-+++ b/third_party/angle/src/libANGLE/Constants.h
-@@ -9,6 +9,7 @@
- #ifndef LIBANGLE_CONSTANTS_H_
- #define LIBANGLE_CONSTANTS_H_
-
-+#include <cstddef>
- #include "common/platform.h"
-
- #include <stdint.h>
-diff --git third_party/boringssl/BUILD.gn third_party/boringssl/BUILD.gn
-index b435499f4..ac8a84b6d 100644
---- a/third_party/boringssl/BUILD.gn
-+++ b/third_party/boringssl/BUILD.gn
-@@ -101,6 +101,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
- } else {
- public_configs = [ ":no_asm_config" ]
- }
-+ } else if (current_cpu == "ppc64") {
-+ if (is_linux) {
-+ # TODO: ppc64 (be) check
-+ sources += crypto_sources_linux_ppc64le
-+ } else {
-+ public_configs = [ ":no_asm_config" ]
-+ }
- } else {
- public_configs = [ ":no_asm_config" ]
- }
-diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
-index 5617de88..dc8bc176 100644
---- a/third_party/breakpad/BUILD.gn
-+++ b/third_party/breakpad/BUILD.gn
-@@ -598,7 +598,6 @@ if (is_linux || is_android) {
- "breakpad/src/client/minidump_file_writer.h",
- "breakpad/src/common/convert_UTF.cc",
- "breakpad/src/common/convert_UTF.h",
-- "breakpad/src/common/linux/breakpad_getcontext.S",
- "breakpad/src/common/linux/elf_core_dump.cc",
- "breakpad/src/common/linux/elf_core_dump.h",
- "breakpad/src/common/linux/elfutils.cc",
-@@ -636,6 +635,14 @@ if (is_linux || is_android) {
-
- libs = [ "dl" ]
-
-+ if (current_cpu == "ppc64") {
-+ defines = [ "HAVE_GETCONTEXT" ]
-+ } else {
-+ sources += [
-+ "breakpad/src/common/linux/breakpad_getcontext.S"
-+ ]
-+ }
-+
- include_dirs = [
- ".",
- "breakpad/src",
-@@ -686,7 +693,6 @@ if (is_linux || is_android) {
- "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
- "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
- "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
-- "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
- "breakpad/src/common/linux/elf_core_dump_unittest.cc",
- "breakpad/src/common/linux/file_id_unittest.cc",
- "breakpad/src/common/linux/linux_libc_support_unittest.cc",
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-index 07d9171a..9aed4cb3 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
- typedef MDRawContextARM64_Old RawContextCPU;
- #elif defined(__mips__)
- typedef MDRawContextMIPS RawContextCPU;
-+#elif defined(__powerpc64__)
-+typedef MDRawContextPPC64 RawContextCPU;
- #else
- #error "This code has not been ported to your platform yet."
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index aae1dc13..03afec7a 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-@@ -270,7 +270,42 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
- out->float_save.fir = mcontext.fpc_eir;
- #endif
- }
--#endif // __mips__
-+
-+#elif defined(__powerpc64__)
-+
-+uintptr_t ThreadInfo::GetInstructionPointer() const {
-+ return mcontext.gp_regs[PT_NIP];
-+}
-+
-+void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-+ out->context_flags = MD_CONTEXT_PPC64_FULL;
-+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+ out->gpr[i] = mcontext.gp_regs[i];
-+
-+ out->lr = mcontext.gp_regs[PT_LNK];
-+ out->srr0 = mcontext.gp_regs[PT_NIP];
-+ out->srr1 = mcontext.gp_regs[PT_MSR];
-+ out->cr = mcontext.gp_regs[PT_CCR];
-+ out->xer = mcontext.gp_regs[PT_XER];
-+ out->ctr = mcontext.gp_regs[PT_CTR];
-+
-+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+ out->float_save.fpregs[i] = mcontext.fp_regs[i];
-+
-+ out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
-+
-+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-+ out->vector_save.save_vr[i] = \
-+ {(((uint64_t)vregs.vrregs[i][0]) << 32)
-+ | vregs.vrregs[i][1],
-+ (((uint64_t)vregs.vrregs[i][2]) << 32)
-+ | vregs.vrregs[i][3]};
-+
-+ out->vrsave = vregs.vrsave;
-+ out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
-+ out->vector_save.save_vrvalid = 0xFFFFFFFF;
-+}
-+#endif // __powerpc64__
-
- void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
- assert(gp_regs || size);
-@@ -279,6 +314,11 @@ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
- *gp_regs = mcontext.gregs;
- if (size)
- *size = sizeof(mcontext.gregs);
-+#elif defined(__powerpc64__)
-+ if (gp_regs)
-+ *gp_regs = mcontext.gp_regs;
-+ if (size)
-+ *size = sizeof(mcontext.gp_regs);
- #else
- if (gp_regs)
- *gp_regs = ®s;
-@@ -294,6 +334,11 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
- *fp_regs = &mcontext.fpregs;
- if (size)
- *size = sizeof(mcontext.fpregs);
-+#elif defined(__powerpc64__)
-+ if (fp_regs)
-+ *fp_regs = &mcontext.fp_regs;
-+ if (size)
-+ *size = sizeof(mcontext.fp_regs);
- #else
- if (fp_regs)
- *fp_regs = &fpregs;
-@@ -302,4 +347,13 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
- #endif
- }
-
-+#if defined(__powerpc64__)
-+void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
-+ if (v_regs)
-+ *v_regs = &vregs;
-+ if (size)
-+ *size = sizeof(vregs);
-+}
-+#endif
-+
- } // namespace google_breakpad
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-index fb216fa6..593aac82 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-@@ -68,6 +68,10 @@ struct ThreadInfo {
- // Use the structures defined in <sys/user.h>
- struct user_regs_struct regs;
- struct user_fpsimd_struct fpregs;
-+#elif defined(__powerpc64__)
-+ // Use the structures defined in <sys/ucontext.h>.
-+ mcontext_t mcontext;
-+ vrregset_t vregs;
- #elif defined(__mips__)
- // Use the structure defined in <sys/ucontext.h>.
- mcontext_t mcontext;
-@@ -84,6 +88,11 @@ struct ThreadInfo {
-
- // Returns the pointer and size of float point register area.
- void GetFloatingPointRegisters(void** fp_regs, size_t* size);
-+
-+#if defined(__powerpc64__)
-+ // Returns the pointer and size of the vector register area. (PPC64 only)
-+ void GetVectorRegisters(void** v_regs, size_t* size);
-+#endif
- };
-
- } // namespace google_breakpad
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index ee515c41..1090470f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- out->float_save.fir = uc->uc_mcontext.fpc_eir; // Unused.
- #endif
- }
-+
-+#elif defined(__powerpc64__)
-+
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-+ return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
-+}
-+
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-+ return uc->uc_mcontext.gp_regs[PT_NIP];
-+}
-+
-+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
-+ const vrregset_t* vregs) {
-+ out->context_flags = MD_CONTEXT_PPC64_FULL;
-+
-+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+ out->gpr[i] = uc->uc_mcontext.gp_regs[i];
-+
-+ out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
-+ out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
-+ out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
-+ out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
-+ out->xer = uc->uc_mcontext.gp_regs[PT_XER];
-+ out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
-+
-+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+ out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
-+
-+ out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
-+
-+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-+ out->vector_save.save_vr[i] =
-+ {(((uint64_t)vregs->vrregs[i][0]) << 32)
-+ | vregs->vrregs[i][1],
-+ (((uint64_t)vregs->vrregs[i][2]) << 32)
-+ | vregs->vrregs[i][3]};
-+
-+ out->vrsave = vregs->vrsave;
-+ out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
-+ out->vector_save.save_vrvalid = 0xFFFFFFFF;
-+}
-+
- #endif
-
- } // namespace google_breakpad
-diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index 8e74a8a5..7cb667a7 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -55,6 +55,9 @@ struct UContextReader {
- #elif defined(__aarch64__)
- static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs);
-+#elif defined(__powerpc64__)
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-+ const vrregset_t* vregs);
- #else
- static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index c65feaa1..5a7ab50c 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -461,9 +461,16 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
- memcpy(&g_crash_context_.float_state, fp_ptr,
- sizeof(g_crash_context_.float_state));
- }
-+#elif defined(__powerpc64__)
-+ // On PPC64, we must copy VR state
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
-+ if (uc_ptr->uc_mcontext.v_regs) {
-+ memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
-+ sizeof(g_crash_context_.vector_state));
-+ }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- // FP state is not part of user ABI on ARM Linux.
-- // In case of MIPS Linux FP state is already part of ucontext_t
-+ // In case of MIPS, Linux FP state is already part of ucontext_t
- // and 'float_state' is not a member of CrashContext.
- ucontext_t* uc_ptr = (ucontext_t*)uc;
- if (uc_ptr->uc_mcontext.fpregs) {
-@@ -701,11 +708,19 @@ bool ExceptionHandler::WriteMinidump() {
- }
- #endif
-
--#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
-+#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
-+ && !defined(__powerpc64__)
- // FPU state is not part of ARM EABI ucontext_t.
- memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
- sizeof(context.float_state));
- #endif
-+
-+#if defined(__powerpc64__)
-+ // Vector registers must be copied on PPC64
-+ memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
-+ sizeof(context.vector_state));
-+#endif
-+
- context.tid = sys_gettid();
-
- // Add an exception stream to the minidump for better reporting.
-@@ -726,6 +741,9 @@ bool ExceptionHandler::WriteMinidump() {
- #elif defined(__mips__)
- context.siginfo.si_addr =
- reinterpret_cast<void*>(context.context.uc_mcontext.pc);
-+#elif defined(__powerpc64__)
-+ context.siginfo.si_addr =
-+ reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
- #else
- #error "This code has not been ported to your platform yet."
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-index f44483ff..36ce6d6c 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-@@ -192,7 +192,11 @@ class ExceptionHandler {
- siginfo_t siginfo;
- pid_t tid; // the crashing thread.
- ucontext_t context;
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ // PPC64's FP state is a part of ucontext_t like MIPS but the vector
-+ // state is not, so a struct is needed.
-+ vstate_t vector_state;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- // #ifdef this out because FP state is not part of user ABI for Linux ARM.
- // In case of MIPS Linux FP state is already part of ucontext_t so
- // 'float_state' is not required.
-diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-index 8d8809fa..e2eb031e 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) {
- }
-
- // Wait a while until the child should have crashed.
-- usleep(1000000);
-+ usleep(2000000);
- // Kill the child if it is still running.
- kill(child, SIGKILL);
-
-@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[] = {
- #if defined(__mips__)
- // mfc2 zero,Impl - usually illegal in userspace.
- 0x48, 0x00, 0x00, 0x48
-+#elif defined(__powerpc64__)
-+ 0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
- #else
- // This crashes with SIGILL on x86/x86-64/arm.
- 0xff, 0xff, 0xff, 0xff
-@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
-
- // These are defined here so the parent can use them to check the
- // data from the minidump afterwards.
-- // Use 4k here because the OS will hand out a single page even
-+ // Use the page size here because the OS will hand out a single page even
- // if a smaller size is requested, and this test wants to
- // test the upper bound of the memory range.
-- const uint32_t kMemorySize = 4096; // bytes
-+ const uint32_t kMemorySize = getpagesize(); // bytes
- const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
-
- const pid_t child = fork();
-diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-index fa3c1713..6ce709e2 100644
---- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-@@ -138,7 +138,9 @@ class MicrodumpWriter {
- const MicrodumpExtraInfo& microdump_extra_info,
- LinuxDumper* dumper)
- : ucontext_(context ? &context->context : NULL),
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ vector_state_(context ? &context->vector_state : NULL),
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- float_state_(context ? &context->float_state : NULL),
- #endif
- dumper_(dumper),
-@@ -337,6 +339,8 @@ class MicrodumpWriter {
- # else
- # error "This mips ABI is currently not supported (n32)"
- #endif
-+#elif defined(__powerpc64__)
-+ const char kArch[] = "ppc64";
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-@@ -409,7 +413,9 @@ class MicrodumpWriter {
- void DumpCPUState() {
- RawContextCPU cpu;
- my_memset(&cpu, 0, sizeof(RawContextCPU));
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
- #else
- UContextReader::FillCPUContext(&cpu, ucontext_);
-@@ -605,7 +611,9 @@ class MicrodumpWriter {
- void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
-
- const ucontext_t* const ucontext_;
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ const google_breakpad::vstate_t* const vector_state_;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_;
- #endif
- LinuxDumper* dumper_;
-diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-index 6339ac0c..291af106 100644
---- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappings) {
- CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
- ASSERT_TRUE(ContainsMicrodump(buf));
-
-+ int page_size = getpagesize();
- #ifdef __LP64__
-- ASSERT_NE(std::string::npos,
-- buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
-- "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+ // This test is only available for the following page sizes
-+ ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
-+ if (page_size == 4096) {
-+ ASSERT_NE(std::string::npos,
-+ buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
-+ "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+ } else {
-+ ASSERT_NE(std::string::npos,
-+ buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
-+ "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+ }
- #else
- ASSERT_NE(std::string::npos,
- buf.find("M 00001000 0000002A 00001000 "
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-index 41506898..b93e4afc 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-@@ -112,6 +112,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
- #elif defined(__mips__)
- stack_pointer =
- reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
-+#elif defined(__powerpc64__)
-+ stack_pointer =
-+ reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
- #else
- #error "This code hasn't been ported to your platform yet."
- #endif
-@@ -197,7 +200,10 @@ bool LinuxCoreDumper::EnumerateThreads() {
- memset(&info, 0, sizeof(ThreadInfo));
- info.tgid = status->pr_pgrp;
- info.ppid = status->pr_ppid;
--#if defined(__mips__)
-+#if defined(__powerpc64__)
-+ for (int i = 0; i < 31; i++)
-+ info.mcontext.gp_regs[i] = status->pr_reg[i];
-+#elif defined(__mips__)
- #if defined(__ANDROID__)
- for (int i = EF_R0; i <= EF_R31; i++)
- info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-index 1112035b..8523dad6 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len,
- reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
-
- // The number of bytes of stack which we try to capture.
-- static const ptrdiff_t kStackToCapture = 32 * 1024;
-+ // This now depends on page_size to avoid missing data
-+ // on systems with larger page sizes.
-+ static const ptrdiff_t kStackToCapture = 8 * page_size;
-
- const MappingInfo* mapping = FindMapping(stack_pointer);
- if (!mapping)
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-index f4a75d90..020981f5 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-@@ -63,7 +63,8 @@ namespace google_breakpad {
- (defined(__mips__) && _MIPS_SIM == _ABIO32)
- typedef Elf32_auxv_t elf_aux_entry;
- #elif defined(__x86_64) || defined(__aarch64__) || \
-- (defined(__mips__) && _MIPS_SIM != _ABIO32)
-+ (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
-+ defined(__powerpc64__)
- typedef Elf64_auxv_t elf_aux_entry;
- #endif
-
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-index 3ad48e50..1688c365 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-@@ -51,6 +51,8 @@
- #define TID_PTR_REGISTER "rcx"
- #elif defined(__mips__)
- #define TID_PTR_REGISTER "$1"
-+#elif defined(__powerpc64__)
-+#define TID_PTR_REGISTER "r8"
- #else
- #error This test has not been ported to this platform.
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-index e3ddb81a..fa28575e 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-@@ -149,19 +149,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child,
- return true;
- }
-
--bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
--{
-+bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
- #ifdef PTRACE_GETREGSET
- struct iovec io;
- info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
-- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
-+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
- return false;
- }
-
- info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
-- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
-+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
- return false;
- }
-+
-+#if defined(__powerpc64__)
-+ // Grab the vector registers on PPC64 too
-+ info->GetVectorRegisters(&io.iov_base, &io.iov_len);
-+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
-+ return false;
-+ }
-+#endif // defined(__powerpc64__)
-+
- return true;
- #else
- return false;
-@@ -298,6 +306,9 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
- #elif defined(__mips__)
- stack_pointer =
- reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
-+#elif defined(__powerpc64__)
-+ stack_pointer =
-+ reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
- #else
- #error "This code hasn't been ported to your platform yet."
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-index ea6b9a12..9b318fe0 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
- #elif defined(__mips__)
- pid_t* process_tid_location =
- reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
-+#elif defined(__powerpc64__)
-+ pid_t* process_tid_location =
-+ reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
- #else
- #error This test has not been ported to this platform.
- #endif
-@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeStackCopy) {
- uintptr_t heap_addr = thread_info.regs.rcx;
- #elif defined(__mips__)
- uintptr_t heap_addr = thread_info.mcontext.gregs[1];
-+#elif defined(__powerpc64__)
-+ uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
- #else
- #error This test has not been ported to this platform.
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-index f8cdf2a1..cb808c15 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-@@ -136,7 +136,9 @@ class MinidumpWriter {
- : fd_(minidump_fd),
- path_(minidump_path),
- ucontext_(context ? &context->context : NULL),
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ vector_state_(context ? &context->vector_state : NULL),
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- float_state_(context ? &context->float_state : NULL),
- #endif
- dumper_(dumper),
-@@ -468,7 +470,9 @@ class MinidumpWriter {
- if (!cpu.Allocate())
- return false;
- my_memset(cpu.get(), 0, sizeof(RawContextCPU));
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
- #else
- UContextReader::FillCPUContext(cpu.get(), ucontext_);
-@@ -897,7 +901,7 @@ class MinidumpWriter {
- dirent->location.rva = 0;
- }
-
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
- bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
- char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
- static const char vendor_id_name[] = "vendor_id";
-@@ -917,7 +921,9 @@ class MinidumpWriter {
-
- // processor_architecture should always be set, do this first
- sys_info->processor_architecture =
--#if defined(__mips__)
-+#if defined(__powerpc64__)
-+ MD_CPU_ARCHITECTURE_PPC64;
-+#elif defined(__mips__)
- # if _MIPS_SIM == _ABIO32
- MD_CPU_ARCHITECTURE_MIPS;
- # elif _MIPS_SIM == _ABI64
-@@ -1333,7 +1339,9 @@ class MinidumpWriter {
- const char* path_; // Path to the file where the minidum should be written.
-
- const ucontext_t* const ucontext_; // also from the signal handler
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+ const google_breakpad::vstate_t* const vector_state_;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_; // ditto
- #endif
- LinuxDumper* dumper_;
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-index e3b0b16d..ccd8aa0a 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-@@ -48,6 +48,8 @@ class ExceptionHandler;
-
- #if defined(__aarch64__)
- typedef struct fpsimd_context fpstate_t;
-+#elif defined(__powerpc64__)
-+typedef vrregset_t vstate_t;
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- typedef std::remove_pointer<fpregset_t>::type fpstate_t;
- #endif
-diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-index 3017a49a..364efd79 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-@@ -715,6 +715,9 @@ TEST(MinidumpWriterTest, InvalidStackPointer) {
- #elif defined(__mips__)
- context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
- invalid_stack_pointer;
-+#elif defined(__powerpc64__)
-+ context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
-+ invalid_stack_pointer;
- #else
- # error "This code has not been ported to your platform yet."
- #endif
-diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-index 4e938269..f0ff15d9 100644
---- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-+++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) {
- }
-
- #if defined(__x86_64__) || defined(__aarch64__) || \
-- (defined(__mips__) && _MIPS_SIM == _ABI64)
--
-+ (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
- struct kernel_stat st;
- if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
- #else
-diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-index fad59f40..616496d6 100644
---- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterMap) {
- TEST_F(MemoryMappedFileTest, MapWithOffset) {
- // Put more data in the test file this time. Offsets can only be
- // done on page boundaries, so we need a two page file to test this.
-- const int page_size = 4096;
-- char data1[2 * page_size];
-- size_t data1_size = sizeof(data1);
-+ const int page_size = getpagesize();
-+ char *data1 = static_cast<char*>(malloc(2 * page_size));
-+ EXPECT_TRUE(data1 != NULL);
-+ size_t data1_size = (2 * page_size);
- for (size_t i = 0; i < data1_size; ++i) {
- data1[i] = i & 0x7f;
- }
-diff --git third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-index 43c86314..27325b81 100644
---- a/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-@@ -57,8 +57,9 @@
-
- EXPECT_EQ(0U, allocator.pages_allocated());
- uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
-+ uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
- ASSERT_FALSE(p == NULL);
-- EXPECT_EQ(3U, allocator.pages_allocated());
-+ EXPECT_EQ(expected_pages, allocator.pages_allocated());
- for (unsigned i = 1; i < 10; ++i) {
- uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
- ASSERT_FALSE(p == NULL);
-diff --git third_party/breakpad/breakpad/src/processor/exploitability_linux.cc third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-index ccc9f145..debaed4d 100644
---- a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-+++ b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) {
- // Check architecture and set architecture variable to corresponding flag
- // in objdump.
- switch (context->GetContextCPU()) {
-+#if defined(__i386) || defined(__x86_64)
- case MD_CONTEXT_X86:
- architecture = "i386";
- break;
- case MD_CONTEXT_AMD64:
- architecture = "i386:x86-64";
- break;
-+#endif
- default:
- // Unsupported architecture. Note that ARM architectures are not
- // supported because objdump does not support ARM.
-diff --git third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-index 528ee5f2..72764d6c 100644
---- a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename) {
- }
-
- TEST(ExploitabilityTest, TestWindowsEngine) {
-+// The following tests are only executable on an x86-class linux machine.
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
- ExploitabilityFor("ascii_read_av.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngine) {
- ExploitabilityFor("read_av_clobber_write.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
- ExploitabilityFor("read_av_conditional.dmp"));
-+#endif
- }
-
- TEST(ExploitabilityTest, TestLinuxEngine) {
-+// The following tests are only executable on an x86-class linux machine.
-+#if defined(__i386) || defined(__x86_64)
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
- ExploitabilityFor("linux_null_read_av.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
- ExploitabilityFor("linux_executable_heap.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
- ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
--#ifndef _WIN32
-+#endif
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
- ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
- ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
- ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
- ExploitabilityFor("linux_write_to_under_4k.dmp"));
--#endif // _WIN32
-+#endif // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
- }
-
--#ifndef _WIN32
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
- TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
- ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
- uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
-@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, CalculateAddressTest) {
- context,
- &write_address));
- }
--#endif // _WIN32
-+#endif // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
-+
-
- } // namespace
-diff --git third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-index a60be323..35b11b6d 100644
---- a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-+++ b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-@@ -77,6 +77,8 @@
- #define ELF_ARCH EM_MIPS
- #elif defined(__aarch64__)
- #define ELF_ARCH EM_AARCH64
-+#elif defined(__powerpc64__)
-+ #define ELF_ARCH EM_PPC64
- #endif
-
- #if defined(__arm__)
-@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
- #elif defined (__mips__)
- // This file-local typedef simplifies the source code.
- typedef gregset_t user_regs_struct;
-+#elif defined(__powerpc64__)
-+typedef struct pt_regs user_regs_struct;
- #endif
-
- using google_breakpad::MDTypeHelper;
-@@ -321,6 +325,9 @@ struct CrashedProcess {
- #endif
- #if defined(__aarch64__)
- user_fpsimd_struct fpregs;
-+#endif
-+#if defined(__powerpc64__)
-+ mcontext_t mcontext;
- #endif
- uintptr_t stack_addr;
- const uint8_t* stack;
-@@ -535,6 +542,38 @@ ParseThreadRegisters(CrashedProcess::Thread* thread,
- thread->mcontext.fpc_eir = rawregs->float_save.fir;
- #endif
- }
-+#elif defined(__powerpc64__)
-+static void
-+ParseThreadRegisters(CrashedProcess::Thread* thread,
-+ const MinidumpMemoryRange& range) {
-+ const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
-+
-+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+ thread->mcontext.gp_regs[i] = rawregs->gpr[i];
-+
-+ thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
-+ thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
-+ thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
-+ thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
-+ thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
-+ thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
-+ thread->mcontext.v_regs->vrsave = rawregs->vrsave;
-+
-+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+ thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
-+
-+ thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
-+
-+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
-+ thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
-+ thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
-+ thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
-+ thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
-+ }
-+
-+ thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
-+}
-+
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-@@ -623,6 +662,12 @@ ParseSystemInfo(const Options& options, CrashedProcess* crashinfo,
- # else
- # error "This mips ABI is currently not supported (n32)"
- # endif
-+#elif defined(__powerpc64__)
-+ if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
-+ fprintf(stderr,
-+ "This version of minidump-2-core only supports PPC64.\n");
-+ exit(1);
-+ }
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-diff --git third_party/crashpad/crashpad/CONTRIBUTORS third_party/crashpad/crashpad/CONTRIBUTORS
-index 8724b7f3..8e29424e 100644
---- a/third_party/crashpad/crashpad/CONTRIBUTORS
-+++ b/third_party/crashpad/crashpad/CONTRIBUTORS
-@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
- Robert Sesek <rsesek@chromium.org>
- Scott Graham <scottmg@chromium.org>
- Joshua Peraza <jperaza@chromium.org>
-+Shawn Anastasio <shawn@anastas.io>
-diff --git third_party/crashpad/crashpad/compat/linux/sys/user.h third_party/crashpad/crashpad/compat/linux/sys/user.h
-index 6ed77a98..1fd83469 100644
---- a/third_party/crashpad/crashpad/compat/linux/sys/user.h
-+++ b/third_party/crashpad/crashpad/compat/linux/sys/user.h
-@@ -15,6 +15,7 @@
- #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
- #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
-
-+#include <cstddef>
- #include_next <sys/user.h>
-
- #include <features.h>
-diff --git third_party/crashpad/crashpad/minidump/minidump_context.h third_party/crashpad/crashpad/minidump/minidump_context.h
-index 3a3e603c..3118d9e9 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context.h
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context.h
-@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
- uint64_t fir;
- };
-
-+//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
-+//! Based on minidump_cpu_ppc64.h from breakpad
-+enum MinidumpContextPPC64Flags : uint32_t {
-+ //! \brief Identifies the context as PPC64.
-+ kMinidumpContextPPC64 = 0x01000000,
-+
-+ //! \brief Indicates the validity of general purpose registers.
-+ //!
-+ //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
-+ kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
-+
-+ //! \brief Indicates the validity of floating point registers.
-+ //!
-+ //! Registers `fp0`-`fp31`, `fpscr` are valid.
-+ kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
-+
-+ //! \brief Indicates the validity of Altivec/VMX registers.
-+ //!
-+ //! Registers `v0`-`v31`, `vscr`, `vrsave`.
-+ kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
-+
-+ //! \brief Indicates the validity of all registers
-+ kMinidumpContextPPC64All = kMinidumpContextPPC64Base |
-+ kMinidumpContextPPC64Floating |
-+ kMinidumpContextPPC64Vector
-+};
-+
-+//! \brief A PPC64 CPU context carried in a minidump file.
-+//! Based on minidump_cpu_ppc64.h from breakpad.
-+struct MinidumpContextPPC64 {
-+ uint64_t context_flags;
-+
-+ //! \brief General purpose registers.
-+ uint64_t nip;
-+ uint64_t msr;
-+ uint64_t regs[32];
-+ uint64_t ccr;
-+ uint64_t xer;
-+ uint64_t lnk;
-+ uint64_t ctr;
-+
-+ //! \brief Floating point registers.
-+ double fpregs[32];
-+
-+ //! \brief FPU status register.
-+ double fpscr;
-+
-+ //! \brief Altivec/VMX vector registers.
-+ struct {
-+ //! \brief Vector registers are 128bits.
-+ uint128_struct save_vr[32];
-+ uint128_struct save_vscr;
-+
-+ //! \brief Padding included for breakpad compatibiltiy.
-+ uint32_t save_pad5[4];
-+
-+ //! \brief VRSAVE register.
-+ uint32_t save_vrsave;
-+
-+ //! \brief Padding included for breakpad compatibiltiy.
-+ uint32_t save_pad6[7];
-+ } vregs;
-+};
-+
- } // namespace crashpad
-
- #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
-diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.cc third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-index d7e53a49..d89eb9e0 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) {
- break;
- }
-
-+ case kCPUArchitecturePPC64: {
-+ context = std::make_unique<MinidumpContextPPC64Writer>();
-+ reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
-+ ->InitalizeFromSnapshot(context_snapshot->ppc64);
-+ break;
-+ }
-+
- default: {
- LOG(ERROR) << "unknown context architecture "
- << context_snapshot->architecture;
-@@ -453,4 +460,47 @@ size_t MinidumpContextMIPS64Writer::ContextSize() const {
- return sizeof(context_);
- }
-
-+MinidumpContextPPC64Writer::MinidumpContextPPC64Writer()
-+ : MinidumpContextWriter(), context_() {
-+ context_.context_flags = kMinidumpContextPPC64;
-+}
-+
-+MinidumpContextPPC64Writer::~MinidumpContextPPC64Writer() = default;
-+
-+void MinidumpContextPPC64Writer::InitalizeFromSnapshot(
-+ const CPUContextPPC64* context_snapshot) {
-+ DCHECK_EQ(state(), kStateMutable);
-+ DCHECK_EQ(context_.context_flags, kMinidumpContextPPC64);
-+
-+ context_.context_flags = kMinidumpContextPPC64All;
-+
-+ memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
-+ context_.nip = context_snapshot->nip;
-+ context_.msr = context_snapshot->msr;
-+ context_.ccr = context_snapshot->ccr;
-+ context_.xer = context_snapshot->xer;
-+ context_.lnk = context_snapshot->lnk;
-+ context_.ctr = context_snapshot->ctr;
-+
-+ memcpy(context_.fpregs, context_snapshot->fpregs, sizeof(context_.fpregs));
-+ context_.fpscr = context_snapshot->fpscr;
-+
-+ memcpy(context_.vregs.save_vr, context_snapshot->vregs.save_vr,
-+ sizeof(context_.vregs.save_vr));
-+ memcpy(&context_.vregs.save_vscr, &context_snapshot->vregs.save_vscr,
-+ sizeof(context_.vregs.save_vscr));
-+ context_.vregs.save_vrsave = context_snapshot->vregs.save_vrsave;
-+}
-+
-+bool MinidumpContextPPC64Writer::WriteObject(
-+ FileWriterInterface* file_writer) {
-+ DCHECK_EQ(state(), kStateWritable);
-+ return file_writer->Write(&context_, sizeof(context_));
-+}
-+
-+size_t MinidumpContextPPC64Writer::ContextSize() const {
-+ DCHECK_GE(state(), kStateFrozen);
-+ return sizeof(context_);
-+}
-+
- } // namespace crashpad
-diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.h third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-index d4ab936e..1d22fc59 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
- DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
- };
-
-+class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
-+ public:
-+ MinidumpContextPPC64Writer();
-+ ~MinidumpContextPPC64Writer() override;
-+
-+ //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
-+ //!
-+ //! \param[in] context_snapshot The context snapshot to use as source data.
-+ //!
-+ //! \note Valid in #kStateMutable. No mutation of context() may be done before
-+ //! calling this method, and it is not normally necessary to alter
-+ //! context() after calling this method.
-+ void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
-+
-+ //! \brief Returns a pointer to the context structure that this object will
-+ //! write.
-+ //!
-+ //! \attention This returns a non-`const` pointer to this object’s private
-+ //! data so that a caller can populate the context structure directly.
-+ //! This is done because providing setter interfaces to each field in the
-+ //! context structure would be unwieldy and cumbersome. Care must be taken
-+ //! to populate the context structure correctly. The context structure
-+ //! must only be modified while this object is in the #kStateMutable
-+ //! state.
-+ MinidumpContextPPC64* context() { return &context_; }
-+
-+ protected:
-+ // MinidumpWritable:
-+ bool WriteObject(FileWriterInterface* file_writer) override;
-+
-+ // MinidumpContextWriter:
-+ size_t ContextSize() const override;
-+
-+ private:
-+ MinidumpContextPPC64 context_;
-+
-+ DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
-+};
-+
- } // namespace crashpad
-
- #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
-diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-index 3216a906..a9fcbe9d 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
- context, ExpectMinidumpContextMIPS64, kSeed);
- }
-
-+TEST(MinidumpContextWriter, PPC64_Zeros) {
-+ EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
-+ ExpectMinidumpContextPPC64);
-+}
-+
-+TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
-+ constexpr uint32_t kSeed = 64;
-+ CPUContextPPC64 context_ppc64;
-+ CPUContext context;
-+ context.ppc64 = &context_ppc64;
-+ InitializeCPUContextPPC64(&context, kSeed);
-+ FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
-+ context, ExpectMinidumpContextPPC64, kSeed);
-+}
-+
- } // namespace
- } // namespace test
- } // namespace crashpad
-diff --git third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-index a1340760..95dc9252 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-@@ -126,6 +126,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
- static constexpr char kCPU[] = "mips";
- #elif defined(ARCH_CPU_MIPS64EL)
- static constexpr char kCPU[] = "mips64";
-+#elif defined(ARCH_CPU_PPC64)
-+ static constexpr char kCPU[] = "ppc64";
- #else
- #error define kCPU for this CPU
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/capture_memory.cc third_party/crashpad/crashpad/snapshot/capture_memory.cc
-index a51626cc..61e0b20a 100644
---- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-+++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-@@ -111,6 +111,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
- for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
- MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
- }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
-+ for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
-+ MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
-+ }
- #else
- #error Port.
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/cpu_architecture.h third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-index 811a7209..f4f83981 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-@@ -43,7 +43,10 @@ enum CPUArchitecture {
- kCPUArchitectureMIPSEL,
-
- //! \brief 64-bit MIPSEL.
-- kCPUArchitectureMIPS64EL
-+ kCPUArchitectureMIPS64EL,
-+
-+ //! \brief 64-bit PPC64.
-+ kCPUArchitecturePPC64
- };
-
- } // namespace crashpad
-diff --git third_party/crashpad/crashpad/snapshot/cpu_context.cc third_party/crashpad/crashpad/snapshot/cpu_context.cc
-index 6fb8d7e7..b01f7cad 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer() const {
- return arm->pc;
- case kCPUArchitectureARM64:
- return arm64->pc;
-+ case kCPUArchitecturePPC64:
-+ return ppc64->nip;
- default:
- NOTREACHED();
- return ~0ull;
-@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() const {
- return arm->sp;
- case kCPUArchitectureARM64:
- return arm64->sp;
-+ case kCPUArchitecturePPC64:
-+ return ppc64->regs[1];
- default:
- NOTREACHED();
- return ~0ull;
-@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
- case kCPUArchitectureX86_64:
- case kCPUArchitectureARM64:
- case kCPUArchitectureMIPS64EL:
-+ case kCPUArchitecturePPC64:
- return true;
- case kCPUArchitectureX86:
- case kCPUArchitectureARM:
-diff --git third_party/crashpad/crashpad/snapshot/cpu_context.h third_party/crashpad/crashpad/snapshot/cpu_context.h
-index fb23c467..eebede63 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_context.h
-@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
- uint64_t fir;
- };
-
-+//! \brief A context structure carrying PPC64 CPU state.
-+struct CPUContextPPC64 {
-+ uint64_t nip;
-+ uint64_t msr;
-+ uint64_t regs[32];
-+ uint64_t ccr;
-+ uint64_t xer;
-+ uint64_t lnk;
-+ uint64_t ctr;
-+ double fpregs[32];
-+ double fpscr;
-+ struct {
-+ uint128_struct save_vr[32];
-+ uint128_struct save_vscr;
-+ uint32_t save_vrsave;
-+ } vregs;
-+};
-+
- //! \brief A context structure capable of carrying the context of any supported
- //! CPU architecture.
- struct CPUContext {
-@@ -382,6 +400,7 @@ struct CPUContext {
- CPUContextARM64* arm64;
- CPUContextMIPS* mipsel;
- CPUContextMIPS64* mips64;
-+ CPUContextPPC64* ppc64;
- };
- };
-
-diff --git third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-index 9f46a489..aa677c4e 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-@@ -15,6 +15,7 @@
- #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
- #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
-
-+#include <cstring>
- #include "build/build_config.h"
- #include "snapshot/cpu_context.h"
- #include "snapshot/linux/signal_context.h"
-@@ -174,6 +175,78 @@ void InitializeCPUContextMIPS(
-
- #endif // ARCH_CPU_MIPS_FAMILY || DOXYGEN
-
-+#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
-+
-+//! \brief Initalizes a CPUContextPPC64 structure from native context
-+//! structures on Linux.
-+//!
-+//! \param[in] thread_context The native thread context.
-+//! \param[in] float_context The native float context.
-+//! \param[in] vector_context The native vector context.
-+//! \param[out] context The CPUContextPPC64 structure to initalize.
-+template <typename Traits>
-+void InitializeCPUContextPPC64(
-+ const ThreadContext::t64_t& thread_context,
-+ const FloatContext::f64_t& float_context,
-+ const VectorContext::v64_t& vector_context,
-+ typename Traits::CPUContext* context) {
-+
-+ memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
-+ context->nip = thread_context.nip;
-+ context->msr = thread_context.msr;
-+ context->ccr = thread_context.ccr;
-+ context->xer = thread_context.xer;
-+ context->lnk = thread_context.lnk;
-+ context->ctr = thread_context.ctr;
-+
-+ memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
-+ context->fpscr = float_context.fpscr;
-+
-+ for (uint8_t i = 0; i < 32; i++) {
-+ context->vregs.save_vr[i] = {
-+ (((uint64_t)vector_context.vrregs[i][0]) << 32) |
-+ vector_context.vrregs[i][1],
-+ (((uint64_t)vector_context.vrregs[i][2]) << 32) |
-+ vector_context.vrregs[i][3]
-+ };
-+ }
-+ context->vregs.save_vrsave = vector_context.vrsave;
-+ context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
-+}
-+
-+template <typename Traits>
-+void InitializeCPUContextPPC64(
-+ const SignalThreadContext64 &thread_context,
-+ const SignalFloatContext64 &float_context,
-+ const SignalVectorContext64 &vector_context,
-+ typename Traits::CPUContext* context) {
-+
-+ memcpy(context->regs, thread_context.regs, sizeof(context->regs));
-+ context->nip = thread_context.nip;
-+ context->msr = thread_context.msr;
-+ context->ccr = thread_context.ccr;
-+ context->xer = thread_context.xer;
-+ context->lnk = thread_context.lnk;
-+ context->ctr = thread_context.ctr;
-+
-+ memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
-+ context->fpscr = float_context.fpscr;
-+
-+ for (uint8_t i = 0; i < 32; i++) {
-+ context->vregs.save_vr[i] = {
-+ (((uint64_t)vector_context.vrregs[i][0]) << 32) |
-+ vector_context.vrregs[i][1],
-+ (((uint64_t)vector_context.vrregs[i][2]) << 32) |
-+ vector_context.vrregs[i][3]
-+ };
-+ }
-+ context->vregs.save_vrsave = vector_context.vrsave;
-+ context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
-+}
-+
-+
-+#endif
-+
- } // namespace internal
- } // namespace crashpad
-
-diff --git third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-index be22c903..c5df23d1 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-@@ -159,9 +159,11 @@ void TestAgainstTarget(PtraceConnection* connection) {
- const bool is_vdso_mapping =
- device == 0 && inode == 0 && mapping_name == "[vdso]";
- static constexpr char kPrefix[] = "linux-vdso.so.";
-+ static constexpr char kPrefix64[] = "linux-vdso64.so.";
- return is_vdso_mapping ==
- (module_name.empty() ||
-- module_name.compare(0, strlen(kPrefix), kPrefix) == 0);
-+ module_name.compare(0, strlen(kPrefix), kPrefix) == 0 ||
-+ module_name.compare(0, strlen(kPrefix64), kPrefix64) == 0);
- },
- module_mapping->name,
- module_mapping->device,
-diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-index cd40b3b1..6bcf23b6 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
- reader, context_address, context_.mips64);
- }
-
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+
-+template <typename Traits>
-+static bool ReadContext(ProcessReaderLinux* reader,
-+ LinuxVMAddress context_address,
-+ typename Traits::CPUContext* dest_context) {
-+ const ProcessMemory* memory = reader->Memory();
-+
-+ LinuxVMAddress gp_regs_address = context_address +
-+ offsetof(UContext, mcontext) +
-+ offsetof(typename Traits::MContext, gp_regs);
-+
-+ typename Traits::SignalThreadContext thread_context;
-+ if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
-+ LOG(ERROR) << "Couldn't read gp_regs!";
-+ return false;
-+ }
-+
-+ LinuxVMAddress fp_regs_address = context_address +
-+ offsetof(UContext, mcontext) +
-+ offsetof(typename Traits::MContext, fp_regs);
-+
-+ typename Traits::SignalFloatContext fp_context;
-+ if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
-+ LOG(ERROR) << "Couldn't read fp_regs!";
-+ return false;
-+ }
-+
-+ LinuxVMAddress v_regs_ptr_address = context_address +
-+ offsetof(UContext, mcontext) +
-+ offsetof(typename Traits::MContext, vmx_reserve) + 8;
-+
-+ typename Traits::SignalVectorContext v_context;
-+ if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
-+ LOG(ERROR) << "Couldn't read v_regs!";
-+ return false;
-+ }
-+
-+ InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
-+ v_context, dest_context);
-+
-+ return true;
-+}
-+
-+template<>
-+bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
-+ ProcessReaderLinux* reader,
-+ LinuxVMAddress context_address) {
-+ context_.architecture = kCPUArchitecturePPC64;
-+ context_.ppc64 = &context_union_.ppc64;
-+
-+ return internal::ReadContext<ContextTraits64>(
-+ reader, context_address, context_.ppc64);
-+}
-+
-+template<>
-+bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
-+ ProcessReaderLinux* reader,
-+ LinuxVMAddress context_address) {
-+ // PPC64 is 64-bit
-+ return false;
-+}
-+
- #endif // ARCH_CPU_X86_FAMILY
-
- bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
-diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-index ea0cd210..e42df520 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- CPUContextMIPS mipsel;
- CPUContextMIPS64 mips64;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ CPUContextPPC64 ppc64;
- #endif
- } context_union_;
- CPUContext context_;
-diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-index e4ff1ab7..25534dd0 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
- 0);
- #undef CPU_ARCH_NAME
- }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+using NativeCPUContext = ucontext_t;
-+
-+void InitializeContext(NativeCPUContext* context) {
-+ for (size_t reg = 0; reg < 32; ++reg) {
-+ context->uc_mcontext.gp_regs[reg] = reg;
-+ }
-+
-+ memset(&context->uc_mcontext.fp_regs, 44,
-+ sizeof(context->uc_mcontext.fp_regs));
-+}
-
-+void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
-+ EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
-+
-+ for (size_t reg = 0; reg < 32; ++reg) {
-+ EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
-+ }
-+
-+ EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
-+ sizeof(actual.ppc64->fpregs)), 0);
-+}
- #else
- #error Port.
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-index b96abfe7..df12ca56 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
- : thread_info.thread_context.t32.regs[29];
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ stack_pointer = thread_info.thread_context.t64.gpr[1];
- #else
- #error Port.
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-index 5b572361..049c3285 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-@@ -612,6 +612,8 @@ bool WriteTestModule(const base::FilePath& module_path) {
- module.ehdr.e_machine = EM_AARCH64;
- #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
- module.ehdr.e_machine = EM_MIPS;
-+#elif defined(ARCH_CPU_PPC64)
-+ module.ehdr.e_machine = EM_PPC64;
- #endif
-
- module.ehdr.e_version = EV_CURRENT;
-diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index 11002468..8e335a09 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -422,6 +422,89 @@ static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
- "context offset mismatch");
- #endif
-
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+
-+struct SignalThreadContext64 {
-+ uint64_t regs[32];
-+ uint64_t nip;
-+ uint64_t msr;
-+ uint64_t orig_r3;
-+ uint64_t ctr;
-+ uint64_t lnk;
-+ uint64_t xer;
-+ uint64_t ccr;
-+ uint64_t softe;
-+ uint64_t trap;
-+ uint64_t dar;
-+ uint64_t dsisr;
-+ uint64_t result;
-+ uint64_t dscr;
-+ uint64_t fpr0[3];
-+};
-+
-+struct SignalFloatContext64 {
-+ double regs[32];
-+ double fpscr;
-+};
-+
-+struct SignalVectorContext64 {
-+ int32_t vrregs[32][4];
-+ struct {
-+ int32_t __pad[3];
-+ int32_t vscr_word;
-+ } vscr;
-+ int32_t vrsave;
-+ int32_t __pad[3];
-+} __attribute__((__aligned__(16)));
-+
-+
-+#pragma pack(pop)
-+struct MContext64 {
-+ uint64_t reserved[4];
-+ int32_t signal;
-+ int32_t __pad0;
-+ uint64_t handler;
-+ uint64_t oldmask;
-+ uint64_t pt_regs_ptr;
-+ SignalThreadContext64 gp_regs;
-+ SignalFloatContext64 fp_regs;
-+ SignalVectorContext64 *v_regs;
-+ int64_t vmx_reserve[69];
-+};
-+
-+struct ContextTraits64 : public Traits64 {
-+ using MContext = MContext64;
-+ using SignalThreadContext = SignalThreadContext64;
-+ using SignalFloatContext = SignalFloatContext64;
-+ using SignalVectorContext = SignalVectorContext64;
-+ using CPUContext = CPUContextPPC64;
-+};
-+
-+struct ContextTraits32 : public Traits32 {};
-+
-+struct UContext {
-+ uint64_t flags;
-+ uint64_t link;
-+ SignalStack<ContextTraits64> stack;
-+ Sigset<ContextTraits64> sigmask;
-+ MContext64 mcontext;
-+};
-+#pragma pack(push, 1)
-+
-+static_assert(sizeof(UContext) == sizeof(ucontext_t),
-+ "ucontext_t size mismatch");
-+static_assert(sizeof(MContext64) == sizeof(mcontext_t),
-+ "mcontext_t size mismatch");
-+static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
-+ "gregset_t size mismatch");
-+static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
-+ "fpregset_t size mismatch");
-+static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
-+ "vrregset_t size mismatch");
-+static_assert(offsetof(UContext, mcontext) ==
-+ offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
-+static_assert(offsetof(MContext64, gp_regs) ==
-+ offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-diff --git third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-index 8564d3d4..b690ecd4 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-@@ -203,6 +203,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
- : kCPUArchitectureMIPSEL;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ return kCPUArchitecturePPC64;
- #else
- #error port to your architecture
- #endif
-@@ -218,6 +220,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // Not implementable on MIPS
- return 0;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Not yet implemented on PPC64
-+ return 0;
- #else
- #error port to your architecture
- #endif
-@@ -238,6 +243,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // Not implementable on MIPS
- return std::string();
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Not yet implemented on PPC64
-+ return std::string();
- #else
- #error port to your architecture
- #endif
-@@ -371,6 +379,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // Not implementable on MIPS
- return false;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Not yet implemented on PPC64
-+ return false;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-index e3e2bebd..8ef43752 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
- thread.thread_info.float_context.f32,
- context_.mipsel);
- }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ context_.architecture = kCPUArchitecturePPC64;
-+ context_.ppc64 = &context_union_.ppc64;
-+ InitializeCPUContextPPC64<ContextTraits64>(
-+ thread.thread_info.thread_context.t64,
-+ thread.thread_info.float_context.f64,
-+ thread.thread_info.vector_context.v64,
-+ context_.ppc64);
- #else
- #error Port.
- #endif
-diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-index 44cc6f6d..d4136461 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- CPUContextMIPS mipsel;
- CPUContextMIPS64 mips64;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ CPUContextPPC64 ppc64;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-diff --git third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-index d3d5ebdf..3fd730cb 100644
---- a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-+++ b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnection* connection) {
- if (type == AT_IGNORE) {
- continue;
- }
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+ if (type == AT_IGNOREPPC) {
-+ continue;
-+ }
-+#endif
- if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
- LOG(ERROR) << "duplicate auxv entry";
- return false;
-diff --git third_party/crashpad/crashpad/util/linux/ptrace_broker.cc third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-index 155a1e0c..5e50ceb5 100644
---- a/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-@@ -94,8 +94,8 @@ int PtraceBroker::Run() {
- }
-
- bool PtraceBroker::AllocateAttachments() {
-- constexpr size_t page_size = 4096;
-- constexpr size_t alloc_size =
-+ static size_t page_size = getpagesize();
-+ size_t alloc_size =
- (sizeof(ScopedPtraceAttach) + page_size - 1) & ~(page_size - 1);
- void* alloc = sbrk(alloc_size);
- if (reinterpret_cast<intptr_t>(alloc) == -1) {
-diff --git third_party/crashpad/crashpad/util/linux/ptracer.cc third_party/crashpad/crashpad/util/linux/ptracer.cc
-index 557e0d36..08ae434b 100644
---- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -398,6 +398,64 @@ bool GetThreadArea64(pid_t tid,
- return true;
- }
-
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
-+// That means we can simply use PTRACE_GETREGESET.
-+
-+template <typename Destination>
-+bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
-+ iovec iov;
-+ iov.iov_base = reinterpret_cast<void*>(dest);
-+ iov.iov_len = sizeof(*dest);
-+ if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
-+ PLOG_IF(ERROR, can_log) << "ptrace";
-+ return false;
-+ }
-+ if (iov.iov_len != sizeof(*dest)) {
-+ LOG_IF(ERROR, can_log) << "Unexpected registers size";
-+ return false;
-+ }
-+ return true;
-+}
-+
-+bool GetVectorRegisters64(pid_t tid,
-+ VectorContext* context,
-+ bool can_log) {
-+ return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
-+}
-+
-+bool GetFloatingPointRegisters64(pid_t tid,
-+ FloatContext* context,
-+ bool can_log) {
-+ return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
-+}
-+
-+bool GetThreadArea64(pid_t tid,
-+ const ThreadContext& context,
-+ LinuxVMAddress* address,
-+ bool can_log) {
-+ // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
-+ // is stored in GPR 13.
-+ ThreadContext::t64_t tc;
-+ if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
-+ LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
-+ return false;
-+ }
-+
-+ *address = tc.gpr[13];
-+
-+ return true;
-+}
-+
-+// Stubs for 32-bit functions not applicable on PPC64
-+bool GetFloatingPointRegisters32(pid_t tid,
-+ FloatContext* context,
-+ bool can_log) { return false; }
-+bool GetThreadArea32(pid_t tid,
-+ const ThreadContext &context,
-+ LinuxVMAddress *address,
-+ bool can_log) { return false; }
-+
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -494,6 +552,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) {
- if (is_64_bit_) {
- return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
- GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+ GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
-+#endif
- GetThreadArea64(tid,
- info->thread_context,
- &info->thread_specific_data_address,
-diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
-index 5b55c24a..dea0d1f3 100644
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -28,6 +28,10 @@
- #include <android/api-level.h>
- #endif
-
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+#include <sys/ucontext.h>
-+#endif
-+
- namespace crashpad {
-
- //! \brief The set of general purpose registers for an architecture family.
-@@ -79,6 +83,8 @@ union ThreadContext {
- uint32_t cp0_status;
- uint32_t cp0_cause;
- uint32_t padding1_;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // PPC64 is 64-bit
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -132,6 +138,21 @@ union ThreadContext {
- uint64_t cp0_badvaddr;
- uint64_t cp0_status;
- uint64_t cp0_cause;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Reflects struct pt_regs in asm/ptrace.h.
-+ uint64_t gpr[32];
-+ uint64_t nip;
-+ uint64_t msr;
-+ uint64_t orig_gpr3;
-+ uint64_t ctr;
-+ uint64_t lnk;
-+ uint64_t xer;
-+ uint64_t ccr;
-+ uint64_t softe;
-+ uint64_t trap;
-+ uint64_t dar;
-+ uint64_t dsisr;
-+ uint64_t result;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -143,6 +164,8 @@ union ThreadContext {
- using NativeThreadContext = user_regs;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // No appropriate NativeThreadsContext type available for MIPS
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ using NativeThreadContext = struct pt_regs;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
-@@ -218,6 +241,9 @@ union FloatContext {
- } fpregs[32];
- uint32_t fpcsr;
- uint32_t fpu_id;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Crashpad's PPC support is 64-bit only, so this
-+ // 32bit-only struct is declared as empty.
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -252,6 +278,10 @@ union FloatContext {
- double fpregs[32];
- uint32_t fpcsr;
- uint32_t fpu_id;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ // Reflects fpregset_t in sys/ucontext.h
-+ double fpregs[32];
-+ double fpscr;
- #else
- #error Port.
- #endif // ARCH_CPU_X86_FAMILY
-@@ -280,6 +310,8 @@ union FloatContext {
- static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // No appropriate floating point context native type for available MIPS.
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
- #else
- #error Port.
- #endif // ARCH_CPU_X86
-@@ -287,6 +319,26 @@ union FloatContext {
- static_assert(std::is_standard_layout<FloatContext>::value,
- "Not standard layout");
-
-+//! \brief The vector registers used for an architecture family
-+union VectorContext {
-+ struct v32_t {} v32;
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+ __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
-+#endif
-+ struct v64_t {
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+ // Reflects vrregset_t in sys/ucontext.h
-+ uint32_t vrregs[32][4];
-+ struct {
-+ uint32_t __pad[3];
-+ uint32_t vscr_word;
-+ } vscr;
-+ uint32_t vrsave;
-+ uint32_t __pad[3];
-+#endif
-+ } v64;
-+};
-+
- //! \brief A collection of `ptrace`-able information about a thread.
- struct ThreadInfo {
- ThreadInfo();
-@@ -298,6 +350,9 @@ struct ThreadInfo {
- //! \brief The floating point registers for the thread.
- FloatContext float_context;
-
-+ //! \brief (Optional) The vector registers used for the thread.
-+ VectorContext vector_context;
-+
- //! \brief The thread-local storage address for the thread.
- LinuxVMAddress thread_specific_data_address;
- };
-diff --git third_party/crashpad/crashpad/util/misc/capture_context.h third_party/crashpad/crashpad/util/misc/capture_context.h
-index 3ff71184..3e82f4b9 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context.h
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context.h
-@@ -68,6 +68,7 @@ using NativeCPUContext = ucontext_t;
- //! macOS/Linux/Fuchsia | x86_64 | `%%rdi`
- //! Linux | ARM/ARM64 | `r0`/`x0`
- //! Linux | MIPS/MIPS64 | `$a0`
-+//! Linux | PPC64 | `r3`
- //!
- //! Additionally, the value `LR` on ARM/ARM64 will be the return address of
- //! this function.
-diff --git third_party/crashpad/crashpad/util/misc/capture_context_linux.S third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-index 52215ee5..b3e4a3ec 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-@@ -32,7 +32,7 @@
- .balign 4, 0x0
- .type CAPTURECONTEXT_SYMBOL, %function
- .type CAPTURECONTEXT_SYMBOL2, %function
--#elif defined(__mips__)
-+#elif defined(__mips__) || defined(__powerpc64__)
- .balign 4, 0x0
- #endif
-
-@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
- jr $ra
-
- .set at
-+#elif defined(__powerpc64__)
-+ // Store r0-r31
-+ std 0, 0xe8(3) // context->uc_mcontext.gp_regs[0]
-+ std 1, 0xf0(3) // context->uc_mcontext.gp_regs[1]
-+ std 2, 0xf8(3) // context->uc_mcontext.gp_regs[2]
-+ // note that r3's original value was lost
-+ std 3, 0x100(3) // context->uc_mcontext.gp_regs[3]
-+ std 4, 0x108(3) // context->uc_mcontext.gp_regs[4]
-+ std 5, 0x110(3) // context->uc_mcontext.gp_regs[5]
-+ std 6, 0x118(3) // context->uc_mcontext.gp_regs[6]
-+ std 7, 0x120(3) // context->uc_mcontext.gp_regs[7]
-+ std 8, 0x128(3) // context->uc_mcontext.gp_regs[8]
-+ std 9, 0x130(3) // context->uc_mcontext.gp_regs[9]
-+ std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
-+ std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
-+ std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
-+ std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
-+ std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
-+ std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
-+ std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
-+ std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
-+ std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
-+ std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
-+ std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
-+ std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
-+ std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
-+ std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
-+ std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
-+ std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
-+ std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
-+ std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
-+ std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
-+ std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
-+ std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
-+ std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
-+
-+ // For NIP, we can use the value in the link register
-+ mflr 0
-+ std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
-+
-+ // CTR
-+ mfctr 0
-+ std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
-+
-+ // For LNK, we'll use the caller's LR save area (2 stack frames up).
-+ // r4 can be used as a scratch register since it has already been saved.
-+ ld 4, 0(1)
-+ ld 4, 16(4)
-+ std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
-+
-+ // XER
-+ mfxer 0
-+ std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
-+
-+ // CCR
-+ mfcr 0
-+ std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
-+
-+ // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
-+ // not used or not relevant, zero them out.
-+ li 4, 0
-+ std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
-+ std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
-+ std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
-+ std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
-+ std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
-+ std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
-+ std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
-+ std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
-+
-+ // Update context->uc_mcontext.regs to point to gp_regs
-+ addi 0, 3, 0xe8
-+ std 0, 0xe0(3)
-+
-+ // Save floating point registers 0-31
-+ stfd 0, 0x268(3) // context->uc_mcontext.fp_regs[0]
-+ stfd 1, 0x270(3) // context->uc_mcontext.fp_regs[1]
-+ stfd 2, 0x278(3) // context->uc_mcontext.fp_regs[2]
-+ stfd 3, 0x280(3) // context->uc_mcontext.fp_regs[3]
-+ stfd 4, 0x288(3) // context->uc_mcontext.fp_regs[4]
-+ stfd 5, 0x290(3) // context->uc_mcontext.fp_regs[5]
-+ stfd 6, 0x298(3) // context->uc_mcontext.fp_regs[6]
-+ stfd 7, 0x2a0(3) // context->uc_mcontext.fp_regs[7]
-+ stfd 8, 0x2a8(3) // context->uc_mcontext.fp_regs[8]
-+ stfd 9, 0x2b0(3) // context->uc_mcontext.fp_regs[9]
-+ stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
-+ stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
-+ stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
-+ stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
-+ stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
-+ stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
-+ stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
-+ stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
-+ stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
-+ stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
-+ stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
-+ stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
-+ stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
-+ stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
-+ stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
-+ stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
-+ stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
-+ stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
-+ stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
-+ stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
-+ stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
-+ stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
-+
-+ // FPSCR
-+ mffs 0
-+ stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
-+
-+ // Save VMX Vector registers
-+ // Update r4 to contain the base address of vmx_reserve
-+ addi 4, 3, 0x378
-+ // Ensure that it is quadword aligned
-+ andi. 5, 4, 0xF
-+ beq 1f // No alignment is necessary
-+ // Address is doubleword aligned and not quadword aligned, add 8
-+ addi 4, 4, 8
-+
-+1:
-+ // Store VMX registers 0-31
-+ // r4 will contain the base address
-+ // r5 will contain the index
-+ li 5, 0
-+ stvx 0, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 0]
-+ addi 5, 5, 16
-+ stvx 1, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 1]
-+ addi 5, 5, 16
-+ stvx 2, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 2]
-+ addi 5, 5, 16
-+ stvx 3, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 3]
-+ addi 5, 5, 16
-+ stvx 4, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 4]
-+ addi 5, 5, 16
-+ stvx 5, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 5]
-+ addi 5, 5, 16
-+ stvx 6, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 6]
-+ addi 5, 5, 16
-+ stvx 7, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 7]
-+ addi 5, 5, 16
-+ stvx 8, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 8]
-+ addi 5, 5, 16
-+ stvx 9, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 9]
-+ addi 5, 5, 16
-+ stvx 10, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 10]
-+ addi 5, 5, 16
-+ stvx 11, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 11]
-+ addi 5, 5, 16
-+ stvx 12, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 12]
-+ addi 5, 5, 16
-+ stvx 13, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 13]
-+ addi 5, 5, 16
-+ stvx 14, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 14]
-+ addi 5, 5, 16
-+ stvx 15, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 15]
-+ addi 5, 5, 16
-+ stvx 16, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 16]
-+ addi 5, 5, 16
-+ stvx 17, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 17]
-+ addi 5, 5, 16
-+ stvx 18, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 18]
-+ addi 5, 5, 16
-+ stvx 19, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 19]
-+ addi 5, 5, 16
-+ stvx 20, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 20]
-+ addi 5, 5, 16
-+ stvx 21, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 21]
-+ addi 5, 5, 16
-+ stvx 22, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 22]
-+ addi 5, 5, 16
-+ stvx 23, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 23]
-+ addi 5, 5, 16
-+ stvx 24, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 24]
-+ addi 5, 5, 16
-+ stvx 25, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 25]
-+ addi 5, 5, 16
-+ stvx 26, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 26]
-+ addi 5, 5, 16
-+ stvx 27, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 27]
-+ addi 5, 5, 16
-+ stvx 28, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 28]
-+ addi 5, 5, 16
-+ stvx 29, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 29]
-+ addi 5, 5, 16
-+ stvx 30, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 30]
-+ addi 5, 5, 16
-+ stvx 31, 4, 5 // context->uc_mcontext.vmx_reserve[(align) + 31]
-+ addi 5, 5, 16
-+
-+ // VSCR
-+ mfvscr 0
-+ stvx 0, 4, 5
-+ addi 5, 5, 16
-+
-+ // VRSAVE
-+ mfvrsave 0
-+ stwx 0, 4, 5
-+
-+ // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
-+ std 4, 0x370(3)
-+
-+ // Zero out all unused fields
-+ li 4, 0
-+ std 4, 0xc8(3) // context->uc_mcontext.signal
-+ std 4, 0xd0(3) // context->uc_mcontext.handler
-+ std 4, 0xd8(3) // context->uc_mcontext.oldmask
-+
-+ blr
- #endif // __i386__
-diff --git third_party/crashpad/crashpad/util/misc/capture_context_test.cc third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-index cf23c2de..5f264bc9 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-@@ -57,7 +57,7 @@ void TestCaptureContext() {
- uintptr_t pc = ProgramCounterFromContext(context_1);
-
- #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
-- !defined(MEMORY_SANITIZER)
-+ !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
- // Sanitizers can cause enough code bloat that the “nearby” check would
- // likely fail.
- const uintptr_t kReferencePC =
-diff --git third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-index 9fc5db28..5f69f8dc 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-@@ -36,6 +36,8 @@ void SanityCheckContext(const NativeCPUContext& context) {
- EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
- #endif
- }
-
-@@ -50,6 +52,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
- return context.uc_mcontext.pc;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- return context.uc_mcontext.pc;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ return context.uc_mcontext.gp_regs[PT_NIP];
- #endif
- }
-
-@@ -64,6 +68,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
- return context.uc_mcontext.sp;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- return context.uc_mcontext.gregs[29];
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+ return context.uc_mcontext.gp_regs[1];
- #endif
- }
-
-diff --git third_party/crashpad/crashpad/util/posix/signals_test.cc third_party/crashpad/crashpad/util/posix/signals_test.cc
-index 58bfa8f8..8fc37c46 100644
---- a/third_party/crashpad/crashpad/util/posix/signals_test.cc
-+++ b/third_party/crashpad/crashpad/util/posix/signals_test.cc
-@@ -46,12 +46,12 @@ bool CanCauseSignal(int sig) {
- return sig == SIGABRT ||
- sig == SIGALRM ||
- sig == SIGBUS ||
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- sig == SIGFPE ||
--#endif // !defined(ARCH_CPU_ARM64)
-+#endif // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
- sig == SIGILL ||
--#endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL
-+#endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
- sig == SIGPIPE ||
- sig == SIGSEGV ||
- #if defined(OS_MACOSX)
-@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
- break;
- }
-
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- // ARM64 has hardware integer division instructions that don’t generate a
- // trap for divide-by-zero, so this doesn’t produce SIGFPE.
-+ //
-+ // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
- case SIGFPE: {
- // Optimization makes this tricky, so get zero from a system call likely
- // to succeed, and try to do something with the result.
-@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
- fstat(quotient, &stat_buf);
- break;
- }
--#endif // ARCH_CPU_ARM64
-+#endif // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
-
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
- case SIGILL: {
-diff --git third_party/dav1d/BUILD.gn third_party/dav1d/BUILD.gn
-index 788dc6cf..5fd7e8fd 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -182,6 +182,8 @@ static_library("dav1d_8bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -210,6 +212,8 @@ static_library("dav1d_10bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -256,6 +260,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
- ":dav1d_config",
- ]
-
-+ cflags = dav1d_copts
-+ }
-+} else if (current_cpu == "ppc64") {
-+ static_library("dav1d_ppc") {
-+ sources = [
-+ "libdav1d/src/ppc/cpu.c",
-+ "libdav1d/src/ppc/cpu.h",
-+ ]
-+
-+ configs -= [ "//build/config/compiler:chromium_code" ]
-+ configs += [
-+ "//build/config/compiler:no_chromium_code",
-+ ":dav1d_config",
-+ ]
-+
- cflags = dav1d_copts
- }
- }
-@@ -285,5 +304,7 @@ static_library("dav1d") {
- }
- } else if (current_cpu == "arm" || current_cpu == "arm64") {
- deps += [ ":dav1d_arm" ]
-+ } else if (current_cpu == "ppc64") {
-+ deps += [ ":dav1d_ppc" ]
- }
- }
-diff --git third_party/dav1d/config/linux/ppc64/config.h third_party/dav1d/config/linux/ppc64/config.h
-new file mode 100644
-index 00000000..f6ca57f7
---- /dev/null
-+++ b/third_party/dav1d/config/linux/ppc64/config.h
-@@ -0,0 +1,35 @@
-+/*
-+ * Autogenerated by the Meson build system.
-+ * Do not edit, your changes will be lost.
-+ */
-+
-+#pragma once
-+
-+#define ARCH_AARCH64 0
-+
-+#define ARCH_ARM 0
-+
-+#define ARCH_PPC64LE 1
-+
-+#define ARCH_X86 0
-+
-+#define ARCH_X86_32 0
-+
-+#define ARCH_X86_64 0
-+
-+#define CONFIG_16BPC 1
-+
-+#define CONFIG_8BPC 1
-+
-+#define CONFIG_LOG 1
-+
-+#define ENDIANNESS_BIG 0
-+
-+#define HAVE_ASM 1
-+
-+#define HAVE_GETAUXVAL 1
-+
-+#define HAVE_POSIX_MEMALIGN 1
-+
-+#define HAVE_UNISTD_H 1
-+
-diff --git third_party/dav1d/dav1d_generated.gni third_party/dav1d/dav1d_generated.gni
-index 8becac02..d5f4fcac 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -71,6 +71,11 @@ arm_template_sources = [
- "libdav1d/src/arm/mc_init_tmpl.c",
- ]
-
-+ppc64_template_sources = [
-+ "libdav1d/src/ppc/cdef_init_tmpl.c",
-+ "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
- "libdav1d/src/cdef_apply_tmpl.c",
- "libdav1d/src/cdef_tmpl.c",
-diff --git third_party/dav1d/generate_source.py third_party/dav1d/generate_source.py
-index 9ab5e00b..ad3feffe 100755
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -50,7 +50,8 @@ def WriteGn(fd):
- WriteArray(fd, "arm32_asm_sources", glob.glob("libdav1d/src/arm/32/*.S"))
- WriteArray(fd, "arm64_asm_sources", glob.glob("libdav1d/src/arm/64/*.S"))
- WriteArray(fd, "arm_template_sources", glob.glob("libdav1d/src/arm/*_tmpl.c"))
--
-+ WriteArray(fd, "ppc64_template_sources", glob.glob("libdav1d/src/ppc/*_tmpl.c"))
-+
- template_sources = glob.glob("libdav1d/src/*_tmpl.c")
- WriteArray(fd, "template_sources", template_sources)
-
-diff --git third_party/dav1d/libdav1d/src/ppc/types.h third_party/dav1d/libdav1d/src/ppc/types.h
-index 0b4bd72f..a0caa5e7 100644
---- a/third_party/dav1d/libdav1d/src/ppc/types.h
-+++ b/third_party/dav1d/libdav1d/src/ppc/types.h
-@@ -51,4 +51,19 @@
- #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
- #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
-
-+#if defined(__clang__)
-+#undef vec_splats
-+#define vec_splats(N) \
-+ _Generic((N), \
-+ unsigned char: ((u8x16)(N)), \
-+ signed char: ((i8x16)(N)), \
-+ unsigned short: ((u16x8)(N)), \
-+ signed short: ((i16x8)(N)), \
-+ unsigned int: ((u32x4)(N)), \
-+ signed int: ((i32x4)(N)), \
-+ unsigned long long: ((u64x2)(N)), \
-+ signed long long: ((i64x2)(N)) \
-+ )
-+#endif
-+
- #endif /* DAV1D_SRC_PPC_TYPES_H */
-diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
-index 31a26e5b44..84c15b61b8 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -38,6 +38,8 @@ if (current_cpu == "x86") {
-
- if (is_nacl) {
- platform_include_dir = "source/config/nacl"
-+} else if (current_cpu == "ppc64") {
-+ platform_include_dir = "source/config/linux/generic"
- } else {
- # The mac configurations are currently a relic. They were useful when
- # x86inc.asm did not work for MACH_O but now the build is identical to the
-@@ -336,6 +336,8 @@ static_library("libvpx") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_generic
- }
-
- configs -= [ "//build/config/compiler:chromium_code" ]
-@@ -401,6 +403,8 @@ static_library("libvp9rc") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_generic
- }
- sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.cc" ]
- sources += [ "//third_party/libvpx/source/libvpx/vp9/ratectrl_rtc.h" ]
-diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
-index d2baee9d..9955ce44 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -3922,7 +3922,7 @@ struct kernel_statfs {
- LSS_REG(2, buf);
- LSS_BODY(void*, mmap2, "0"(__r2));
- }
--#else
-+#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
- #define __NR__mmap2 __NR_mmap2
- LSS_INLINE _syscall6(void*, _mmap2, void*, s,
- size_t, l, int, p,
-@@ -4033,7 +4033,7 @@ struct kernel_statfs {
- #if defined(__i386__) || \
- defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
- (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \
-- defined(__PPC__) || \
-+ (defined(__PPC__) && !defined(__powerpc64__)) || \
- (defined(__s390__) && !defined(__s390x__))
- /* On these architectures, implement mmap() with mmap2(). */
- LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
-diff --git third_party/pffft/src/pffft.c third_party/pffft/src/pffft.c
-index bdac4d784..51e0f2cac 100644
---- a/third_party/pffft/src/pffft.c
-+++ b/third_party/pffft/src/pffft.c
-@@ -100,6 +100,7 @@
- Altivec support macros
- */
- #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
-+#include <altivec.h>
- typedef vector float v4sf;
- # define SIMD_SZ 4
- # define VZERO() ((vector float) vec_splat_u8(0))
-diff --git third_party/skia/src/sksl/SkSLString.cpp third_party/skia/src/sksl/SkSLString.cpp
-index 88eb1c7d..4be33fa5 100644
---- a/third_party/skia/src/sksl/SkSLString.cpp
-+++ b/third_party/skia/src/sksl/SkSLString.cpp
-@@ -240,7 +240,12 @@ String to_string(double value) {
- if (needsDotZero) {
- buffer << ".0";
- }
-- return String(buffer.str().c_str());
-+
-+ std::string ret(buffer.str());
-+ if (signbit(value) && ret[0] == '.') {
-+ ret[0] = '-';
-+ }
-+ return String(ret.c_str());
- }
-
- SKSL_INT stoi(const String& s) {
-diff --git third_party/sqlite/src/amalgamation/sqlite3.c third_party/sqlite/src/amalgamation/sqlite3.c
-index 1b2c2ec7..7593dba1 100644
---- a/third_party/sqlite/src/amalgamation/sqlite3.c
-+++ b/third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14400,7 +14400,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
-+ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
- # elif defined(sparc) || defined(__ppc__) || \
- defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git third_party/sqlite/src/amalgamation_dev/sqlite3.c third_party/sqlite/src/amalgamation_dev/sqlite3.c
-index 19c87689..c7ab039e 100644
---- a/third_party/sqlite/src/amalgamation_dev/sqlite3.c
-+++ b/third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14413,7 +14413,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
-+ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
- # elif defined(sparc) || defined(__ppc__) || \
- defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git third_party/sqlite/src/ext/rtree/rtree.c third_party/sqlite/src/ext/rtree/rtree.c
-index efaef813..4cd57d55 100644
---- a/third_party/sqlite/src/ext/rtree/rtree.c
-+++ b/third_party/sqlite/src/ext/rtree/rtree.c
-@@ -432,7 +432,7 @@ struct RtreeMatchArg {
- #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__arm__)
-+ defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
- #elif defined(sparc) || defined(__ppc__)
- # define SQLITE_BYTEORDER 4321
-diff --git third_party/sqlite/src/src/sqliteInt.h third_party/sqlite/src/src/sqliteInt.h
-index 122e26ad..ec21dcb5 100644
---- a/third_party/sqlite/src/src/sqliteInt.h
-+++ b/third_party/sqlite/src/src/sqliteInt.h
-@@ -868,7 +868,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
-- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
-+ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER 1234
- # elif defined(sparc) || defined(__ppc__) || \
- defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git third_party/webrtc/modules/desktop_capture/differ_block.cc third_party/webrtc/modules/desktop_capture/differ_block.cc
-index dd9ab457..c005d959 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
-
- if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
-- // For ARM and MIPS processors, always use C version.
-- // TODO(hclam): Implement a NEON version.
-- diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = WebRtc_GetCPUInfo(kSSE2) != 0;
- // For x86 processors, check if SSE2 is supported.
- if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- } else {
- diff_proc = &VectorDifference_C;
- }
-+#else
-+ // For other processors, always use C version.
-+ // TODO(hclam): Implement a NEON version.
-+ diff_proc = &VectorDifference_C;
- #endif
- }
-
-diff --git third_party/webrtc/rtc_base/system/arch.h third_party/webrtc/rtc_base/system/arch.h
-index ed216e66..25d36c07 100644
---- a/third_party/webrtc/rtc_base/system/arch.h
-+++ b/third_party/webrtc/rtc_base/system/arch.h
-@@ -50,6 +50,18 @@
- #elif defined(__EMSCRIPTEN__)
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__PPC__)
-+#define WEBRTC_ARCH_PPC_FAMILY
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#else
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#endif
-+#if defined(__LP64__)
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
- #else
- #error Please add support for your architecture in rtc_base/system/arch.h
- #endif
- diff --git v8/BUILD.gn v8/BUILD.gn
-index 167e63503..125c445ea 100644
---- a/v8/BUILD.gn
-+++ b/v8/BUILD.gn
-@@ -696,6 +696,12 @@ config("toolchain") {
- }
- if (host_byteorder == "little") {
- defines += [ "V8_TARGET_ARCH_PPC_LE" ]
-+ cflags += [
-+ # Enable usage of AltiVec, VSX, and other POWER8 and higher features
-+ "-mcpu=power8",
-+ "-maltivec",
-+ "-mvsx",
-+ ]
- } else if (host_byteorder == "big") {
- defines += [ "V8_TARGET_ARCH_PPC_BE" ]
- if (current_os == "aix") {
-diff --git ui/gl/features.gni ui/gl/features.gni
-index cb2c98649..5e09bc1f7 100644
---- a/ui/gl/features.gni
-+++ b/ui/gl/features.gni
-@@ -25,5 +25,6 @@ declare_args() {
- is_chromeos || is_fuchsia) &&
- (target_cpu == "x86" || target_cpu == "x64" ||
- target_cpu == "arm" || target_cpu == "arm64" ||
-- target_cpu == "mipsel" || target_cpu == "mips64el")
-+ target_cpu == "mipsel" || target_cpu == "mips64el" ||
-+ target_cpu == "ppc64")
- }
-diff --git v8/test/BUILD.gn v8/test/BUILD.gn
-index f6d30537a..287b27080 100644
---- a/v8/test/BUILD.gn
-+++ b/v8/test/BUILD.gn
-@@ -31,7 +31,7 @@ group("gn_all") {
- deps += [
- "cctest:cctest",
- "cctest:generate-bytecode-expectations",
-- "unittests:unittests",
-+ #"unittests:unittests",
- ]
- }
- }
-@@ -73,7 +73,7 @@ group("v8_bot_default") {
- "message:v8_message",
- "mjsunit:v8_mjsunit",
- "mkgrokdump:mkgrokdump",
-- "unittests:unittests",
-+ #"unittests:unittests",
- "wasm-api-tests:wasm_api_tests",
- "wasm-js:v8_wasm_js",
- "wasm-spec-tests:v8_wasm_spec_tests",
-@@ -93,7 +93,7 @@ group("v8_default") {
- "message:v8_message",
- "mjsunit:v8_mjsunit",
- "mkgrokdump:mkgrokdump",
-- "unittests:unittests",
-+ #"unittests:unittests",
- "wasm-api-tests:wasm_api_tests",
- "wasm-js:v8_wasm_js",
- "wasm-spec-tests:v8_wasm_spec_tests",
diff --git a/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-swiftshader.patch b/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-swiftshader.patch
deleted file mode 100644
index df453f491d8c..000000000000
--- a/srcpkgs/electron10/files/patches/chromium-xxx-ppc64le-swiftshader.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
-+++ b/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
-@@ -574,6 +574,7 @@ swiftshader_llvm_source_set("swiftshader
- "llvm/lib/MC/MCAsmInfoCOFF.cpp",
- "llvm/lib/MC/MCAsmInfoDarwin.cpp",
- "llvm/lib/MC/MCAsmInfoELF.cpp",
-+ "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
- "llvm/lib/MC/MCAsmMacro.cpp",
- "llvm/lib/MC/MCAsmStreamer.cpp",
- "llvm/lib/MC/MCAssembler.cpp",
-@@ -629,6 +630,7 @@ swiftshader_llvm_source_set("swiftshader
- "llvm/lib/MC/MCWinCOFFStreamer.cpp",
- "llvm/lib/MC/MCWinEH.cpp",
- "llvm/lib/MC/MCXCOFFStreamer.cpp",
-+ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
- "llvm/lib/MC/MachObjectWriter.cpp",
- "llvm/lib/MC/StringTableBuilder.cpp",
- "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/electron10/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch b/srcpkgs/electron10/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
deleted file mode 100644
index 916dba9dc3bc..000000000000
--- a/srcpkgs/electron10/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ff4122f236b70c272c746d0c336cdbd588d78cd1 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 12 Dec 2019 16:12:18 -0500
-Subject: [PATCH] Add a script to list patch targets
-
----
- script/list_patch_targets.py | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100755 script/list_patch_targets.py
-
-diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py
-new file mode 100755
-index 000000000..55173bac9
---- /dev/null
-+++ b/script/list_patch_targets.py
-@@ -0,0 +1,23 @@
-+#!/usr/bin/env python
-+
-+import argparse
-+import json
-+
-+
-+def parse_args():
-+ parser = argparse.ArgumentParser(description='Apply Electron patches')
-+ parser.add_argument('config', nargs='+',
-+ type=argparse.FileType('r'),
-+ help='patches\' config(s) in the JSON format')
-+ return parser.parse_args()
-+
-+
-+def main():
-+ configs = parse_args().config
-+ for config_json in configs:
-+ for patch_dir, repo in json.load(config_json).iteritems():
-+ print(repo)
-+
-+
-+if __name__ == '__main__':
-+ main()
---
-2.23.0
-
diff --git a/srcpkgs/electron10/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron10/files/patches/electron-Build-fixes.patch.patch
deleted file mode 100644
index 298bfa9bcb2b..000000000000
--- a/srcpkgs/electron10/files/patches/electron-Build-fixes.patch.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/build/args/release.gn b/build/args/release.gn
-index e5017f6e1..59207b389 100644
---- a/build/args/release.gn
-+++ b/build/args/release.gn
-@@ -1,6 +1,4 @@
- import("all.gn")
--is_component_build = false
--is_official_build = true
-
- # This may be guarded behind is_chrome_branded alongside
- # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
-@@ -8,9 +6,3 @@ is_official_build = true
- # The initialization of the decoder depends on whether ffmpeg has
- # been built with H.264 support.
- rtc_use_h264 = proprietary_codecs
--
--# By default, Electron builds ffmpeg with proprietary codecs enabled. In order
--# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or
--# who have an LGPL requirement to ship ffmpeg as a dynamically linked library,
--# we build ffmpeg as a shared library.
--is_component_ffmpeg = true
-diff --git a/build/npm.gni b/build/npm.gni
-index a1987d095..fb33a14c3 100644
---- a/build/npm.gni
-+++ b/build/npm.gni
-@@ -35,7 +35,6 @@ template("npm_action") {
- if (!defined(deps)) {
- deps = []
- }
-- deps += [ ":npm_pre_flight_" + target_name ]
-
- script = "//electron/build/npm-run.py"
- args = [
-diff --git a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-index 0dc9916be..7eaa46bf5 100644
---- a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-+++ b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-@@ -30,7 +30,7 @@
- + # these values being accurate.
- + 'build_v8_with_gn': 'false',
- + 'enable_lto%': 'false',
--+
-++ 'openssl_fips': '',
- 'conditions': [
- ['target_arch=="arm64"', {
- # Disabled pending https://github.com/nodejs/node/issues/23913.
-
diff --git a/srcpkgs/electron10/files/patches/electron-dont-assume-python-is-python2.patch b/srcpkgs/electron10/files/patches/electron-dont-assume-python-is-python2.patch
deleted file mode 100644
index fb134748025b..000000000000
--- a/srcpkgs/electron10/files/patches/electron-dont-assume-python-is-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/build/zip.py.orig 2020-04-27 17:59:53.499281667 +0200
-+++ b/build/zip.py 2020-04-27 17:59:57.655839143 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from __future__ import print_function
- import os
- import subprocess
-
---- a/build/npm-run.py.orig 2020-04-27 17:59:50.829351807 +0200
-+++ b/build/npm-run.py 2020-04-27 18:00:02.702373256 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from __future__ import print_function
- import os
- import subprocess
diff --git a/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
deleted file mode 100644
index 456223644278..000000000000
--- a/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/script/apply_all_patches.py 2020-08-22 17:46:41.796707506 +0200
-+++ - 2020-08-22 17:47:05.887813512 +0200
-@@ -14,6 +14,7 @@
- for patch_dir, repo in dirs.items():
- git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
- threeway=threeway is not None,
-+ exclude=['test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**'],
- committer_name="Electron Scripts", committer_email="scripts@electron")
-
-
diff --git a/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc b/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc
deleted file mode 100644
index 2c7aa8efa66f..000000000000
--- a/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.cc
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/metrics/histogram_macros.h"
-#include "base/memory/ptr_util.h"
-
-#include "media/audio/openbsd/audio_manager_openbsd.h"
-
-#include "media/audio/audio_device_description.h"
-#include "media/audio/audio_output_dispatcher.h"
-#include "media/audio/sndio/sndio_input.h"
-#include "media/audio/sndio/sndio_output.h"
-#include "media/base/limits.h"
-#include "media/base/media_switches.h"
-
-namespace media {
-
-// Maximum number of output streams that can be open simultaneously.
-static const int kMaxOutputStreams = 4;
-
-// Default sample rate for input and output streams.
-static const int kDefaultSampleRate = 48000;
-
-void AddDefaultDevice(AudioDeviceNames* device_names) {
- DCHECK(device_names->empty());
- device_names->push_front(AudioDeviceName::CreateDefault());
-}
-
-bool AudioManagerOpenBSD::HasAudioOutputDevices() {
- return true;
-}
-
-bool AudioManagerOpenBSD::HasAudioInputDevices() {
- return true;
-}
-
-void AudioManagerOpenBSD::GetAudioInputDeviceNames(
- AudioDeviceNames* device_names) {
- DCHECK(device_names->empty());
- AddDefaultDevice(device_names);
-}
-
-void AudioManagerOpenBSD::GetAudioOutputDeviceNames(
- AudioDeviceNames* device_names) {
- AddDefaultDevice(device_names);
-}
-
-const char* AudioManagerOpenBSD::GetName() {
- return "SNDIO";
-}
-
-AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
- const std::string& device_id) {
- static const int kDefaultInputBufferSize = 1024;
-
- int user_buffer_size = GetUserBufferSize();
- int buffer_size = user_buffer_size ?
- user_buffer_size : kDefaultInputBufferSize;
-
- return AudioParameters(
- AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
- kDefaultSampleRate, buffer_size);
-}
-
-AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
- AudioLogFactory* audio_log_factory)
- : AudioManagerBase(std::move(audio_thread),
- audio_log_factory) {
- DLOG(WARNING) << "AudioManagerOpenBSD";
- SetMaxOutputStreamsAllowed(kMaxOutputStreams);
-}
-
-AudioManagerOpenBSD::~AudioManagerOpenBSD() {
- Shutdown();
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
- const AudioParameters& params,
- const LogCallback& log_callback) {
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
- return MakeOutputStream(params);
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) {
- DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
- return MakeOutputStream(params);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) {
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
- return MakeInputStream(params);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) {
- DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
- return MakeInputStream(params);
-}
-
-AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
- const std::string& output_device_id,
- const AudioParameters& input_params) {
- // TODO(tommi): Support |output_device_id|.
- DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
- static const int kDefaultOutputBufferSize = 2048;
-
- ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
- int sample_rate = kDefaultSampleRate;
- int buffer_size = kDefaultOutputBufferSize;
- if (input_params.IsValid()) {
- sample_rate = input_params.sample_rate();
- channel_layout = input_params.channel_layout();
- buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
- }
-
- int user_buffer_size = GetUserBufferSize();
- if (user_buffer_size)
- buffer_size = user_buffer_size;
-
- return AudioParameters(
- AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
- sample_rate, buffer_size);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
- const AudioParameters& params) {
- DLOG(WARNING) << "MakeInputStream";
- return new SndioAudioInputStream(this,
- AudioDeviceDescription::kDefaultDeviceId, params);
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
- const AudioParameters& params) {
- DLOG(WARNING) << "MakeOutputStream";
- return new SndioAudioOutputStream(params, this);
-}
-
-} // namespace media
diff --git a/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.h b/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.h
deleted file mode 100644
index 8c99db966d65..000000000000
--- a/srcpkgs/electron10/files/sndio-files/audio_manager_openbsd.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
-#define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
-
-#include <set>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/threading/thread.h"
-#include "media/audio/audio_manager_base.h"
-
-namespace media {
-
-class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
- public:
- AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
- AudioLogFactory* audio_log_factory);
- ~AudioManagerOpenBSD() override;
-
- // Implementation of AudioManager.
- bool HasAudioOutputDevices() override;
- bool HasAudioInputDevices() override;
- void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
- void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
- AudioParameters GetInputStreamParameters(
- const std::string& device_id) override;
- const char* GetName() override;
-
- // Implementation of AudioManagerBase.
- AudioOutputStream* MakeLinearOutputStream(
- const AudioParameters& params,
- const LogCallback& log_callback) override;
- AudioOutputStream* MakeLowLatencyOutputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) override;
- AudioInputStream* MakeLinearInputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) override;
- AudioInputStream* MakeLowLatencyInputStream(
- const AudioParameters& params,
- const std::string& device_id,
- const LogCallback& log_callback) override;
-
- protected:
- AudioParameters GetPreferredOutputStreamParameters(
- const std::string& output_device_id,
- const AudioParameters& input_params) override;
-
- private:
- // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
- AudioOutputStream* MakeOutputStream(const AudioParameters& params);
- AudioInputStream* MakeInputStream(const AudioParameters& params);
-
- DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
-};
-
-} // namespace media
-
-#endif // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
diff --git a/srcpkgs/electron10/files/sndio-files/sndio_input.cc b/srcpkgs/electron10/files/sndio-files/sndio_input.cc
deleted file mode 100644
index ef5439b49a07..000000000000
--- a/srcpkgs/electron10/files/sndio-files/sndio_input.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/macros.h"
-#include "media/base/audio_timestamp_helper.h"
-#include "media/audio/openbsd/audio_manager_openbsd.h"
-#include "media/audio/audio_manager.h"
-#include "media/audio/sndio/sndio_input.h"
-
-namespace media {
-
-static const SampleFormat kSampleFormat = kSampleFormatS16;
-
-void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
-{
- SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
-
- self->hw_delay += delta;
-}
-
-void *SndioAudioInputStream::ThreadEntry(void *arg) {
- SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
-
- self->ThreadLoop();
- return NULL;
-}
-
-SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
- const std::string& device_name,
- const AudioParameters& params)
- : manager(manager),
- params(params),
- audio_bus(AudioBus::Create(params)),
- state(kClosed) {
-}
-
-SndioAudioInputStream::~SndioAudioInputStream() {
- if (state != kClosed)
- Close();
-}
-
-bool SndioAudioInputStream::Open() {
- struct sio_par par;
- int sig;
-
- if (state != kClosed)
- return false;
-
- if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
- params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
- LOG(WARNING) << "Unsupported audio format.";
- return false;
- }
-
- sio_initpar(&par);
- par.rate = params.sample_rate();
- par.rchan = params.channels();
- par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
- par.bps = par.bits / 8;
- par.sig = sig = par.bits != 8 ? 1 : 0;
- par.le = SIO_LE_NATIVE;
- par.appbufsz = params.frames_per_buffer();
-
- hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
-
- if (hdl == NULL) {
- LOG(ERROR) << "Couldn't open audio device.";
- return false;
- }
-
- if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
- LOG(ERROR) << "Couldn't set audio parameters.";
- goto bad_close;
- }
-
- if (par.rate != (unsigned int)params.sample_rate() ||
- par.rchan != (unsigned int)params.channels() ||
- par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
- par.sig != (unsigned int)sig ||
- (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
- (par.bits != par.bps * 8)) {
- LOG(ERROR) << "Unsupported audio parameters.";
- goto bad_close;
- }
- state = kStopped;
- buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
- sio_onmove(hdl, &OnMoveCallback, this);
- return true;
-bad_close:
- sio_close(hdl);
- return false;
-}
-
-void SndioAudioInputStream::Start(AudioInputCallback* cb) {
-
- StartAgc();
-
- state = kRunning;
- hw_delay = 0;
- callback = cb;
- sio_start(hdl);
- if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
- LOG(ERROR) << "Failed to create real-time thread for recording.";
- sio_stop(hdl);
- state = kStopped;
- }
-}
-
-void SndioAudioInputStream::Stop() {
-
- if (state == kStopped)
- return;
-
- state = kStopWait;
- pthread_join(thread, NULL);
- sio_stop(hdl);
- state = kStopped;
-
- StopAgc();
-}
-
-void SndioAudioInputStream::Close() {
-
- if (state == kClosed)
- return;
-
- if (state == kRunning)
- Stop();
-
- state = kClosed;
- delete [] buffer;
- sio_close(hdl);
-
- manager->ReleaseInputStream(this);
-}
-
-double SndioAudioInputStream::GetMaxVolume() {
- // Not supported
- return 0.0;
-}
-
-void SndioAudioInputStream::SetVolume(double volume) {
- // Not supported. Do nothing.
-}
-
-double SndioAudioInputStream::GetVolume() {
- // Not supported.
- return 0.0;
-}
-
-bool SndioAudioInputStream::IsMuted() {
- // Not supported.
- return false;
-}
-
-void SndioAudioInputStream::SetOutputDeviceForAec(
- const std::string& output_device_id) {
- // Not supported.
-}
-
-void SndioAudioInputStream::ThreadLoop(void) {
- size_t todo, n;
- char *data;
- unsigned int nframes;
- double normalized_volume = 0.0;
-
- nframes = audio_bus->frames();
-
- while (state == kRunning && !sio_eof(hdl)) {
-
- GetAgcVolume(&normalized_volume);
-
- // read one block
- todo = nframes * params.GetBytesPerFrame(kSampleFormat);
- data = buffer;
- while (todo > 0) {
- n = sio_read(hdl, data, todo);
- if (n == 0)
- return; // unrecoverable I/O error
- todo -= n;
- data += n;
- }
- hw_delay -= nframes;
-
- // convert frames count to TimeDelta
- const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
- params.sample_rate());
-
- // push into bus
- audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
-
- // invoke callback
- callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
- }
-}
-
-} // namespace media
diff --git a/srcpkgs/electron10/files/sndio-files/sndio_input.h b/srcpkgs/electron10/files/sndio-files/sndio_input.h
deleted file mode 100644
index d868e0469db5..000000000000
--- a/srcpkgs/electron10/files/sndio-files/sndio_input.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
-#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
-
-#include <stdint.h>
-#include <string>
-#include <sndio.h>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/time/time.h"
-#include "media/audio/agc_audio_stream.h"
-#include "media/audio/audio_io.h"
-#include "media/audio/audio_device_description.h"
-#include "media/base/audio_parameters.h"
-
-namespace media {
-
-class AudioManagerBase;
-
-// Implementation of AudioOutputStream using sndio(7)
-class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
- public:
- // Pass this to the constructor if you want to attempt auto-selection
- // of the audio recording device.
- static const char kAutoSelectDevice[];
-
- // Create a PCM Output stream for the SNDIO device identified by
- // |device_name|. If unsure of what to use for |device_name|, use
- // |kAutoSelectDevice|.
- SndioAudioInputStream(AudioManagerBase* audio_manager,
- const std::string& device_name,
- const AudioParameters& params);
-
- ~SndioAudioInputStream() override;
-
- // Implementation of AudioInputStream.
- bool Open() override;
- void Start(AudioInputCallback* callback) override;
- void Stop() override;
- void Close() override;
- double GetMaxVolume() override;
- void SetVolume(double volume) override;
- double GetVolume() override;
- bool IsMuted() override;
- void SetOutputDeviceForAec(const std::string& output_device_id) override;
-
- private:
-
- enum StreamState {
- kClosed, // Not opened yet
- kStopped, // Device opened, but not started yet
- kRunning, // Started, device playing
- kStopWait // Stopping, waiting for the real-time thread to exit
- };
-
- // C-style call-backs
- static void OnMoveCallback(void *arg, int delta);
- static void* ThreadEntry(void *arg);
-
- // Continuously moves data from the device to the consumer
- void ThreadLoop();
- // Our creator, the audio manager needs to be notified when we close.
- AudioManagerBase* manager;
- // Parameters of the source
- AudioParameters params;
- // We store data here for consumer
- std::unique_ptr<AudioBus> audio_bus;
- // Call-back that consumes recorded data
- AudioInputCallback* callback; // Valid during a recording session.
- // Handle of the audio device
- struct sio_hdl* hdl;
- // Current state of the stream
- enum StreamState state;
- // High priority thread running ThreadLoop()
- pthread_t thread;
- // Number of frames buffered in the hardware
- int hw_delay;
- // Temporary buffer where data is stored sndio-compatible format
- char* buffer;
-
- DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
-};
-
-} // namespace media
-
-#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
diff --git a/srcpkgs/electron10/files/sndio-files/sndio_output.cc b/srcpkgs/electron10/files/sndio-files/sndio_output.cc
deleted file mode 100644
index a6719f9aac8d..000000000000
--- a/srcpkgs/electron10/files/sndio-files/sndio_output.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/logging.h"
-#include "base/time/time.h"
-#include "base/time/default_tick_clock.h"
-#include "media/audio/audio_manager_base.h"
-#include "media/base/audio_timestamp_helper.h"
-#include "media/audio/sndio/sndio_output.h"
-
-namespace media {
-
-static const SampleFormat kSampleFormat = kSampleFormatS16;
-
-void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
- SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
- self->hw_delay -= delta;
-}
-
-void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
- SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
- self->vol = vol;
-}
-
-void *SndioAudioOutputStream::ThreadEntry(void *arg) {
- SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
- self->ThreadLoop();
- return NULL;
-}
-
-SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
- AudioManagerBase* manager)
- : manager(manager),
- params(params),
- audio_bus(AudioBus::Create(params)),
- state(kClosed),
- mutex(PTHREAD_MUTEX_INITIALIZER) {
-}
-
-SndioAudioOutputStream::~SndioAudioOutputStream() {
- if (state != kClosed)
- Close();
-}
-
-bool SndioAudioOutputStream::Open() {
- struct sio_par par;
- int sig;
-
- if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
- params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
- LOG(WARNING) << "Unsupported audio format.";
- return false;
- }
- sio_initpar(&par);
- par.rate = params.sample_rate();
- par.pchan = params.channels();
- par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
- par.bps = par.bits / 8;
- par.sig = sig = par.bits != 8 ? 1 : 0;
- par.le = SIO_LE_NATIVE;
- par.appbufsz = params.frames_per_buffer();
-
- hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
- if (hdl == NULL) {
- LOG(ERROR) << "Couldn't open audio device.";
- return false;
- }
- if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
- LOG(ERROR) << "Couldn't set audio parameters.";
- goto bad_close;
- }
- if (par.rate != (unsigned int)params.sample_rate() ||
- par.pchan != (unsigned int)params.channels() ||
- par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
- par.sig != (unsigned int)sig ||
- (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
- (par.bits != par.bps * 8)) {
- LOG(ERROR) << "Unsupported audio parameters.";
- goto bad_close;
- }
- state = kStopped;
- volpending = 0;
- vol = 0;
- buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
- sio_onmove(hdl, &OnMoveCallback, this);
- sio_onvol(hdl, &OnVolCallback, this);
- return true;
- bad_close:
- sio_close(hdl);
- return false;
-}
-
-void SndioAudioOutputStream::Close() {
- if (state == kClosed)
- return;
- if (state == kRunning)
- Stop();
- state = kClosed;
- delete [] buffer;
- sio_close(hdl);
- manager->ReleaseOutputStream(this); // Calls the destructor
-}
-
-void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
- state = kRunning;
- hw_delay = 0;
- source = callback;
- sio_start(hdl);
- if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
- LOG(ERROR) << "Failed to create real-time thread.";
- sio_stop(hdl);
- state = kStopped;
- }
-}
-
-void SndioAudioOutputStream::Stop() {
- if (state == kStopped)
- return;
- state = kStopWait;
- pthread_join(thread, NULL);
- sio_stop(hdl);
- state = kStopped;
-}
-
-void SndioAudioOutputStream::SetVolume(double v) {
- pthread_mutex_lock(&mutex);
- vol = v * SIO_MAXVOL;
- volpending = 1;
- pthread_mutex_unlock(&mutex);
-}
-
-void SndioAudioOutputStream::GetVolume(double* v) {
- pthread_mutex_lock(&mutex);
- *v = vol * (1. / SIO_MAXVOL);
- pthread_mutex_unlock(&mutex);
-}
-
-// This stream is always used with sub second buffer sizes, where it's
-// sufficient to simply always flush upon Start().
-void SndioAudioOutputStream::Flush() {}
-
-void SndioAudioOutputStream::ThreadLoop(void) {
- int avail, count, result;
-
- while (state == kRunning) {
- // Update volume if needed
- pthread_mutex_lock(&mutex);
- if (volpending) {
- volpending = 0;
- sio_setvol(hdl, vol);
- }
- pthread_mutex_unlock(&mutex);
-
- // Get data to play
- const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
- params.sample_rate());
- count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
- audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
- if (count == 0) {
- // We have to submit something to the device
- count = audio_bus->frames();
- memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
- LOG(WARNING) << "No data to play, running empty cycle.";
- }
-
- // Submit data to the device
- avail = count * params.GetBytesPerFrame(kSampleFormat);
- result = sio_write(hdl, buffer, avail);
- if (result == 0) {
- LOG(WARNING) << "Audio device disconnected.";
- break;
- }
-
- // Update hardware pointer
- hw_delay += count;
- }
-}
-
-} // namespace media
diff --git a/srcpkgs/electron10/files/sndio-files/sndio_output.h b/srcpkgs/electron10/files/sndio-files/sndio_output.h
deleted file mode 100644
index ead220ca96e7..000000000000
--- a/srcpkgs/electron10/files/sndio-files/sndio_output.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
-#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
-
-#include <pthread.h>
-#include <sndio.h>
-
-#include "base/time/tick_clock.h"
-#include "base/time/time.h"
-#include "media/audio/audio_io.h"
-
-namespace media {
-
-class AudioManagerBase;
-
-// Implementation of AudioOutputStream using sndio(7)
-class SndioAudioOutputStream : public AudioOutputStream {
- public:
- // The manager is creating this object
- SndioAudioOutputStream(const AudioParameters& params,
- AudioManagerBase* manager);
- virtual ~SndioAudioOutputStream();
-
- // Implementation of AudioOutputStream.
- bool Open() override;
- void Close() override;
- void Start(AudioSourceCallback* callback) override;
- void Stop() override;
- void SetVolume(double volume) override;
- void GetVolume(double* volume) override;
- void Flush() override;
-
- friend void sndio_onmove(void *arg, int delta);
- friend void sndio_onvol(void *arg, unsigned int vol);
- friend void *sndio_threadstart(void *arg);
-
- private:
- enum StreamState {
- kClosed, // Not opened yet
- kStopped, // Device opened, but not started yet
- kRunning, // Started, device playing
- kStopWait // Stopping, waiting for the real-time thread to exit
- };
-
- // C-style call-backs
- static void OnMoveCallback(void *arg, int delta);
- static void OnVolCallback(void *arg, unsigned int vol);
- static void* ThreadEntry(void *arg);
-
- // Continuously moves data from the producer to the device
- void ThreadLoop(void);
-
- // Our creator, the audio manager needs to be notified when we close.
- AudioManagerBase* manager;
- // Parameters of the source
- AudioParameters params;
- // Source stores data here
- std::unique_ptr<AudioBus> audio_bus;
- // Call-back that produces data to play
- AudioSourceCallback* source;
- // Handle of the audio device
- struct sio_hdl* hdl;
- // Current state of the stream
- enum StreamState state;
- // High priority thread running ThreadLoop()
- pthread_t thread;
- // Protects vol, volpending and hw_delay
- pthread_mutex_t mutex;
- // Current volume in the 0..SIO_MAXVOL range
- int vol;
- // Set to 1 if volumes must be refreshed in the realtime thread
- int volpending;
- // Number of frames buffered in the hardware
- int hw_delay;
- // Temporary buffer where data is stored sndio-compatible format
- char* buffer;
-
- DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
-};
-
-} // namespace media
-
-#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
diff --git a/srcpkgs/electron10/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch b/srcpkgs/electron10/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
deleted file mode 100644
index cf8e81b11d67..000000000000
--- a/srcpkgs/electron10/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/chromium/media/audio/linux/audio_manager_linux.cc b/chromium/media/audio/linux/audio_manager_linux.cc
-index 5d703549372..9e60b40c749 100644
---- media/audio/linux/audio_manager_linux.cc
-+++ media/audio/linux/audio_manager_linux.cc
-@@ -20,6 +20,10 @@
- #include "media/audio/pulse/audio_manager_pulse.h"
- #include "media/audio/pulse/pulse_util.h"
- #endif
-+#if defined(USE_SNDIO)
-+#include <sndio.h>
-+#include "media/audio/openbsd/audio_manager_openbsd.h"
-+#endif
-
- namespace media {
-
-@@ -27,7 +31,8 @@ enum LinuxAudioIO {
- kPulse,
- kAlsa,
- kCras,
-- kAudioIOMax = kCras // Must always be equal to largest logged entry.
-+ kSndio,
-+ kAudioIOMax = kSndio // Must always be equal to largest logged entry.
- };
-
- std::unique_ptr<media::AudioManager> CreateAudioManager(
-@@ -41,6 +46,17 @@ std::unique_ptr<media::AudioManager> CreateAudioManager(
- }
- #endif
-
-+#if defined(USE_SNDIO)
-+ struct sio_hdl * hdl = NULL;
-+ if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) {
-+ sio_close(hdl);
-+ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1);
-+ return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
-+ audio_log_factory);
-+ }
-+ DVLOG(1) << "Sndio is not available on the OS";
-+#endif
-+
- #if defined(USE_PULSEAUDIO)
- pa_threaded_mainloop* pa_mainloop = nullptr;
- pa_context* pa_context = nullptr;
diff --git a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch b/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
deleted file mode 100644
index ec6040026688..000000000000
--- a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/BUILD.gn 2020-03-24 10:16:30.000000000 +0100
-+++ - 2020-04-06 14:32:27.960817513 +0200
-@@ -65,6 +65,9 @@
- if (use_cras) {
- defines += [ "USE_CRAS" ]
- }
-+ if (use_sndio) {
-+ defines += [ "USE_SNDIO" ]
-+ }
- }
-
- # Internal grouping of the configs necessary to support sub-folders having their
diff --git a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch b/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
deleted file mode 100644
index c856de0bf2ec..000000000000
--- a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- media/audio/BUILD.gn 2020-03-24 10:16:30.000000000 +0100
-+++ - 2020-04-06 14:31:28.871450217 +0200
-@@ -232,9 +232,19 @@
- deps += [ "//media/base/android:media_jni_headers" ]
- }
-
-- if (is_linux) {
-+ if (is_linux) {
- sources += [ "linux/audio_manager_linux.cc" ]
- }
-+ if (use_sndio) {
-+ libs += [ "sndio" ]
-+ sources += [
-+ "openbsd/audio_manager_openbsd.cc",
-+ "sndio/sndio_input.cc",
-+ "sndio/sndio_input.h",
-+ "sndio/sndio_output.cc",
-+ "sndio/sndio_output.h"
-+ ]
-+ }
-
- if (use_alsa) {
- libs += [ "asound" ]
diff --git a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch b/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
deleted file mode 100644
index 14807d8e1d36..000000000000
--- a/srcpkgs/electron10/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/media_options.gni 2020-03-24 10:16:30.000000000 +0100
-+++ - 2020-04-06 14:29:22.958630783 +0200
-@@ -114,6 +114,9 @@
- # Enables runtime selection of ALSA library for audio.
- use_alsa = false
-
-+ # Enables runtime selection of sndio library for audio.
-+ use_sndio = false
-+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
- if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
deleted file mode 100644
index 05506dddcb37..000000000000
--- a/srcpkgs/electron10/template
+++ /dev/null
@@ -1,361 +0,0 @@
-# Template file for 'electron10'
-pkgname=electron10
-version=10.4.7
-_nodever=12.16.3
-_chromiumver=85.0.4183.121
-revision=2
-archs="x86_64* i686* aarch64*"
-build_wrksrc="src"
-create_wrksrc=yes
-hostmakedepends="$(vopt_if clang clang) python pkgconf perl gperf bison ninja nodejs hwids
- libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
- pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
- opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
- alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if sndio sndio-devel)"
-makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
- libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
- libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
- libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
- libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
- libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
- minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
- re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
- $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel"
-short_desc="Cross platform application development framework based on web technologies"
-maintainer="John <me@johnnynator.dev>"
-license="BSD-3-Clause"
-homepage="https://electronjs.org"
-distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
- https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
- https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="d75b78107656ef854cc99a967b225eeb1e5989c0a1307d9efad3f8039d387cd8
- e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
- dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
-
-case "$XBPS_TARGET_MACHINE" in
- ppc64*-musl) makedepends+=" libucontext-devel" ;;
-esac
-
-no_generic_pkgconfig_link=yes
-lib32disabled=yes
-nopie=yes # contains tools that are not PIE, enables PIE itself
-
-build_options="pulseaudio sndio clang"
-build_options_default="pulseaudio clang"
-
-if [ "$build_option_clang" ]; then
- nocross="No proper setup for using clang as cross compiler in void yet"
-elif [ "${XBPS_TARGET_MACHINE%%-musl}" = "aarch64" ]; then
- broken="Falls apart at runtime when compiled with gcc"
-fi
-
-_buildtype=Release
-_is_debug=false
-
-CFLAGS="-Wno-unknown-warning-option -fPIC"
-CXXFLAGS="-Wno-unknown-warning-option -fPIC"
-
-_apply_patch() {
- local args="$1" pname="$(basename $2)"
-
- if [ ! -f ".${pname}_done" ]; then
- msg_normal "$pkgver: patching: ${pname}.\n"
- patch -N $args -i $2
- touch .${pname}_done
- fi
-}
-
-_get_chromium_arch() {
- case "$1" in
- x86_64*) echo x64 ;;
- i686*) echo x86 ;;
- arm*) echo arm ;;
- aarch64*) echo arm64 ;;
- ppc64*) echo ppc64 ;;
- ppc*) echo ppc ;;
- mipsel*) echo mipsel ;;
- mips*) echo mips ;;
- *) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
- esac
-}
-
-post_extract() {
- ln -s chromium-$_chromiumver src
- mkdir -p src/third_party/
- ln -s ../../node-$_nodever src/third_party/electron_node
- ln -s ../electron-${version} src/electron
-
-}
-post_patch() {
- cd $wrksrc
- for x in $FILESDIR/patches/*; do
- case "${x##*/}" in
- electron*.patch)
- cd src/electron
- _apply_patch -p1 "$x"
- cd "$wrksrc";;
- esac
- done
-
- # Sigh, electron uses git am...
- if [ ! -f ".electron_patches_done" ]; then
- python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do
- cd "$wrksrc"/"$repopath"
- git init -q
- git config "gc.auto" 0
- if [ "$repopath" != "src" ]; then
- echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore"
- fi
- git add .
- git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \
- commit -q -m "." || true
- done
- cd $wrksrc
- python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json
- touch .electron_patches_done
- fi
-
- for x in $FILESDIR/patches/*; do
- case "${x##*/}" in
- chromium*.patch)
- cd src
- _apply_patch -p1 "$x"
- cd "$wrksrc";;
- esac
- done
-
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- for x in $FILESDIR/musl-patches/*; do
- case "${x##*/}" in
- chromium*.patch)
- cd src
- _apply_patch -p1 "$x"
- cd "$wrksrc";;
- electron*.patch)
- cd src/electron
- _apply_patch -p1 "$x"
- cd "$wrksrc";;
- esac
- done
- fi
- if [ "$build_option_sndio" ]; then
- mkdir -p ${wrksrc}/${build_wrksrc}/media/audio/{sndio,openbsd}
- cp ${FILESDIR}/sndio-files/sndio_*put.* \
- ${wrksrc}/${build_wrksrc}/media/audio/sndio
- cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \
- ${wrksrc}/${build_wrksrc}/media/audio/openbsd
- for f in "${FILESDIR}"/sndio-patches/*.patch; do
- cd src
- _apply_patch -p0 "$f"
- cd "$wrksrc"
- done
- fi
-}
-
-pre_configure() {
- cd "$wrksrc/$build_wrksrc"
-
- # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
- touch chrome/test/data/webui/i18n_process_css_test.html
- # Use the file at run time instead of effectively compiling it in
- sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
- -i services/device/public/cpp/usb/BUILD.gn
-
- mkdir -p third_party/node/linux/node-linux-x64/bin
- ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
-
- # reusable system library settings
- local use_system="
- ffmpeg
- flac
- fontconfig
- freetype
- harfbuzz-ng
- libdrm
- libevent
- libjpeg
- libpng
- libwebp
- libxml
- libxslt
- opus
- re2
- snappy
- "
- for _lib in $use_system libjpeg_turbo; do
- msg_normal "Removing buildscripts for system provided $_lib\n"
- find -type f -path "*third_party/$_lib/*" \
- \! -path "*third_party/$_lib/chromium/*" \
- \! -path "*third_party/$_lib/google/*" \
- \! -path './base/third_party/icu/*' \
- \! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
- \! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
- \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
- -delete
- done
-
-
- msg_normal "Replacing gn files\n"
- python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
- $use_system
- third_party/libaddressinput/chromium/tools/update-strings.py
-}
-
-do_configure() {
- local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})"
- local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})"
- # the build system will set march for use, adding it to cflags will break builds
- export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
- export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
- export CFLAGS=${CFLAGS/-g/}
- export CXXFLAGS=${CXXFLAGS/-g/}
- local conf=()
- cd third_party/electron_node
- if [ "$CROSS_BUILD" ]; then
- conf_args=" --dest-cpu=${target_arch} --cross-compiling"
- fi
- ./configure --prefix=/usr \
- --shared-zlib \
- --shared-libuv \
- --shared-openssl \
- --shared-cares \
- --openssl-use-def-ca-store \
- --without-npm \
- --without-dtrace \
- --without-bundled-v8 \
- ${conf_args}
-
- cd "$wrksrc/$build_wrksrc"/electron
- yarn install
- cd "$wrksrc/$build_wrksrc"
-
- if [ "$build_option_clang" ]; then
- export CC=clang
- export CXX=clang++
- export HOST_CC=clang
- export HOST_CXX=clang++
- else
- export CXXFLAGS="$CXXFLAGS -fpermissive"
- export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
- export BUILD_AR="$AR_host"
- export BUILD_NM="$NM_host"
- fi
-
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Void Linux use ONLY.
- conf+=(
- 'google_api_key="AIzaSyA9gWazKaHaNIPPg2hrMj6_ZSG8AFmq738"'
- 'google_default_client_id="126659149423-hoo6ickbk3p1u2qjsdsp0ddciurfvb4t.apps.googleusercontent.com"'
- 'google_default_client_secret="_ozIx2D-DKm_se_2NPwV4l5b"'
- )
-
- conf+=(
- 'blink_symbol_level=0'
- 'clang_use_chrome_plugins=false'
- 'custom_toolchain="//build/toolchain/linux/unbundle:default"'
- )
- if [ "$CROSS_BUILD" ]; then
- conf+=(
- 'host_toolchain="//build/toolchain/linux/unbundle:host"'
- 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'
- "host_pkg_config=\"$PKG_CONFIG_FOR_BUILD\""
- "pkg_config=\"$PKG_CONFIG\""
- )
- else
- conf+=(
- 'host_toolchain="//build/toolchain/linux/unbundle:default"'
- 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'
- )
- fi
- if [ "$build_option_sndio" ]; then
- conf+=(
- 'use_sndio=true'
- )
- fi
- if [ -n "$XBPS_DEBUG_PKGS" ]; then
- conf+=('symbol_level=1')
- else
- conf+=('symbol_level=0')
- fi
- conf+=(
- 'enable_hangout_services_extension=true'
- 'enable_nacl_nonsfi=false'
- 'enable_nacl=false'
- 'enable_precompiled_headers=false'
- 'fatal_linker_warnings=false'
- 'ffmpeg_branding="Chrome"'
- 'fieldtrial_testing_like_official_build=true'
- 'gold_path="/usr/bin/ld.gold"'
- 'icu_use_data_file=true'
- "is_clang=$(vopt_if clang true false)"
- 'is_component_build=false'
- "is_debug=$_is_debug"
- 'is_desktop_linux=true'
- 'proprietary_codecs=true'
- 'treat_warnings_as_errors=false'
- 'use_allocator_shim=false'
- 'use_allocator="none"'
- 'use_cups=true'
- 'use_custom_libcxx=false'
- 'use_gnome_keyring=false'
- 'use_gold=false'
- 'use_lld=false'
- "use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')"
- 'use_sysroot=false'
- 'use_system_harfbuzz=true'
- "target_cpu=\"$target_arch\""
- "host_cpu=\"$host_arch\""
- 'import("//electron/build/args/release.gn")'
- )
-
- msg_normal "Bootstrapping GN\n"
- CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
- CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
- LDFLAGS="${XBPS_LDFLAGS}" \
- python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
-
- msg_normal "Configuring build\n"
- out/Release/gn gen out/$_buildtype --args="${conf[*]}"
-}
-
-do_build() {
- export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
- export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
- export CFLAGS=${CFLAGS/-g/}
- export CXXFLAGS=${CXXFLAGS/-g/}
- if [ "$build_option_clang" ]; then
- export CC=clang
- export CXX=clang++
- export HOST_CC=clang
- export HOST_CXX=clang++
- else
- export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
- export CXXFLAGS="$CXXFLAGS -fpermissive"
- export BUILD_AR="$AR_host"
- export BUILD_NM="$NM_host"
- fi
- msg_normal "Ninja turtles GO!\n"
- ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers
- # finish rest of the build
- strip -s out/$_buildtype/electron
- ninja ${makejobs} -C out/$_buildtype electron_dist_zip
-}
-
-do_install() {
- vmkdir /usr/lib/$pkgname
- vmkdir /usr/include/$pkgname
- bsdtar -xf out/$_buildtype/dist.zip -C "$DESTDIR/usr/lib/$pkgname"
-
- chmod u+s "$DESTDIR/usr/lib/$pkgname/chrome-sandbox"
-
- cp out/$_buildtype/gen/node_headers.tar.gz "$DESTDIR"/usr/include/$pkgname
-
- vlicense ${wrksrc}/src/LICENSE chromium.LICENSE
- vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE
- vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE
-
- vmkdir /usr/bin
- ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname
-}
diff --git a/srcpkgs/electron10/update b/srcpkgs/electron10/update
deleted file mode 100644
index 3af8e58b5358..000000000000
--- a/srcpkgs/electron10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://www.electronjs.org/releases/stable?version=${version%%.*}
-pattern='tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0ccc276d6820..8456cb959d35 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -72,6 +72,7 @@ replaces="
elasticsearch<=5.1.2_2
electron7<=7.3.3_1
electron9<=9.4.1_1
+ electron10<=10.4.7_2
emacs-gtk2<=27.2_1
enventor<=1.0.0_2
epstopdf<=2.27_3
From 4941e0da1430f00a6809e73621bb490bb0c5aaa0 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 3 Mar 2022 22:31:05 +0100
Subject: [PATCH 417/608] routinator: update to 0.11.2
in addition:
- upstream has removed doc/misc.md
- add changelog
---
srcpkgs/routinator/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index 6d776a5ffb60..ce1f0b16e6c8 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -1,6 +1,6 @@
# Template file for 'routinator'
pkgname=routinator
-version=0.10.2
+version=0.11.2
revision=1
build_style=cargo
depends="rsync"
@@ -8,9 +8,10 @@ short_desc="Resource Public Key Infrastructure (RPKI) validator"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="BSD-3-Clause"
homepage="https://rpki.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/NLnetLabs/routinator/main/Changelog.md"
distfiles="https://github.com/NLnetLabs/routinator/archive/v${version}.tar.gz"
conf_files="/etc/routinator/routinator.conf"
-checksum=b85e03447eaffc3ec0df78eeeb5ad87aaaeabc0974d87ea5d516e04c3e1bbbb3
+checksum=00f825c53168592da0285e8dbd228018e77248d458214a2c0f86cd0ca45438f5
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*) ;;
@@ -19,7 +20,6 @@ esac
post_install() {
vdoc README.md
- vdoc doc/misc.md
vman doc/routinator.1
vinstall etc/routinator.conf.system-service 0644 etc/routinator routinator.conf
vlicense LICENSE
From 721a52c49b8fb9b4b06312d06680150f27adea9c Mon Sep 17 00:00:00 2001
From: J Farkas <chexum+git@gmail.com>
Date: Sun, 3 Jul 2022 18:20:49 +0000
Subject: [PATCH 418/608] gperftools: fix patch whitespace
---
srcpkgs/gperftools/patches/ppc-musl.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gperftools/patches/ppc-musl.patch b/srcpkgs/gperftools/patches/ppc-musl.patch
index bbeb4cd39312..d192ea612797 100644
--- a/srcpkgs/gperftools/patches/ppc-musl.patch
+++ b/srcpkgs/gperftools/patches/ppc-musl.patch
@@ -14,7 +14,7 @@ Compatibility fixes for musl.
pc_field_found=true)
elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then
AC_TRY_COMPILE([#define _GNU_SOURCE 1
-- #include <sys/ucontext.h>],
+- #include <sys/ucontext.h>],
+ #include <sys/ucontext.h>
+ #include <asm/ptrace.h>],
[ucontext_t u; return u.$pc_field == 0;],
From 30fd791967e741259116a30330e8aa12d3b1647b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Jul 2022 23:47:24 +0200
Subject: [PATCH 419/608] python3-userpath: update to 1.8.0.
---
srcpkgs/python3-userpath/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index 8fc30c9a52f5..41390afabaad 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -1,10 +1,10 @@
# Template file for 'python3-userpath'
pkgname=python3-userpath
-version=1.7.0
-revision=2
+version=1.8.0
+revision=1
wrksrc="userpath-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="hatchling python3-wheel"
depends="python3-click"
checkdepends="$depends python3-pytest"
short_desc="Cross-platform tool for adding locations to the user PATH"
@@ -12,8 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT, Apache-2.0"
homepage="https://github.com/ofek/userpath"
distfiles="${PYPI_SITE}/u/userpath/userpath-${version}.tar.gz"
-checksum=dcd66c5fa9b1a3c12362f309bbb5bc7992bac8af86d17b4e6b1a4b166a11c43f
+checksum=04233d2fcfe5cff911c1e4fb7189755640e1524ff87a4b82ab9d6b875fee5787
post_install() {
- vlicense LICENSE-MIT
+ vlicense LICENSE.txt LICENSE
}
From f54cb912c3da38ab4d54a0cb413f8a84759dd76d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Jul 2022 23:44:02 +0200
Subject: [PATCH 420/608] xbps: import HTTP/1.1 default to keep alive patch
---
...4c80db5d7fba2b0635e758126c4d949edbb3.patch | 55 +++++++++++++++++++
srcpkgs/xbps/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/xbps/patches/b5954c80db5d7fba2b0635e758126c4d949edbb3.patch
diff --git a/srcpkgs/xbps/patches/b5954c80db5d7fba2b0635e758126c4d949edbb3.patch b/srcpkgs/xbps/patches/b5954c80db5d7fba2b0635e758126c4d949edbb3.patch
new file mode 100644
index 000000000000..77a21c9bc143
--- /dev/null
+++ b/srcpkgs/xbps/patches/b5954c80db5d7fba2b0635e758126c4d949edbb3.patch
@@ -0,0 +1,55 @@
+From b5954c80db5d7fba2b0635e758126c4d949edbb3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Sat, 2 Jul 2022 22:37:08 +0200
+Subject: [PATCH] lib/fetch: reuse http connection
+
+With HTTP 1.1 persistent connection is default and Connection
+header is not sent.
+Before patch, for every file, including 512b signature, there was
+done dns query, tls handshake etc.
+---
+ lib/fetch/http.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/lib/fetch/http.c b/lib/fetch/http.c
+index 395e7d8f..02b97a51 100644
+--- a/lib/fetch/http.c
++++ b/lib/fetch/http.c
+@@ -424,7 +424,7 @@ http_cmd(conn_t *conn, const char *fmt, ...)
+ * Get and parse status line
+ */
+ static int
+-http_get_reply(conn_t *conn)
++http_get_reply(conn_t *conn, int *keep_alive)
+ {
+ char *p;
+
+@@ -445,6 +445,10 @@ http_get_reply(conn_t *conn)
+ if (*p == '/') {
+ if (p[1] != '1' || p[2] != '.' || (p[3] != '0' && p[3] != '1'))
+ return (HTTP_PROTOCOL_ERROR);
++ /* HTTP/1.1 defaults to the use of "persistent connections" */
++ if (keep_alive && p[3] == '1') {
++ *keep_alive = 1;
++ }
+ p += 4;
+ }
+ if (*p != ' ' ||
+@@ -760,7 +764,7 @@ http_connect(struct url *URL, struct url *purl, const char *flags, int *cached)
+
+ http_cmd(conn, "\r\n");
+
+- if (http_get_reply(conn) != HTTP_OK) {
++ if (http_get_reply(conn, NULL) != HTTP_OK) {
+ http_seterr(conn->err);
+ fetch_close(conn);
+ return (NULL);
+@@ -1011,7 +1015,7 @@ http_request(struct url *URL, const char *op, struct url_stat *us,
+ sizeof(val));
+
+ /* get reply */
+- switch (http_get_reply(conn)) {
++ switch (http_get_reply(conn, &keep_alive)) {
+ case HTTP_OK:
+ case HTTP_PARTIAL:
+ case HTTP_NOT_MODIFIED:
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index ba7f8c7068e3..d5867b1387c2 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=6
+revision=7
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From b8289657a9db669f4bba45d4577fd0c011fdf71e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Jul 2022 23:45:04 +0200
Subject: [PATCH 421/608] xbps-statc: rebuild with latest patches
---
srcpkgs/xbps-static/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template
index 7956fdae4d64..8ca411f2372b 100644
--- a/srcpkgs/xbps-static/template
+++ b/srcpkgs/xbps-static/template
@@ -2,7 +2,7 @@
# NOTE: keep this package synchronized with "srcpkgs/xbps"
pkgname=xbps-static
version=0.59.1
-revision=5
+revision=6
# only musl
archs="*-musl"
wrksrc="xbps-${version}"
From 32a2c56abdca50dd0e45461f4c9edc461ea6659e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:18:21 +1100
Subject: [PATCH 422/608] python3-h2: update to 4.1.0.
---
srcpkgs/python3-h2/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-h2/template b/srcpkgs/python3-h2/template
index 29668e4cec4f..1fae4bd23fa1 100644
--- a/srcpkgs/python3-h2/template
+++ b/srcpkgs/python3-h2/template
@@ -1,17 +1,19 @@
# Template file for 'python3-h2'
pkgname=python3-h2
-version=4.0.0
-revision=2
+version=4.1.0
+revision=1
wrksrc="h2-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3 python3-hpack python3-hyperframe"
+depends="python3-hpack python3-hyperframe"
+checkdepends="${depends} python3-hypothesis python3-pytest"
short_desc="HTTP/2 State-Machine based protocol implementation (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/python-hyper/h2"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=78753b52cebb63f87097c9a5f969004a61ec4a41f967e41dcc287e26dd9b4143
+changelog="https://raw.githubusercontent.com/python-hyper/h2/master/CHANGELOG.rst"
+distfiles="https://github.com/python-hyper/h2/archive/v${version}.tar.gz"
+checksum=4a17b1ec23152bd94ab6260ea61f6cc02de92bd7c36762f13e34fdecea454b41
post_install() {
vlicense LICENSE
From 2567a23c1697039e750ecb69de85f86e8cdd071a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:25:29 +1100
Subject: [PATCH 423/608] python3-passlib: update to 1.7.4.
---
srcpkgs/python3-passlib/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-passlib/template b/srcpkgs/python3-passlib/template
index 86a22fd6f01d..78a24bbc0a8b 100644
--- a/srcpkgs/python3-passlib/template
+++ b/srcpkgs/python3-passlib/template
@@ -1,17 +1,18 @@
# Template file for 'python3-passlib'
pkgname=python3-passlib
-version=1.7.1
-revision=6
+version=1.7.4
+revision=1
wrksrc="passlib-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
+checkdepends="python3-bcrypt python3-nose"
short_desc="Comprehensive password hashing framework for Python3"
maintainer="Alin Dobre <alin.dobre@outlook.com>"
license="BSD-3-Clause"
-homepage="https://bitbucket.org/ecollins/passlib"
+homepage="https://passlib.readthedocs.io"
distfiles="${PYPI_SITE}/p/passlib/passlib-${version}.tar.gz"
-checksum=3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0
+checksum=defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04
post_install() {
vlicense LICENSE
From 4ef9266e18e878f7ab021dac108a695e4d379326 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:44:00 +1100
Subject: [PATCH 424/608] New package: python3-asgiref-3.5.2
---
srcpkgs/python3-asgiref/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-asgiref/template
diff --git a/srcpkgs/python3-asgiref/template b/srcpkgs/python3-asgiref/template
new file mode 100644
index 000000000000..7e020e44c216
--- /dev/null
+++ b/srcpkgs/python3-asgiref/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-asgiref'
+pkgname=python3-asgiref
+version=3.5.2
+revision=1
+wrksrc="asgiref-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-pytest-asyncio"
+short_desc="ASGI base libraries"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/django/asgiref"
+changelog="https://raw.githubusercontent.com/django/asgiref/main/CHANGELOG.txt"
+distfiles="https://github.com/django/asgiref/archive/${version}.tar.gz"
+checksum=62f04f81110898e471a7d5b37f88c923c2864d43fa6abb66a95980becb1a2ba4
+
+post_install() {
+ vlicense LICENSE
+}
From 6d90d9572f0c4ebbb29750a4b70b277eb51609e5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:47:28 +1100
Subject: [PATCH 425/608] New package: python3-kaitaistruct-0.9
---
srcpkgs/python3-kaitaistruct/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-kaitaistruct/template
diff --git a/srcpkgs/python3-kaitaistruct/template b/srcpkgs/python3-kaitaistruct/template
new file mode 100644
index 000000000000..4988b9877805
--- /dev/null
+++ b/srcpkgs/python3-kaitaistruct/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-kaitaistruct'
+pkgname=python3-kaitaistruct
+version=0.9
+revision=1
+wrksrc="kaitai_struct_python_runtime-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+short_desc="Kaitai Struct API for Python"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT"
+homepage="https://kaitai.io"
+distfiles="https://github.com/kaitai-io/kaitai_struct_python_runtime/archive/${version}.tar.gz"
+checksum=d21207d17603d87f263c8adcd45235ce22d154ba6faba0945e4f1a9d8d95e7e9
+
+post_install() {
+ vlicense LICENSE
+}
From f7994472d2bde2a29be21d06f037d13c7f348650 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:29:13 +1100
Subject: [PATCH 426/608] New package: python3-Arpeggio-2.0.0
---
srcpkgs/python3-Arpeggio/template | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/python3-Arpeggio/template
diff --git a/srcpkgs/python3-Arpeggio/template b/srcpkgs/python3-Arpeggio/template
new file mode 100644
index 000000000000..941fe2b4fdf1
--- /dev/null
+++ b/srcpkgs/python3-Arpeggio/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-Arpeggio'
+pkgname=python3-Arpeggio
+version=2.0.0
+revision=1
+wrksrc="Arpeggio-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Recursive descent parser with memoization based on PEG grammars"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT"
+homepage="https://github.com/textX/Arpeggio"
+changelog="https://raw.githubusercontent.com/textX/Arpeggio/master/CHANGELOG.md"
+distfiles="https://github.com/textX/Arpeggio/archive/${version}.tar.gz"
+checksum=70eb3d33948b9d69320c919d2e1820381220e6960ed46f805fbe6f1a09f03a66
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e '/pytest-runner/d' -i setup.cfg
+}
+
+post_install() {
+ vlicense LICENSE
+}
From af11e093f3876a07e16f865fc164fe0e7fa24a7c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 10:55:22 +1100
Subject: [PATCH 427/608] New package: python3-publicsuffix2-2019.12.21
---
srcpkgs/python3-publicsuffix2/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-publicsuffix2/template
diff --git a/srcpkgs/python3-publicsuffix2/template b/srcpkgs/python3-publicsuffix2/template
new file mode 100644
index 000000000000..1b5f2368a138
--- /dev/null
+++ b/srcpkgs/python3-publicsuffix2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-publicsuffix2'
+pkgname=python3-publicsuffix2
+version=2019.12.21
+revision=1
+wrksrc="python-publicsuffix2-release-2.${version//./-}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-requests python3-wheel"
+depends="python3"
+short_desc="Get a public suffix for a domain name using the Public Suffix List"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT, MPL-2.0"
+homepage="https://github.com/nexB/python-publicsuffix2"
+changelog="https://raw.githubusercontent.com/nexB/python-publicsuffix2/develop/CHANGELOG.rst"
+distfiles="https://github.com/nexB/python-publicsuffix2/archive/release-2.${version//./-}.tar.gz"
+checksum=b4ef022fccd7b4968151af208b0f890e55c00b24892a1a826b2b7a381215bafa
+
+post_install() {
+ vlicense publicsuffix2.LICENSE
+}
From a7a057e5fbb66f92cdde06cb40e1eaac1e4ce87c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 11:01:00 +1100
Subject: [PATCH 428/608] New package: python3-zstandard-0.18.0
---
srcpkgs/python3-zstandard/template | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 srcpkgs/python3-zstandard/template
diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
new file mode 100644
index 000000000000..523a7ee72b60
--- /dev/null
+++ b/srcpkgs/python3-zstandard/template
@@ -0,0 +1,29 @@
+# Template file for 'python3-zstandard'
+pkgname=python3-zstandard
+version=0.18.0
+revision=1
+wrksrc="python-zstandard-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-hypothesis"
+short_desc="Python bindings to the Zstandard (zstd) compression library"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/indygreg/python-zstandard"
+changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
+distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
+checksum=a6c7e2b8d4ec262269ccbc7ce66073370a06d6a0fc866946b7ce429b97e0c4ac
+
+pre_check() {
+ # The skipped test ignored due to failure, see:
+ # https://github.com/indygreg/python-zstandard/issues/147#issuecomment-874278901
+ if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+ vsed -i -e '/def test_estimated_compression_context_size/s/test//' tests/test_data_structures*.py
+ fi
+}
+
+post_install() {
+ vlicense LICENSE
+}
From d5089ce15e8ef6dda4e928300ae2a0a0d3fab8b0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 11:01:30 +1100
Subject: [PATCH 429/608] New package: python3-parver-0.3.1
---
srcpkgs/python3-parver/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-parver/template
diff --git a/srcpkgs/python3-parver/template b/srcpkgs/python3-parver/template
new file mode 100644
index 000000000000..de58f5ee03f2
--- /dev/null
+++ b/srcpkgs/python3-parver/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-parver'
+pkgname=python3-parver
+version=0.3.1
+revision=1
+wrksrc="parver-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Arpeggio python3-attrs python3-six"
+checkdepends="${depends} python3-hypothesis python3-pretend python3-pytest"
+short_desc="Allows parsing and manipulation of PEP 440 version numbers"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT"
+homepage="https://github.com/RazerM/parver"
+changelog="https://raw.githubusercontent.com/RazerM/parver/master/CHANGELOG.md"
+distfiles="https://github.com/RazerM/parver/archive/${version}.tar.gz"
+checksum=db9cb60d6fa8fa5fe88af7016c26846a297dec8ce30f4966f29edf1351e4a544
+
+post_install() {
+ vlicense LICENSE
+}
From e6368d7dbfbcedd0f4eeaf903d1533c6e4fbde66 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 31 Dec 2021 11:01:44 +1100
Subject: [PATCH 430/608] New package: mitmproxy-8.1.1
---
srcpkgs/mitmproxy/template | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/mitmproxy/template
diff --git a/srcpkgs/mitmproxy/template b/srcpkgs/mitmproxy/template
new file mode 100644
index 000000000000..b662359d5c7c
--- /dev/null
+++ b/srcpkgs/mitmproxy/template
@@ -0,0 +1,32 @@
+# Template file for 'mitmproxy'
+pkgname=mitmproxy
+version=8.1.1
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Brotli python3-Flask python3-asgiref python3-blinker python3-certifi
+ python3-click python3-cryptography python3-h11 python3-h2 python3-hyperframe python3-kaitaistruct
+ python3-ldap3 python3-msgpack python3-openssl python3-parsing python3-passlib python3-protobuf
+ python3-publicsuffix2 python3-pyperclip python3-pyzstd python3-ruamel.yaml python3-sortedcontainers
+ python3-tornado python3-urwid python3-wsproto python3-zstandard"
+checkdepends="${depends} python3-hypothesis python3-parver
+ python3-pytest-asyncio python3-pytest-cov python3-pytest-timeout python3-requests"
+short_desc="Interactive TLS-capable intercepting HTTP proxy"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="MIT"
+homepage="https://mitmproxy.org"
+changelog="https://raw.githubusercontent.com/mitmproxy/mitmproxy/main/CHANGELOG.md"
+distfiles="https://github.com/mitmproxy/mitmproxy/archive/v${version}.tar.gz"
+checksum=212e81bec40e1d2a894d73a337f076a3010d981249e513565e9246f29822d06c
+
+_skip="(test_get_version)" # This test fails without a git repository
+
+if [ ${XBPS_TARGET_MACHINE%-musl} = "i686" ]; then
+ _skip+="or(test_refresh)"
+fi
+
+make_check_args="-k not($_skip)"
+
+post_install() {
+ vlicense LICENSE
+}
From b026e63d8afd89b332479347cbce894c6b8531cc Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Mon, 4 Jul 2022 09:42:37 +0700
Subject: [PATCH 431/608] Converseen: update 0.9.9.6
---
srcpkgs/Converseen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
index bb8790332271..b6c457aeaebe 100644
--- a/srcpkgs/Converseen/template
+++ b/srcpkgs/Converseen/template
@@ -1,6 +1,6 @@
# Template file for 'Converseen'
pkgname=Converseen
-version=0.9.9.5
+version=0.9.9.6
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/Faster3ck/Converseen"
distfiles="https://github.com/Faster3ck/Converseen/archive/refs/tags/v${version}.tar.gz"
-checksum=30d731968e61ab3fb701976f05b2f5b372e9760c05665d6183921fb94f8cfa44
+checksum=c2bf0ce9e2f2f95426e83d6ecd6115946179118915f2a620f586f9c072e1cf17
From 8c783ef262a818b2abeb655714d479b296e1cff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?=
=?UTF-8?q?=EF=BD=94=EF=BD=89?= <hiljusti@so.dang.cool>
Date: Sun, 3 Jul 2022 00:39:06 -0700
Subject: [PATCH 432/608] sigi: update to 3.4.2
---
srcpkgs/sigi/template | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
index fd42f7fa00d5..518dbf3a25aa 100644
--- a/srcpkgs/sigi/template
+++ b/srcpkgs/sigi/template
@@ -1,6 +1,6 @@
# Template file for 'sigi'
pkgname=sigi
-version=3.4.1
+version=3.4.2
revision=1
build_style=cargo
short_desc="Organization tool for people who hate organization"
@@ -8,12 +8,7 @@ maintainer="J.R. Hill <hiljusti@so.dang.cool>"
license="GPL-2.0-only"
homepage="https://github.com/hiljusti/sigi"
distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
-checksum=81f1171495ca53246df1f271e7bc631454e94c8294b95e277f29136572bef6ad
-
-case "$XBPS_TARGET_MACHINE" in
- ppc64le*) ;;
- ppc64*) broken="some rustix junk";;
-esac
+checksum=8bb60ca0fa0fd66aaeef0efb3b34b171dbe0a6e0f69672dafc9cc72fb30a4036
post_install() {
vman sigi.1
From 3cb9fd1c5bfc6fe52e22cccbe77c9244b30e8c3a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 4 Jul 2022 12:28:02 +1000
Subject: [PATCH 433/608] upmpdcli: update to 1.5.19
---
srcpkgs/upmpdcli/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 8c6719114ce3..abd66d3d0047 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
# Template file for 'upmpdcli'
pkgname=upmpdcli
-version=1.5.17
+version=1.5.19
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config tar"
@@ -9,8 +9,9 @@ short_desc="UPnP Media Renderer front-end for MPD"
maintainer="amak <amak.git@outlook.com>"
license="LGPL-2.1-or-later"
homepage="https://www.lesbonscomptes.com/upmpdcli"
+changelog="https://www.lesbonscomptes.com/upmpdcli/pages/releases.html"
distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=a60b508d20064783f40ac8d2d260b92bd0b2367c6a0ca67c69019f3890bc642d
+checksum=67fa1f5c06fecd404f3414b25a070c9deabe917241ed6881b7a8e41e8379ed09
python_version=3
system_accounts="_upmpdcli"
From 20610ae1594913beb0d23b89944e1932880df70f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Jul 2022 14:59:50 +0200
Subject: [PATCH 434/608] efl: add missing libgomp-devel build dep
---
srcpkgs/efl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 714080ade250..e5fbd1c66315 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -28,7 +28,7 @@ makedepends="
gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
- avahi-libs-devel eudev-libudev-devel
+ avahi-libs-devel eudev-libudev-devel libgomp-devel
libsndfile-devel libmount-devel LuaJIT-devel poppler-cpp-devel
librsvg-devel libspectre-devel libraw-devel libopenjpeg2-devel
libheif-devel libavif-devel
From e459d59b8313543207791a9930bf084b4263f300 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Jul 2022 15:00:52 +0200
Subject: [PATCH 435/608] mozjs91: remove invalid awk dependency
---
srcpkgs/mozjs91/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 1e42f14b59aa..e2a5efee8735 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -12,7 +12,7 @@ configure_args="--disable-jemalloc --disable-strip --disable-tests \
--enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \
--with-system-nspr --with-system-zlib --enable-hardening --enable-release"
hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
- awk rust cargo llvm12 clang"
+ rust cargo llvm12 clang"
makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
zlib-devel rust-std"
checkdepends=python3
From 6e20c43e1dd7fddc695480917a788080d4970130 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Jul 2022 15:01:25 +0200
Subject: [PATCH 436/608] openocd: loosen jimtcl dep version restriction
---
srcpkgs/openocd/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template
index 856977b045ec..d6370930edc1 100644
--- a/srcpkgs/openocd/template
+++ b/srcpkgs/openocd/template
@@ -4,6 +4,7 @@ version=0.11.0+1
revision=1
# update to a commit that has a compatible jimtcl version
_commit=830d70bfc66ada2a68c73283b9e4fa4770d408ee
+_jimtcl_version=0.81
wrksrc="${pkgname}-${_commit}"
build_style=gnu-configure
configure_args="
@@ -41,7 +42,8 @@ configure_args="
--enable-cmsis-dap-v2
--disable-internal-libjaylink"
hostmakedepends="automake pkg-config libtool which"
-makedepends="hidapi-devel jimtcl-devel-0.81_1 libftdi1-devel
+makedepends="hidapi-devel libftdi1-devel
+ jimtcl-devel>=${_jimtcl_version}_1<=${_jimtcl_version}_9999
libusb-devel libjaylink-devel capstone-devel"
short_desc="Open On-Chip Debugger"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From e9abb395d7685015fefa0f4b2286486ef84672ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Jul 2022 15:04:00 +0200
Subject: [PATCH 437/608] jimtcl: mention version restriction in openocd
openocd depends on a specific version of jimtcl, so when jimtcl is
updated, openocd needs to be updated as well
---
srcpkgs/jimtcl/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/jimtcl/template b/srcpkgs/jimtcl/template
index 25d32bb5c5ae..0cf62f5657b6 100644
--- a/srcpkgs/jimtcl/template
+++ b/srcpkgs/jimtcl/template
@@ -1,5 +1,6 @@
# Template file for 'jimtcl'
pkgname=jimtcl
+# keep in sync with _jimtcl_version in openocd
version=0.81
revision=1
build_style=gnu-configure
From 9d7dff86922489d4f4436483803499b4a20ece65 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Mon, 4 Jul 2022 15:49:00 +0000
Subject: [PATCH 438/608] got: update to 0.73.
---
srcpkgs/got/patches/cast-printf-time_t.patch | 24 ++++++++++++++++++++
srcpkgs/got/template | 4 ++--
2 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/got/patches/cast-printf-time_t.patch
diff --git a/srcpkgs/got/patches/cast-printf-time_t.patch b/srcpkgs/got/patches/cast-printf-time_t.patch
new file mode 100644
index 000000000000..a369ddff9278
--- /dev/null
+++ b/srcpkgs/got/patches/cast-printf-time_t.patch
@@ -0,0 +1,24 @@
+From: Christian Weisgerber <naddy@mips.inka.de>
+Date: Mon, 4 Jul 2022 15:13:11 +0000 (+0000)
+Subject: fix potential type mismatch between format specifier and argument
+X-Git-Url: https://git.gameoftrees.org/gitweb/?p=got.git;a=commitdiff_plain;h=b9a36ae5
+
+fix potential type mismatch between format specifier and argument
+
+Cast printf argument of type time_t to long long to match the %lld
+format specifier on platforms where this might not be the case.
+---
+
+diff --git a/lib/sigs.c b/lib/sigs.c
+index 693a3a27..ac1b2637 100644
+--- a/lib/sigs.c
++++ b/lib/sigs.c
+@@ -204,7 +204,7 @@ got_tag_write_signed_data(BUF *buf, struct got_tag_object *tag,
+ got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
+ got_object_tag_get_tagger_gmtoff(tag));
+ if (asprintf(&tagger, "%s %lld %s", got_object_tag_get_tagger(tag),
+- got_object_tag_get_tagger_time(tag), gmtoff) == -1) {
++ (long long)got_object_tag_get_tagger_time(tag), gmtoff) == -1) {
+ err = got_error_from_errno("asprintf");
+ goto done;
+ }
diff --git a/srcpkgs/got/template b/srcpkgs/got/template
index 1113cca08d9b..6a991e32a027 100644
--- a/srcpkgs/got/template
+++ b/srcpkgs/got/template
@@ -1,6 +1,6 @@
# Template file for 'got'
pkgname=got
-version=0.71
+version=0.73
revision=1
wrksrc=got-portable-${version}
build_style=gnu-configure
@@ -12,7 +12,7 @@ license="ISC"
homepage="https://gameoftrees.org"
changelog="https://gameoftrees.org/releases/CHANGES"
distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
-checksum="16a61f49e52e189606d8f4236423f912b5cae71b1d505ef1313b4fc3173108f0"
+checksum="f0753a7e745bb3975cdd915424827d76bdec6bd0832c443c77d84ae3121ca874"
post_install() {
sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE
From 91928bc45b1a49fa7d65611e6febe0ef6374ef2b Mon Sep 17 00:00:00 2001
From: "Ivan '.ztx/lyghters' Sivkov" <lyghters@gmail.com>
Date: Mon, 4 Jul 2022 15:48:52 +0500
Subject: [PATCH 439/608] xonotic: update to 0.8.5
deleted musl-moncontrol.patch since it isn't needed anymore and won't
build
---
srcpkgs/xonotic/patches/musl-moncontrol.patch | 13 -------------
srcpkgs/xonotic/template | 6 +++---
2 files changed, 3 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/xonotic/patches/musl-moncontrol.patch
diff --git a/srcpkgs/xonotic/patches/musl-moncontrol.patch b/srcpkgs/xonotic/patches/musl-moncontrol.patch
deleted file mode 100644
index 41b11d74b8fb..000000000000
--- a/srcpkgs/xonotic/patches/musl-moncontrol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-There is no moncontrol() in musl libc.
-
---- a/source/darkplaces/sys_shared.c 2015-01-13 19:56:16.000000000 +0100
-+++ b/source/darkplaces/sys_shared.c 2015-08-30 09:24:54.839064473 +0200
-@@ -69,7 +69,7 @@
- else
- moncleanup();
- #endif
--#elif defined(__linux__) || defined(__FreeBSD__)
-+#elif (defined(__linux__) && defined(__GLIBC__)) || defined(__FreeBSD__)
- extern int moncontrol(int);
- moncontrol(enable);
- #endif
diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template
index 576f19979de9..b492d0d5f63d 100644
--- a/srcpkgs/xonotic/template
+++ b/srcpkgs/xonotic/template
@@ -1,7 +1,7 @@
# Template file for 'xonotic'
pkgname=xonotic
-version=0.8.2
-revision=2
+version=0.8.5
+revision=1
wrksrc="Xonotic"
hostmakedepends="unzip automake libtool"
makedepends="gmp-devel MesaLib-devel SDL2-devel libcurl-devel alsa-lib-devel
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, BSD-3-Clause"
homepage="http://xonotic.org"
distfiles="https://dl.xonotic.org/xonotic-${version}-source.zip"
-checksum=5e6916f1e6e9e22285bb71ddd075189102857383e74ed0b0a3d27cef08e0bd2b
+checksum=a1a81ba55ab151bf09758e7f59614b2e5150e84224753e77950bcd07a282ea5d
nocross=yes
do_build() {
From 51b8757b94b62045c1f327851717cc04bd95c945 Mon Sep 17 00:00:00 2001
From: "Ivan '.ztx/lyghters' Sivkov" <lyghters@gmail.com>
Date: Mon, 4 Jul 2022 15:50:05 +0500
Subject: [PATCH 440/608] xonotic-data: update to 0.8.5
---
srcpkgs/xonotic-data/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template
index 6870e1cae1ea..419c4ca4fd2e 100644
--- a/srcpkgs/xonotic-data/template
+++ b/srcpkgs/xonotic-data/template
@@ -1,15 +1,15 @@
# Template file for 'xonotic-data'
pkgname=xonotic-data
-version=0.8.2
-revision=3
+version=0.8.5
+revision=1
wrksrc=Xonotic
hostmakedepends="unzip"
short_desc="Xonotic's data files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://xonotic.org"
-distfiles="http://dl.xonotic.org/xonotic-${version}.zip"
-checksum=a22f7230f486c5825b55cfdadd73399c9b0fae98c9e081dd8ac76eca08359ad5
+distfiles="https://dl.xonotic.org/xonotic-${version}.zip"
+checksum=0f92aa238362aeb059b9d9026a9bd38d6217423a35c19f126fb39e38736e37e5
do_install() {
vmkdir usr/share/xonotic
From 7f91d7dc914d8a65586b8d4b1c0fba22d647e40c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 4 Jul 2022 03:37:29 +0300
Subject: [PATCH 441/608] file: update to 5.42.
---
srcpkgs/file/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index a7e080f143ba..97426c4741b1 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,6 +1,6 @@
# Template file for 'file'
pkgname=file
-version=5.41
+version=5.42
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.darwinsys.com/file/"
distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
-checksum=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
+checksum=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4
build_options="libseccomp"
From 42ceaab3ade73cbfcd24b3864d7fe526b2f9a1ce Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 4 Jul 2022 13:18:27 -0400
Subject: [PATCH 442/608] git-absorb: update to 0.6.7.
---
srcpkgs/git-absorb/template | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index fa73d41afbae..c428d4657e77 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -1,18 +1,23 @@
# Template file for 'git-absorb'
pkgname=git-absorb
-version=0.6.6
+version=0.6.7
revision=1
build_style=cargo
+build_helper=qemu
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
short_desc="Like git commit --fixup, but automatic"
maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="BSD-3-Clause"
homepage="https://github.com/tummychow/git-absorb"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=955069cc70a34816e6f4b6a6bd1892cfc0ae3d83d053232293366eb65599af2f
+distfiles="https://github.com/tummychow/git-absorb/archive/${version}.tar.gz"
+checksum=f562dbcf68c5f687197e8a594cb58cf102cc17a2e9fcf66dbacb83b49e053bd7
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
+ for sh in bash fish zsh; do
+ vtargetrun ${DESTDIR}/usr/bin/git-absorb --gen-completions $sh > git-absorb.$sh
+ vcompletion git-absorb.$sh $sh
+ done
}
From 69b55db4b060b756bccdc41865f021a86093ade9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 12 Feb 2022 00:14:20 +0100
Subject: [PATCH 443/608] postgresql13: update to 13.7.
---
srcpkgs/postgresql13/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 0f7b79fd6710..08e67ba226bd 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql13'
pkgname=postgresql13
-version=13.5
-revision=2
+version=13.7
+revision=1
wrksrc="postgresql-${version}"
build_style=gnu-configure
make_build_target=world
@@ -21,7 +21,8 @@ license="PostgreSQL"
homepage="https://www.postgresql.org"
changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
+checksum=1b905bf4f3d83614a393b3c51fd345910fd261e4f5124a68d9a1fdd3a2a46399
+make_check=ci-skip # Postgres server can't be run as root
conf_files="
/${_prefix}/etc/default/postgresql
@@ -223,5 +224,6 @@ postgresql13-contrib_package() {
short_desc="PostgreSQL contributed programs and extensions"
pkg_install() {
make -C contrib install DESTDIR=${PKGDESTDIR}
+ mv ${PKGDESTDIR}/usr/include ${PKGDESTDIR}/${_prefix}
}
}
From 48fe4a16b212e8c574d86c0404db3bd7eaf0ef08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 12 Feb 2022 00:14:20 +0100
Subject: [PATCH 444/608] postgresql14: update to 14.4.
---
srcpkgs/postgresql14/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/postgresql14/template b/srcpkgs/postgresql14/template
index 94ba16bffbc6..2aa65e684a1d 100644
--- a/srcpkgs/postgresql14/template
+++ b/srcpkgs/postgresql14/template
@@ -1,6 +1,6 @@
# Template file for 'postgresql14'
pkgname=postgresql14
-version=14.1
+version=14.4
revision=1
wrksrc="postgresql-${version}"
build_style=gnu-configure
@@ -22,7 +22,8 @@ license="PostgreSQL"
homepage="https://www.postgresql.org"
changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f
+checksum=c23b6237c5231c791511bdc79098617d6852e9e3bdf360efd8b5d15a1a3d8f6a
+make_check=ci-skip # Postgres server can't be run as root
conf_files="
/${_sysconfdir}/default/postgresql
@@ -224,5 +225,6 @@ postgresql14-contrib_package() {
short_desc="PostgreSQL contributed programs and extensions"
pkg_install() {
make -C contrib install DESTDIR=${PKGDESTDIR}
+ mv ${PKGDESTDIR}/usr/include ${PKGDESTDIR}/${_prefix}
}
}
From 4fb781a25efd7f7839159594b3b1ef987e25f519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 12 Feb 2022 00:14:20 +0100
Subject: [PATCH 445/608] postgresql: turn into meta package
9.6 is EOL
---
srcpkgs/postgresql-full | 1 +
srcpkgs/postgresql/files/pg_config.sh.in | 143 -------------
srcpkgs/postgresql/files/postgresql.confd | 17 --
srcpkgs/postgresql/files/postgresql.pam | 3 -
srcpkgs/postgresql/files/postgresql/control/t | 2 -
srcpkgs/postgresql/files/postgresql/log/run | 2 -
srcpkgs/postgresql/files/postgresql/run | 30 ---
.../patches/pg_config-cross-value.patch | 46 -----
srcpkgs/postgresql/template | 189 +++---------------
9 files changed, 30 insertions(+), 403 deletions(-)
create mode 120000 srcpkgs/postgresql-full
delete mode 100644 srcpkgs/postgresql/files/pg_config.sh.in
delete mode 100644 srcpkgs/postgresql/files/postgresql.confd
delete mode 100644 srcpkgs/postgresql/files/postgresql.pam
delete mode 100755 srcpkgs/postgresql/files/postgresql/control/t
delete mode 100755 srcpkgs/postgresql/files/postgresql/log/run
delete mode 100755 srcpkgs/postgresql/files/postgresql/run
delete mode 100644 srcpkgs/postgresql/patches/pg_config-cross-value.patch
diff --git a/srcpkgs/postgresql-full b/srcpkgs/postgresql-full
new file mode 120000
index 000000000000..360e6d1a1f45
--- /dev/null
+++ b/srcpkgs/postgresql-full
@@ -0,0 +1 @@
+postgresql
\ No newline at end of file
diff --git a/srcpkgs/postgresql/files/pg_config.sh.in b/srcpkgs/postgresql/files/pg_config.sh.in
deleted file mode 100644
index 4598753f6931..000000000000
--- a/srcpkgs/postgresql/files/pg_config.sh.in
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-# Released to Public Domain by Doan Tran Cong Danh
-
-print() {
- printf '%s\n' "$@"
-}
-
-sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
-
-BINDIR="$sysroot/usr/bin"
-DOCDIR="$sysroot/usr/share/doc/postgresql"
-HTMLDIR="$sysroot/usr/share/doc/postgresql"
-INCLUDEDIR="$sysroot/usr/include"
-PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
-INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
-LIBDIR="$sysroot/usr/lib"
-PKGLIBDIR="$sysroot/usr/lib/postgresql"
-LOCALEDIR="$sysroot/usr/share/locale"
-MANDIR="$sysroot/usr/share/man"
-SHAREDIR="$sysroot/usr/share/postgresql"
-SYSCONFDIR="$sysroot/etc/postgresql"
-PGXS="$sysroot/usr/lib/postgresql/pgxs/src/makefiles/pgxs.mk"
-
-CONFIGURE="@configure_args@"
-CC="@CC@"
-CPPFLAGS="@CPPFLAGS@"
-CFLAGS="@CFLAGS@"
-CFLAGS_SL="@CFLAGS_SL@"
-LDFLAGS="@LDFLAGS@"
-LDFLAGS_EX="@LDFLAGS_EX@"
-LDFLAGS_SL="@LDFLAGS_SL@"
-LIBS="@LIBS@"
-VERSION="PostgreSQL @VERSION@"
-
-if [ "$sysroot" != "/" ]; then
- CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/usr/include\\),-I$sysroot\\1,g")"
- CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/usr/include\\),-I$sysroot\\1,g")"
- LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/usr/lib\\),-L$sysroot\\1,g")"
-fi
-
-usage() {
- cat <<-EOF
- $0 provides information about the installed version of PostgreSQL.
-
- Usage:
- $0 [OPTION]...
-
- Options:
- --bindir show location of user executables
- --docdir show location of documentation files
- --htmldir show location of HTML documentation files
- --includedir show location of C header files of the client interfaces
- --pkgincludedir show location of other C header files
- --includedir-server show location of C header files for the server
- --libdir show location of object code libraries
- --pkglibdir show location of dynamically loadable modules
- --localedir show location of locale support files
- --mandir show location of manual pages
- --sharedir show location of architecture-independent support files
- --sysconfdir show location of system-wide configuration files
- --pgxs show location of extension makefile
- --configure show options given to PostgreSQL was built
- --cc show CC value used when PostgreSQL was built
- --cppflags show CPPFLAGS value used when PostgreSQL was built
- --cflags show CFLAGS value used when PostgreSQL was built
- --cflags_sl show CFLAGS_SL value used when PostgreSQL was built
- --ldflags show LDFLAGS value used when PostgreSQL was built
- --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built
- --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built
- --libs show LIBS value used when PostgreSQL was built
- --version show the PostgreSQL version
- -?, --help show this help, then exit
-
- With no arguments, all known items are shown.
-
- Report bugs to <pgsql-bugs@postgresql.org>.
- EOF
-}
-
-if test $# -eq 0; then
- cat <<-EOF
- BINDIR = $BINDIR
- DOCDIR = $DOCDIR
- HTMLDIR = $HTMLDIR
- INCLUDEDIR = $INCLUDEDIR
- PKGINCLUDEDIR = $PKGINCLUDEDIR
- INCLUDEDIR-SERVER = $INCLUDEDIR_SERVER
- LIBDIR = $LIBDIR
- PKGLIBDIR = $PKGLIBDIR
- LOCALEDIR = $LOCALEDIR
- MANDIR = $MANDIR
- SHAREDIR = $SHAREDIR
- SYSCONFDIR = $SYSCONFDIR
- PGXS = $PGXS
- CONFIGURE = $CONFIGURE
- CC = $CC
- CPPFLAGS = $CPPFLAGS
- CFLAGS = $CFLAGS
- CFLAGS_SL = $CFLAGS_SL
- LDFLAGS = $LDFLAGS
- LDFLAGS_EX = $LDFLAGS_EX
- LDFLAGS_SL = $LDFLAGS_SL
- LIBS = $LIBS
- VERSION = $VERSION
- EOF
-fi
-
-for arg
-do
- if test "x$arg" = "x--help" || test "x$arg" = "x-?"; then
- usage
- exit 0
- fi
-done
-
-for arg
-do
- case "$arg" in
- --bindir) print "$BINDIR" ;;
- --docdir) print "$DOCDIR" ;;
- --htmldir) print "$HTMLDIR" ;;
- --includedir) print "$INCLUDEDIR" ;;
- --pkgincludedir) print "$PKGINCLUDEDIR" ;;
- --includedir-server) print "$INCLUDEDIR_SERVER" ;;
- --libdir) print "$LIBDIR" ;;
- --pkglibdir) print "$PKGLIBDIR" ;;
- --localedir) print "$LOCALEDIR" ;;
- --mandir) print "$MANDIR" ;;
- --sharedir) print "$SHAREDIR" ;;
- --sysconfdir) print "$SYSCONFDIR" ;;
- --pgxs) print "$PGXS" ;;
- --configure) print "$CONFIGURE" ;;
- --cc) print "$CC" ;;
- --cppflags) print "$CPPFLAGS" ;;
- --cflags) print "$CFLAGS" ;;
- --cflags_sl) print "$CFLAGS_SL" ;;
- --ldflags) print "$LDFLAGS" ;;
- --ldflags_ex) print "$LDFLAGS_EX" ;;
- --ldflags_sl) print "$LDFLAGS_SL" ;;
- --libs) print "$LIBS" ;;
- --version) print "$VERSION" ;;
- esac
-done
diff --git a/srcpkgs/postgresql/files/postgresql.confd b/srcpkgs/postgresql/files/postgresql.confd
deleted file mode 100644
index 2a3cd1469b05..000000000000
--- a/srcpkgs/postgresql/files/postgresql.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration file for the PostgreSQL server.
-
-# PostgreSQL's database directory
-PGROOT="/var/lib/postgresql"
-
-# PostgreSQL's log file.
-PGLOG="/var/log/postgresql.log"
-
-# Passed to initdb if necessary
-INITOPTS="-A peer --auth-host=md5 --auth-local=peer --locale en_US.UTF-8"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these options
-# can be set directly in the configuration-file.
-#PGOPTS="-N 512 -B 1024"
diff --git a/srcpkgs/postgresql/files/postgresql.pam b/srcpkgs/postgresql/files/postgresql.pam
deleted file mode 100644
index 53724d1f86a7..000000000000
--- a/srcpkgs/postgresql/files/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/srcpkgs/postgresql/files/postgresql/control/t b/srcpkgs/postgresql/files/postgresql/control/t
deleted file mode 100755
index b0026e5661b4..000000000000
--- a/srcpkgs/postgresql/files/postgresql/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/kill -INT `/usr/bin/head -1 /run/runit/supervise.postgresql/pid`
diff --git a/srcpkgs/postgresql/files/postgresql/log/run b/srcpkgs/postgresql/files/postgresql/log/run
deleted file mode 100755
index e564447b60db..000000000000
--- a/srcpkgs/postgresql/files/postgresql/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres
diff --git a/srcpkgs/postgresql/files/postgresql/run b/srcpkgs/postgresql/files/postgresql/run
deleted file mode 100755
index 3982873cde69..000000000000
--- a/srcpkgs/postgresql/files/postgresql/run
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-. /etc/default/postgresql
-: ${PGDATA:="$PGROOT/data"}
-
-if [ "$PGROOT" != "/var/lib/postgresql" ]; then
- echo "Creating symlink /var/lib/postgresql -> $PGROOT"
-
- # Remove /var/lib/postgres if empty dir, but not if symlink
- if [ ! -L /var/lib/postgres ] && [ -d /var/lib/postgres ]; then
- rmdir /var/lib/postgres
- fi
-
- ln -sf "$PGROOT" /var/lib/postgresql
-fi
-
-
-if [ ! -d "$PGDATA" ]; then
- echo "Initializing database in $PGDATA"
-
- mkdir -p "$PGDATA"
- chown -R postgres:postgres "$PGDATA"
- chmod 0700 "$PGDATA"
- su - postgres -m -c "/usr/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null
-
- if [ -f /etc/postgresql/postgresql.conf ]; then
- ln -sf /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
- fi
-fi
-
-exec chpst -u postgres:postgres postgres -D "$PGDATA" $PGOPTS 2>&1
diff --git a/srcpkgs/postgresql/patches/pg_config-cross-value.patch b/srcpkgs/postgresql/patches/pg_config-cross-value.patch
deleted file mode 100644
index 214344520d7f..000000000000
--- a/srcpkgs/postgresql/patches/pg_config-cross-value.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Sources: Doan Tran Cong Danh
-Upstream: No
- - First part needs to be rework in configure script to be usable
- upstream
- - Second part would un-usable for Windows
-diff --git src/common/Makefile src/common/Makefile
-index ec04710..2af845f 100644
---- a/src/common/Makefile
-+++ b/src/common/Makefile
-@@ -22,11 +22,14 @@ include $(top_builddir)/src/Makefile.global
-
- # don't include subdirectory-path-dependent -I and -L switches
- STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
-+STD_CPPFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_CPPFLAGS))
-+STD_CFLAGS := $(subst @XBPS_SYSROOT@,,$(CFLAGS))
- STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
-+STD_LDFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_LDFLAGS))
- override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
- override CPPFLAGS += -DVAL_CC="\"$(CC)\""
- override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
--override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
-+override CPPFLAGS += -DVAL_CFLAGS="\"$(STD_CFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
- override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
-@@ -44,7 +47,19 @@ OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
-
- OBJS_SRV = $(OBJS_COMMON:%.o=%_srv.o)
-
--all: libpgcommon.a libpgcommon_srv.a
-+all: libpgcommon.a libpgcommon_srv.a pg_config.sh
-+
-+pg_config.sh: pg_config.sh.in
-+ sed -e "s/@configure_args@/$(subst /,\\/,$(configure_args))/" \
-+ -e "s/@CC@/$(subst /,\\/,$(CC))/" \
-+ -e "s/@CPPFLAGS@/$(subst /,\\/,$(STD_CPPFLAGS))/" \
-+ -e "s/@CFLAGS@/$(subst /,\\/,$(STD_CFLAGS))/" \
-+ -e "s/@CFLAGS_SL@/$(subst /,\\/,$(CFLAGS_SL))/" \
-+ -e "s/@LDFLAGS@/$(subst /,\\/,$(STD_LDFLAGS))/" \
-+ -e "s/@LDFLAGS_EX@/$(subst /,\\/,$(LDFLAGS_EX))/" \
-+ -e "s/@LDFLAGS_SL@/$(subst /,\\/,$(LDFLAGS_SL))/" \
-+ -e "s/@LIBS@/$(subst /,\\/,$(LIBS))/" \
-+ $< >$@
-
- # libpgcommon is needed by some contrib
- install: all installdirs
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index d9fcad13bbf8..4f539b0df9ff 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,191 +1,60 @@
# Template file for 'postgresql'
pkgname=postgresql
-version=9.6.24
+version=14
revision=1
-build_style=gnu-configure
-make_build_target=world
-configure_args="--with-openssl --with-python
- --with-pam --datadir=/usr/share/postgresql --enable-thread-safety
- --with-perl --with-tcl --without-ldap --without-gssapi --without-krb5
- --without-bonjour --with-libxml --with-libxslt --disable-rpath
- --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
-hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
- python-devel readline-devel tcl-devel"
-short_desc="Sophisticated open-source Object-Relational DBMS"
+build_style=meta
+depends="postgresql${version}"
+short_desc="PostgreSQL server meta package"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="PostgreSQL"
homepage="https://www.postgresql.org"
-changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
-distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=aeb7a196be3ebed1a7476ef565f39722187c108dd47da7489be9c4fcae982ace
-# initdb fails on github actions, works locally with xbps-uunshare
-make_check=ci-skip
-conf_files="
- /etc/default/${pkgname}
- /etc/pam.d/${pkgname}
- /etc/${pkgname}/${pkgname}.conf"
-
-# Create 'postgres' user for the server.
-system_accounts="postgres"
-postgres_homedir="/var/lib/${pkgname}"
-postgres_shell="/bin/sh"
-postgres_descr="PostgreSQL database server user"
-make_dirs="/var/lib/postgresql 0750 postgres postgres"
-
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" --without-perl --without-python --without-tcl"
+build_options="languages"
+desc_option_languages="Include procedural languages as dependency"
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="languages"
fi
-post_patch() {
- sed -e "s/@VERSION@/$version/" \
- "$FILESDIR"/pg_config.sh.in >src/common/pg_config.sh.in
- vsed -i -e "s,@XBPS_SYSROOT@,${XBPS_CROSS_BASE%/}," src/common/Makefile
-}
-
-pre_build() {
- # http://www.postgresql.org/docs/9.3/static/docguide-toolsets.html
- export SGML_CATALOG_FILES="/usr/share/sgml/openjade/catalog:/usr/share/sgml/iso8879/catalog:/usr/share/sgml/docbook/dsssl/modular/catalog:/usr/share/sgml/docbook/4.2/catalog"
-}
-
-post_build() {
- make -C contrib ${makejobs}
-}
-
-post_install() {
- make -C contrib install
-
- vmkdir usr/share/man
- cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
- vmkdir usr/share/doc/postgresql
- cp -r doc/src/sgml/html ${DESTDIR}/usr/share/doc/postgresql
- vsv postgresql
- vlicense COPYRIGHT
-
- vinstall ${FILESDIR}/${pkgname}.confd 644 etc/default ${pkgname}
- vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
- vinstall ${DESTDIR}/usr/share/${pkgname}/${pkgname}.conf.sample \
- 644 etc/${pkgname} ${pkgname}.conf
- vbin src/common/pg_config.sh
-
- sed -i 's/install_bin = .*/install_bin = install/g' \
- ${DESTDIR}/usr/lib/postgresql/pgxs/src/Makefile.global
-}
-
postgresql-doc_package() {
- short_desc="PostgreSQL documentation"
- pkg_install() {
- vmove usr/share/doc
- }
-}
-
-postgresql9.6-libs_package() {
- short_desc="PostgreSQL shared libraries"
- pkg_install() {
- vmove "usr/lib/*.so*"
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name libpq5\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-postgresql9.6-libs-devel_package() {
- depends="postgresql-libs>=$version"
- short_desc="PostgreSQL shared libraries (development files)"
- pkg_install() {
- for f in pg_config ecpg; do
- vmove usr/bin/${f}
- vmove "usr/share/man/man1/$(basename ${f})*"
- done
- vmove usr/bin/pg_config.sh
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/pkgconfig/*"
- vmove usr/share/man/man3
- vmove usr/lib/postgresql/pgxs
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name pg_config\* -o -name ecpg\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
+ depends="postgresql${version}-doc"
+ short_desc="PostgreSQL documentation meta package"
}
# XXX disabled for now in cross builds.
-if [ -z "$CROSS_BUILD" ]; then
+if [ "$build_option_languages" ]; then
postgresql-plperl_package() {
- depends="postgresql>=$version"
- short_desc="PL/Perl procedural language for PostgreSQL"
- pkg_install() {
- vmove "usr/lib/postgresql/plperl*"
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name plperl\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
+ depends="postgresql${version}-plperl"
+ short_desc="PL/Perl language meta package"
}
postgresql-plpython_package() {
- depends="postgresql>=$version"
- short_desc="PL/Python procedural language for PostgreSQL"
- pkg_install() {
- vmove "usr/lib/postgresql/plpython*"
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name plpython\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
+ depends="postgresql${version}-plpython"
+ short_desc="PL/Python language meta package"
}
postgresql-pltcl_package() {
- depends="postgresql>=$version"
- short_desc="PL/Tcl procedural language for PostgreSQL"
- pkg_install() {
- vmove "usr/bin/pltcl*"
- vmove "usr/lib/postgresql/pltcl*"
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name pltcl\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- vmove "usr/share/postgresql/*.pltcl"
- }
+ depends="postgresql${version}-pltcl"
+ short_desc="PL/Tcl language meta package"
}
-fi # !CROSS_BUILD
+fi # build_option_languages
postgresql-client_package() {
+ depends="postgresql${version}-client"
short_desc="Client frontends programs for PostgreSQL"
- pkg_install() {
- for f in clusterdb createdb createlang createuser dropdb droplang \
- dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \
- vacuumdb; do
- vmove usr/bin/${f}
- vmove usr/share/man/man1/$(basename ${f}).1
- done
- vmove usr/share/man/man7
- for d in $(find ${DESTDIR}/usr/share/locale \
- -type f -name pgscripts\* -o \
- -name psql\* -o \
- -name pg_dump\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- vmkdir usr/share/postgresql
- mv ${DESTDIR}/usr/share/postgresql/psqlrc.* \
- ${PKGDESTDIR}/usr/share/postgresql
- }
}
postgresql-contrib_package() {
+ depends="postgresql${version}-contrib"
short_desc="PostgreSQL contributed programs and extensions"
- pkg_install() {
- make -C contrib install DESTDIR=${PKGDESTDIR}
- }
+}
+
+postgresql-full() {
+ depends="postgresql postgresql-client postgresql-doc postgresql-contrib postgresql-libs"
+ short_desc="PostgreSQL all packages meta package"
+
+ if [ "$build_option_languages" ]; then
+ depends+=" postgresql-plpython postgresql-plperl postgresql-pltcl"
+ fi
}
From 821a82398ab12ca8fc124acbf33ed56e5fbbe8a8 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 4 Jul 2022 23:13:45 +0400
Subject: [PATCH 446/608] caja: update to 1.26.1.
---
srcpkgs/caja/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index 95167200cdb6..16d4ead32547 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -1,6 +1,6 @@
# Template file for 'caja'
pkgname=caja
-version=1.26.0
+version=1.26.1
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
changelog="https://raw.githubusercontent.com/mate-desktop/caja/master/NEWS"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a200a6fad3a5fbc70d10f8626788e2f4f31bde363649bc50a6bb8a85b2880ad4
+checksum=30fd6e6f00a38200f6e2e898ad7fa797876bb060f1d0341dd2f7393279e14c07
build_options="gir"
build_options_default="gir"
From 6baaa4d9299c3fdfed99c9f6e0c2e41c7980885a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 4 Jul 2022 22:11:56 +0200
Subject: [PATCH 447/608] spice-protocol: update to 0.14.4.
---
srcpkgs/spice-protocol/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/spice-protocol/template b/srcpkgs/spice-protocol/template
index 1ff8a7a0c25d..b80848814ec9 100644
--- a/srcpkgs/spice-protocol/template
+++ b/srcpkgs/spice-protocol/template
@@ -1,6 +1,6 @@
# Template file for 'spice-protocol'
pkgname=spice-protocol
-version=0.14.3
+version=0.14.4
revision=1
wrksrc="spice-protocol-v${version}"
build_style=meson
@@ -8,8 +8,9 @@ short_desc="SPICE protocol headers"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.spice-space.org/"
+changelog="https://gitlab.freedesktop.org/spice/spice-protocol/-/raw/master/CHANGELOG.md"
distfiles="https://gitlab.freedesktop.org/spice/spice-protocol/-/archive/v${version}/spice-protocol-v${version}.tar.gz"
-checksum=80ae89643e253dc5ddc5b2120cd3cf9d9565d00026ff261dd140d4b8c5deaa64
+checksum=9c31fa533ad531d1b816ffd0c24b4785d133e7bb397f72d35f7a6d59bcd7d53a
post_install() {
vlicense COPYING
From 1ccfbc2abdf9e3d34a7a8a3d5f76d095fc392d90 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 29 Jun 2022 18:18:06 +0200
Subject: [PATCH 448/608] terraform: update to 1.2.3.
---
srcpkgs/terraform/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index d5d886a99ec1..9ddd622d31a2 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
# Template file for 'terraform'
pkgname=terraform
-version=1.2.1
+version=1.2.3
revision=1
build_style=go
go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MPL-2.0"
homepage="https://www.terraform.io/"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=d244277c3b8d10afa8d130cfd9db3570995a03a34052952de1ab2368fc25ab1c
+checksum=0bc726b85e0ef7325f9cc525f6e57cba46ed24e23f7d7d3d0ed3df91811a4ac6
From 564fbe6455a04f2dc06095dad0eb0fbabb1fde06 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 29 Jun 2022 18:19:19 +0200
Subject: [PATCH 449/608] terragrunt: update to 0.38.2.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 6e18fd4d8be3..321c6033279a 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.38.1
+version=0.38.2
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=7c8b187a5a516e3e90467960c161c7ef20b105ac9c391ddde27b0cbf98b0ea4c
+checksum=8362c0e23f9547c3ff95454e8b4c7176b6d2d4273e5def8f50e6cab4604abe02
post_install() {
vlicense LICENSE.txt
From 34b532bd072fad35dd085aaf54404b037b247c48 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 4 Jul 2022 23:12:26 +0200
Subject: [PATCH 450/608] terraform: update to 1.2.4.
---
srcpkgs/terraform/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 9ddd622d31a2..aceae9264505 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
# Template file for 'terraform'
pkgname=terraform
-version=1.2.3
+version=1.2.4
revision=1
build_style=go
go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MPL-2.0"
homepage="https://www.terraform.io/"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0bc726b85e0ef7325f9cc525f6e57cba46ed24e23f7d7d3d0ed3df91811a4ac6
+checksum=7d2f50449ddf87b6207b435a661ff3d6e3a9342f64d747211da7a558f8483997
From 5c55e19e80050a7945e5366333dd6f7a7f8992e9 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Mon, 4 Jul 2022 23:53:29 +0530
Subject: [PATCH 451/608] variety: update to 0.8.9
---
srcpkgs/variety/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/variety/template b/srcpkgs/variety/template
index df2ef21744d0..c5c8fe0d109f 100644
--- a/srcpkgs/variety/template
+++ b/srcpkgs/variety/template
@@ -1,7 +1,7 @@
# Template file for 'variety'
pkgname=variety
-version=0.8.5
-revision=2
+version=0.8.9
+revision=1
build_style=python3-module
pycompile_dirs="usr/share/variety/plugins"
hostmakedepends="python3-distutils-extra intltool"
@@ -9,9 +9,9 @@ depends="ImageMagick gtk+3 libgexiv2 libnotify python3-BeautifulSoup4
python3-Pillow python3-configobj python3-curl python3-dbus python3-gobject
python3-httplib2 python3-lxml python3-requests"
short_desc="Changes the wallpaper on a regular interval"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Ishaan Bhimwal <ishaanbhimwal@protonmail.com>"
license="GPL-3.0-only"
homepage="https://peterlevi.com/variety/"
changelog="https://raw.githubusercontent.com/varietywalls/variety/master/data/ui/changes.txt"
distfiles="https://github.com/varietywalls/variety/archive/${version}.tar.gz"
-checksum=2298af592cdd5cc0c183582f74f39af74b07499074ea164a3a327d55c9338248
+checksum=bcb5d41e0903734c0ac1015b0e599bf99eb1975bcbdcbce623eb42d230532595
From 819f5ac9851c32c0b2f9f6ba4b2e130f6dee6465 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 3 Jul 2022 20:25:26 +0200
Subject: [PATCH 452/608] bird: update to 2.0.10
- change to a better mirror for source (this eliminates the need to
run autoreconf as it's done by upstream and a custom worksrc is not
needed either)
- remove patch for babel as it already is upstream
- add changelog
---
...bel-Fix-bug-in-iface-reconfiguration.patch | 29 -------------------
srcpkgs/bird/template | 16 ++++------
2 files changed, 6 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
diff --git a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch b/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
deleted file mode 100644
index bc809171e493..000000000000
--- a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fcb4dd0c831339c4374ace17d8f2ae6ebfeed279 Mon Sep 17 00:00:00 2001
-From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
-Date: Sun, 27 Feb 2022 03:10:38 +0100
-Subject: [PATCH] Babel: Fix bug in iface reconfiguration
-
-A recent change in Babel causes ifaces to disappear after
-reconfiguration. The patch fixes that.
-
-Thanks to Johannes Kimmel for an insightful bugreport.
----
- proto/babel/babel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proto/babel/babel.c b/proto/babel/babel.c
-index e43818f5..174fc9e2 100644
---- a/proto/babel/babel.c
-+++ b/proto/babel/babel.c
-@@ -1899,7 +1899,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
- struct babel_iface *ifa = babel_find_iface(p, iface);
- struct babel_iface_config *ic = (void *) iface_patt_find(&cf->iface_list, iface, NULL);
-
-- if (ic && iface_is_valid(p, iface))
-+ if (ic && !iface_is_valid(p, iface))
- ic = NULL;
-
- if (ifa && ic)
---
-2.35.1
-
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index f2351acd7286..e10b66e72742 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,27 +1,23 @@
# Template file for 'bird'
pkgname=bird
-version=2.0.9
-revision=2
-wrksrc=bird-v$version
+version=2.0.10
+revision=1
build_style=gnu-configure
-hostmakedepends="flex autoconf"
+hostmakedepends="flex"
makedepends="ncurses-devel readline-devel libssh-devel"
short_desc="BIRD Internet Routing Daemon"
maintainer="Philipp Hirsch <itself@hanspolo.net>"
license="GPL-2.0-or-later"
homepage="https://bird.network.cz"
-distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/v${version}/bird-v${version}.tar.gz"
-checksum=912d5c1bbefffd6198b10688ef6e16d0b9dfb2886944f481fc38b4d869ffd2c4
+changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
+distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
+checksum=7ed341ddd8dc87fa9736586b3515447a8436fec442d65f4022155ab9de1ffd5a
conf_files="/etc/bird.conf"
system_accounts="_bird"
CFLAGS="-fcommon"
-pre_configure() {
- autoreconf
-}
-
post_install() {
vsv bird
}
From c2fcf328eaf23020852d994ec3b868416a87fffd Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 5 Jul 2022 02:24:46 -0400
Subject: [PATCH 453/608] New package: wander-0.3.0
---
srcpkgs/wander/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/wander/template
diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
new file mode 100644
index 000000000000..c80c78c143f1
--- /dev/null
+++ b/srcpkgs/wander/template
@@ -0,0 +1,16 @@
+# Template file for 'wander'
+pkgname=wander
+version=0.3.0
+revision=1
+build_style=go
+go_import_path="github.com/robinovitch61/wander"
+short_desc="Terminal application for HashiCorp Nomad"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/robinovitch61/wander"
+distfiles="https://github.com/robinovitch61/wander/archive/refs/tags/v${version}.tar.gz"
+checksum=456a74eeebb25a39f9b8c57ccb186e6fc4ea8fbea6fb9623a7eb7180fff346fa
+
+post_install() {
+ vlicense LICENSE
+}
From 4543e5fbfac6560a5621d773a19353142629cfa9 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloi.torrentsj@gmail.com>
Date: Fri, 29 Apr 2022 12:55:53 +0200
Subject: [PATCH 454/608] New package: wvkbd-0.8.2
---
srcpkgs/wvkbd/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/wvkbd/template
diff --git a/srcpkgs/wvkbd/template b/srcpkgs/wvkbd/template
new file mode 100644
index 000000000000..a8f250b50487
--- /dev/null
+++ b/srcpkgs/wvkbd/template
@@ -0,0 +1,14 @@
+# Template file for 'wvkbd'
+pkgname=wvkbd
+version=0.8.2
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+hostmakedepends="wayland-devel pkg-config"
+makedepends="wayland-devel pango-devel libxkbcommon-devel"
+short_desc="On-screen keyboard for wlroots"
+maintainer="Eloi Torrents <eloi.torrentsj@gmail.com>"
+license=GPL-3.0-only
+homepage=https://github.com/jjsullivan5196/wvkbd
+distfiles=https://github.com/jjsullivan5196/wvkbd/archive/refs/tags/v${version}.tar.gz
+checksum=f9c689fce7e0b119b078d370385c868c5b579a4ec1e1b5610befa4b19c062e28
From 732355fe412e7b93ac5ef30e270f29c76a4f9b24 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Thu, 17 Mar 2022 17:12:58 +0100
Subject: [PATCH 455/608] lazygit: update to 0.34
---
srcpkgs/lazygit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 49001a5bbf1c..1f079bac8086 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
# Template file for 'lazygit'
pkgname=lazygit
-version=0.33
+version=0.34
revision=1
build_style=go
go_import_path=github.com/jesseduffield/lazygit
@@ -11,7 +11,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="MIT"
homepage="https://github.com/jesseduffield/lazygit"
distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=ff7ab429ecd54f6e2aedcfd4835eb8ca17c1990aac2534f8c2a19ce4267ade24
+checksum=f715ab86b219fd42462399459bfa1e04a5925268bff4839c4d96bd01264d6847
post_install() {
vlicense LICENSE
From 6f010a2f619f4954fb31c3093959866035aa9666 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 5 Jul 2022 06:25:04 +0200
Subject: [PATCH 456/608] lilypond: update to 2.23.10
---
srcpkgs/lilypond/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 150268070412..9a2acfcb0c88 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,7 +1,7 @@
# Template file for 'lilypond'
pkgname=lilypond
# should be kept in sync with 'lilypond-doc'
-version=2.23.9
+version=2.23.10
revision=1
build_wrksrc="build"
build_style="gnu-configure"
@@ -18,7 +18,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="https://lilypond.org/"
distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
-checksum=11204fab661a5324f55c607dc8f9363a47afc741563f8dc867cdd60c173b27db
+checksum=06ac963df1699598c62f4390b8fc95344a723a88af440c00f5201c4aa8958f68
python_version=3
make_check=ci-skip # ci fails, but all checks pass locally
From edb6a45463c7916dd41b908842f03bd898622062 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 5 Jul 2022 06:25:25 +0200
Subject: [PATCH 457/608] lilypond-doc: update to 2.23.10
---
srcpkgs/lilypond-doc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index 5d57ab78035f..ae03279b9230 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,7 +1,7 @@
# Template file for 'lilypond-doc'
pkgname=lilypond-doc
# should be kept in sync with 'lilypond'
-version=2.23.9
+version=2.23.10
revision=1
create_wrksrc=yes
short_desc="Documentation for the lilypond music engraving program"
@@ -9,7 +9,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="https://lilypond.org/"
distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz"
-checksum=519bdd88e0f347049db3b1d6ed71458c3b4781dc20bdd3c5be00c0fabb6160ba
+checksum=8927270ec2c2dff2e0984727543a467b49ff7cb3adfd98b81a15b51277bfba75
do_install() {
vmkdir usr
From cc60175a52cb6874a3fbbe1f733696b0f82c4dff Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 5 Jul 2022 10:54:16 +0200
Subject: [PATCH 458/608] google-chrome: update to 103.0.5060.114
---
srcpkgs/google-chrome/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ca37a425cffb..5ee9cf0017aa 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
# Template file for 'google-chrome'
pkgname=google-chrome
-version=103.0.5060.53
+version=103.0.5060.114
revision=1
_channel=stable
archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
_licenseUrl="https://www.google.com/intl/en/chrome/terms/"
distfiles="$_chromeUrl"
-checksum=d6bb13aad7c0a2b026b8b36d2e8a74f9bf66fe64610ce12fbbd23b4325699da7
+checksum=693a00987843bdba97d77a1d9f5a4b5ca9b77bdfd6f37cbffa315680adb5abe3
do_extract() {
mkdir -p ${DESTDIR}
From e771748b54ab3fb8e10c47af3b028209a9f92e57 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:20 +0200
Subject: [PATCH 459/608] python3-charset-normalizer: update to 2.1.0.
---
srcpkgs/python3-charset-normalizer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index 7c8809724b1b..da68e4107bac 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,6 +1,6 @@
# Template file for 'python3-charset-normalizer'
pkgname=python3-charset-normalizer
-version=2.0.12
+version=2.1.0
revision=1
wrksrc="charset_normalizer-$version"
build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://charset-normalizer.readthedocs.io/"
changelog="https://raw.githubusercontent.com/Ousret/charset_normalizer/master/CHANGELOG.md"
distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
-checksum=8dd3a1a5444741208d627993344516cb62909c8c3f5c55deaa5bee6a305ead7a
+checksum=0bfd977140480c2ee8905183d764a848f86e6d9aae8977692f1ecd609bb887bd
pre_check() {
vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg
From 2ad750d1557d45ff1203d82864bb77dbad4b6930 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:12 +0200
Subject: [PATCH 460/608] lagrange: update to 1.13.7.
---
srcpkgs/lagrange/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 67a38bc13d18..d2d16a3cb0ed 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
# Template file for 'lagrange'
pkgname=lagrange
-version=1.13.6
+version=1.13.7
revision=1
build_style=cmake
configure_args="-DTFDN_ENABLE_SSE41=NO"
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
homepage="https://gmi.skyjake.fi/lagrange/"
changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7a89e4e950d14cfebd2806de07c49eeeb79368091a68ca439795d0aba9e1aaa7
+checksum=7fe70d06cfa80fcf7122f1a537a2205d844dd6e9efcc4d6dd712861faa3f2e14
post_install() {
vlicense LICENSE.md
From 5f92c63c92a2e506deb9e91b4d972e9bec6fa142 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:14 +0200
Subject: [PATCH 461/608] pylint: update to 2.14.4.
---
srcpkgs/pylint/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e97c84202740..d4330581a009 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
# Template file for 'pylint'
pkgname=pylint
-version=2.14.2
+version=2.14.4
revision=1
build_style=python3-module
make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://www.pylint.org/"
changelog="https://raw.githubusercontent.com/PyCQA/pylint/main/doc/whatsnew/${version%.*.*}/${version%.*}/summary.rst"
distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=f7420e582f5852599f866e727071542801adbad59b5e93e61a0147e056e94bc7
+checksum=fdd513198ccdf96f8b9a70aca3eb80050edf87b433595c67784c0f9ddac80bb5
make_check=no # FIXME
post_install() {
From 1f2a033afb68c36fc353d01d51d18cff1a6e6025 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:30 +0200
Subject: [PATCH 462/608] xorg-server-xwayland: update to 22.1.2.
---
srcpkgs/xorg-server-xwayland/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index 9cb01b318ddb..5d5d8d5d1fbc 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
# Template file for 'xorg-server-xwayland'
pkgname=xorg-server-xwayland
-version=22.1.1
+version=22.1.2
revision=1
wrksrc="xserver-xwayland-$version"
build_style=meson
@@ -17,7 +17,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
homepage="https://xorg.freedesktop.org"
distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=42837e7b90e0d92aff4d7846f0609f8d3c0c6641bdd6add6e4e0c5c214371149
+checksum=410ad00442ca335c0e7ee587cecd4b8fde50ca9e08bd1a640c6d521dba42dc4a
make_check=no # needs xtest repository
post_install() {
From c975421d8c33418d4cf4f2379ec153c8a8cdf6ec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:29:32 -0700
Subject: [PATCH 463/608] gnome-recipes: update to 2.0.4
---
srcpkgs/gnome-recipes/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template
index 30f81ab265b6..5b87bb4ff935 100644
--- a/srcpkgs/gnome-recipes/template
+++ b/srcpkgs/gnome-recipes/template
@@ -1,8 +1,7 @@
# Template file for 'gnome-recipes'
pkgname=gnome-recipes
-version=2.0.2
-revision=3
-_libgd_hash=97a852cdf3d37776f9c98f730d7dcbbe995bdeb7
+version=2.0.4
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config git"
makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel
@@ -12,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Recipes"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1be9d2fcb7404a97aa029d2409880643f15071c37039247a6a4320e7478cd5fb
+checksum=b30e96985f66fe138a17189c77af44d34d0b4c859b304ebdb52033bc2cd3ffed
From 48945e7282c1593432c41c2ddf30e547e7b3d273 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 22 Jun 2022 15:12:12 -0700
Subject: [PATCH 464/608] musl: update realpath/readlink and add gettid
In some cases packages like bubblewrap call realpath() without /proc being
availiable, however musl's realpath used to require /proc. This was changed
in later versions of musl so we import those changes here.
This also adds gettid(). This function was added to later versions of musl and
removes the need to patch out calls to gettid() in various packages including,
for example, mutter.
---
srcpkgs/musl/patches/gettid.patch | 49 ++++
...tly_instead_of_using_procfs_readlink.patch | 219 ++++++++++++++++++
...in_readlink_syscall_with_zero_buffer.patch | 59 +++++
srcpkgs/musl/template | 2 +-
4 files changed, 328 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/patches/gettid.patch
create mode 100644 srcpkgs/musl/patches/implement_realpath_directly_instead_of_using_procfs_readlink.patch
create mode 100644 srcpkgs/musl/patches/work_around_linux_bug_in_readlink_syscall_with_zero_buffer.patch
diff --git a/srcpkgs/musl/patches/gettid.patch b/srcpkgs/musl/patches/gettid.patch
new file mode 100644
index 000000000000..bb8bf5905b88
--- /dev/null
+++ b/srcpkgs/musl/patches/gettid.patch
@@ -0,0 +1,49 @@
+From d49cf07541bb54a5ac7aec1feec8514db33db8ea Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 17 Aug 2020 20:12:53 -0400
+Subject: [PATCH] add gettid function
+
+this is a prerequisite for addition of other interfaces that use
+kernel tids, including futex and SIGEV_THREAD_ID.
+
+there is some ambiguity as to whether the semantic return type should
+be int or pid_t. either way, futex API imposes a contract that the
+values fit in int (excluding some upper reserved bits). glibc used
+pid_t, so in the interest of not having gratuitous mismatch (the
+underlying types are the same anyway), pid_t is used here as well.
+
+while conceptually this is a syscall, the copy stored in the thread
+structure is always valid in all contexts where it's valid to call
+libc functions, so it's used to avoid the syscall.
+---
+ include/unistd.h | 1 +
+ src/linux/gettid.c | 8 ++++++++
+ 2 files changed, 9 insertions(+)
+ create mode 100644 src/linux/gettid.c
+
+diff --git a/include/unistd.h b/include/unistd.h
+index 7bcbff943..07584a23e 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -190,6 +190,7 @@ int syncfs(int);
+ int euidaccess(const char *, int);
+ int eaccess(const char *, int);
+ ssize_t copy_file_range(int, off_t *, int, off_t *, size_t, unsigned);
++pid_t gettid(void);
+ #endif
+
+ #if defined(_LARGEFILE64_SOURCE) || defined(_GNU_SOURCE)
+diff --git a/src/linux/gettid.c b/src/linux/gettid.c
+new file mode 100644
+index 000000000..70767137e
+--- /dev/null
++++ b/src/linux/gettid.c
+@@ -0,0 +1,8 @@
++#define _GNU_SOURCE
++#include <unistd.h>
++#include "pthread_impl.h"
++
++pid_t gettid(void)
++{
++ return __pthread_self()->tid;
++}
diff --git a/srcpkgs/musl/patches/implement_realpath_directly_instead_of_using_procfs_readlink.patch b/srcpkgs/musl/patches/implement_realpath_directly_instead_of_using_procfs_readlink.patch
new file mode 100644
index 000000000000..569a1f52c7cd
--- /dev/null
+++ b/srcpkgs/musl/patches/implement_realpath_directly_instead_of_using_procfs_readlink.patch
@@ -0,0 +1,219 @@
+From 29ff7599a448232f2527841c2362643d246cee36 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 30 Nov 2020 12:14:47 -0500
+Subject: [PATCH] implement realpath directly instead of using procfs readlink
+
+inability to use realpath in chroot/container without procfs access
+and at early boot prior to mount of /proc has been an ongoing issue,
+and it turns out realpath was one of the last remaining interfaces
+that needed procfs for its core functionality. during investigation
+while reimplementing, it was determined that there were also serious
+problems with the procfs-based implementation. most seriously it was
+unsafe on pre-O_PATH kernels, and unlike other places where O_PATH was
+used, the unsafety was hard or impossible to fix because O_NOFOLLOW
+can't be used (since the whole purpose was to follow symlinks).
+
+the new implementation is a direct one, performing readlink on each
+path component to resolve it. an explicit stack, as opposed to
+recursion, is used to represent the remaining components to be
+processed. the stack starts out holding just the input string, and
+reading a link pushes the link contents onto the stack.
+
+unlike many other implementations, this one does not call getcwd
+initially for relative pathnames. instead it accumulates initial ..
+components to be applied to the working directory if the result is
+still a relative path. this avoids calling getcwd (which may fail) at
+all when symlink traversal will eventually yield an absolute path. it
+also doesn't use any form of stat operation; instead it arranges for
+readlink to tell it when a non-directory is used in a context where a
+directory is needed. this minimizes the number of syscalls needed,
+avoids accessing inodes when the directory table suffices, and reduces
+the amount of code pulled in for static linking.
+---
+ src/misc/realpath.c | 159 +++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 136 insertions(+), 23 deletions(-)
+
+diff --git a/src/misc/realpath.c b/src/misc/realpath.c
+index d2708e59d..db8b74dc8 100644
+--- a/src/misc/realpath.c
++++ b/src/misc/realpath.c
+@@ -1,43 +1,156 @@
+ #include <stdlib.h>
+ #include <limits.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "syscall.h"
++
++static size_t slash_len(const char *s)
++{
++ const char *s0 = s;
++ while (*s == '/') s++;
++ return s-s0;
++}
+
+ char *realpath(const char *restrict filename, char *restrict resolved)
+ {
+- int fd;
+- ssize_t r;
+- struct stat st1, st2;
+- char buf[15+3*sizeof(int)];
+- char tmp[PATH_MAX];
++ char stack[PATH_MAX+1];
++ char output[PATH_MAX];
++ size_t p, q, l, l0, cnt=0, nup=0;
++ int check_dir=0;
+
+ if (!filename) {
+ errno = EINVAL;
+ return 0;
+ }
++ l = strnlen(filename, sizeof stack);
++ if (!l) {
++ errno = ENOENT;
++ return 0;
++ }
++ if (l >= PATH_MAX) goto toolong;
++ p = sizeof stack - l - 1;
++ q = 0;
++ memcpy(stack+p, filename, l+1);
++
++ /* Main loop. Each iteration pops the next part from stack of
++ * remaining path components and consumes any slashes that follow.
++ * If not a link, it's moved to output; if a link, contents are
++ * pushed to the stack. */
++restart:
++ for (; ; p+=slash_len(stack+p)) {
++ /* If stack starts with /, the whole component is / or //
++ * and the output state must be reset. */
++ if (stack[p] == '/') {
++ check_dir=0;
++ nup=0;
++ q=0;
++ output[q++] = '/';
++ p++;
++ /* Initial // is special. */
++ if (stack[p] == '/' && stack[p+1] != '/')
++ output[q++] = '/';
++ continue;
++ }
++
++ char *z = __strchrnul(stack+p, '/');
++ l0 = l = z-(stack+p);
+
+- fd = sys_open(filename, O_PATH|O_NONBLOCK|O_CLOEXEC);
+- if (fd < 0) return 0;
+- __procfdname(buf, fd);
++ if (!l && !check_dir) break;
+
+- r = readlink(buf, tmp, sizeof tmp - 1);
+- if (r < 0) goto err;
+- tmp[r] = 0;
++ /* Skip any . component but preserve check_dir status. */
++ if (l==1 && stack[p]=='.') {
++ p += l;
++ continue;
++ }
+
+- fstat(fd, &st1);
+- r = stat(tmp, &st2);
+- if (r<0 || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) {
+- if (!r) errno = ELOOP;
+- goto err;
++ /* Copy next component onto output at least temporarily, to
++ * call readlink, but wait to advance output position until
++ * determining it's not a link. */
++ if (q && output[q-1] != '/') {
++ if (!p) goto toolong;
++ stack[--p] = '/';
++ l++;
++ }
++ if (q+l >= PATH_MAX) goto toolong;
++ memcpy(output+q, stack+p, l);
++ output[q+l] = 0;
++ p += l;
++
++ int up = 0;
++ if (l0==2 && stack[p-2]=='.' && stack[p-1]=='.') {
++ up = 1;
++ /* Any non-.. path components we could cancel start
++ * after nup repetitions of the 3-byte string "../";
++ * if there are none, accumulate .. components to
++ * later apply to cwd, if needed. */
++ if (q <= 3*nup) {
++ nup++;
++ q += l;
++ continue;
++ }
++ /* When previous components are already known to be
++ * directories, processing .. can skip readlink. */
++ if (!check_dir) goto skip_readlink;
++ }
++ ssize_t k = readlink(output, stack, p);
++ if (k==p) goto toolong;
++ if (!k) {
++ errno = ENOENT;
++ return 0;
++ }
++ if (k<0) {
++ if (errno != EINVAL) return 0;
++skip_readlink:
++ check_dir = 0;
++ if (up) {
++ while(q && output[q-1]!='/') q--;
++ if (q>1 && (q>2 || output[0]!='/')) q--;
++ continue;
++ }
++ if (l0) q += l;
++ check_dir = stack[p];
++ continue;
++ }
++ if (++cnt == SYMLOOP_MAX) {
++ errno = ELOOP;
++ return 0;
++ }
++
++ /* If link contents end in /, strip any slashes already on
++ * stack to avoid /->// or //->/// or spurious toolong. */
++ if (stack[k-1]=='/') while (stack[p]=='/') p++;
++ p -= k;
++ memmove(stack+p, stack, k);
++
++ /* Skip the stack advancement in case we have a new
++ * absolute base path. */
++ goto restart;
+ }
+
+- __syscall(SYS_close, fd);
+- return resolved ? strcpy(resolved, tmp) : strdup(tmp);
+-err:
+- __syscall(SYS_close, fd);
++ output[q] = 0;
++
++ if (output[0] != '/') {
++ if (!getcwd(stack, sizeof stack)) return 0;
++ l = strlen(stack);
++ /* Cancel any initial .. components. */
++ p = 0;
++ while (nup--) {
++ while(l>1 && stack[l-1]!='/') l--;
++ if (l>1) l--;
++ p += 2;
++ if (p<q) p++;
++ }
++ if (q-p && stack[l-1]!='/') stack[l++] = '/';
++ if (l + (q-p) + 1 >= PATH_MAX) goto toolong;
++ memmove(output + l, output + p, q - p + 1);
++ memcpy(output, stack, l);
++ q = l + q-p;
++ }
++
++ if (resolved) return memcpy(resolved, output, q+1);
++ else return strdup(output);
++
++toolong:
++ errno = ENAMETOOLONG;
+ return 0;
+ }
diff --git a/srcpkgs/musl/patches/work_around_linux_bug_in_readlink_syscall_with_zero_buffer.patch b/srcpkgs/musl/patches/work_around_linux_bug_in_readlink_syscall_with_zero_buffer.patch
new file mode 100644
index 000000000000..3286432ebea2
--- /dev/null
+++ b/srcpkgs/musl/patches/work_around_linux_bug_in_readlink_syscall_with_zero_buffer.patch
@@ -0,0 +1,59 @@
+From e2fa720be7024cce4fc489f3877476d35da48ee2 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 23 Nov 2020 19:44:19 -0500
+Subject: [PATCH] work around linux bug in readlink syscall with zero buffer
+ size
+
+linux fails with EINVAL when a zero buffer size is passed to the
+syscall. this is non-conforming because POSIX already defines EINVAL
+with a significantly different meaning: the target is not a symlink.
+
+since the request is semantically valid, patch it up by using a dummy
+buffer of length one, and truncating the return value to zero if it
+succeeds.
+---
+ src/unistd/readlink.c | 11 +++++++++--
+ src/unistd/readlinkat.c | 9 ++++++++-
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c
+index a152d5249..32f4537f9 100644
+--- a/src/unistd/readlink.c
++++ b/src/unistd/readlink.c
+@@ -4,9 +4,16 @@
+
+ ssize_t readlink(const char *restrict path, char *restrict buf, size_t bufsize)
+ {
++ char dummy[1];
++ if (!bufsize) {
++ buf = dummy;
++ bufsize = 1;
++ }
+ #ifdef SYS_readlink
+- return syscall(SYS_readlink, path, buf, bufsize);
++ int r = __syscall(SYS_readlink, path, buf, bufsize);
+ #else
+- return syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
++ int r = __syscall(SYS_readlinkat, AT_FDCWD, path, buf, bufsize);
+ #endif
++ if (buf == dummy && r > 0) r = 0;
++ return __syscall_ret(r);
+ }
+diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c
+index 9af45cd5a..f79d3d142 100644
+--- a/src/unistd/readlinkat.c
++++ b/src/unistd/readlinkat.c
+@@ -3,5 +3,12 @@
+
+ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t bufsize)
+ {
+- return syscall(SYS_readlinkat, fd, path, buf, bufsize);
++ char dummy[1];
++ if (!bufsize) {
++ buf = dummy;
++ bufsize = 1;
++ }
++ int r = __syscall(SYS_readlinkat, fd, path, buf, bufsize);
++ if (buf == dummy && r > 0) r = 0;
++ return __syscall_ret(r);
+ }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..5bdc5c48e623 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=9
+revision=10
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
From 0792a4c47139a96e0cefa43c533c6212a1f3181e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 20 Jun 2022 15:49:33 -0700
Subject: [PATCH 465/608] bubblewrap: update to 0.6.2
realpath patch is not necessary, the fix was backported to the musl
package in 4be91660ff6a61529677f08bc1abd1479c674c07
---
.../patches/realpath-workaround.patch | 249 ------------------
srcpkgs/bubblewrap/template | 14 +-
2 files changed, 4 insertions(+), 259 deletions(-)
delete mode 100644 srcpkgs/bubblewrap/patches/realpath-workaround.patch
diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch
deleted file mode 100644
index 45d1fd6231b6..000000000000
--- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null 2020-10-18 09:26:32.312745755 +0200
-+++ b/LICENSE.realpath 2020-10-18 11:09:14.119929076 +0200
-@@ -0,0 +1,29 @@
-+Copyright (c) 1989, 1991, 1993, 1995
-+ The Regents of the University of California. All rights reserved.
-+
-+This code is derived from software contributed to Berkeley by
-+Jan-Simon Pendry.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+ notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+ notice, this list of conditions and the following disclaimer in the
-+ documentation and/or other materials provided with the distribution.
-+3. Neither the name of the University nor the names of its contributors
-+ may be used to endorse or promote products derived from this software
-+ without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
---- a/bind-mount.c 2018-09-26 14:55:17.000000000 +0200
-+++ b/bind-mount.c 2020-10-18 11:08:37.822931452 +0200
-@@ -22,6 +22,198 @@
-
- #include "utils.h"
- #include "bind-mount.h"
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/param.h>
-+
-+#ifndef __GLIBC__
-+/*
-+ * Copyright (c) 1989, 1991, 1993, 1995
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Jan-Simon Pendry.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+char *realpath_int(const char *, char*);
-+char *
-+realpath_int(const char * path, char * resolved)
-+{
-+ struct stat sb;
-+ int idx = 0, nlnk = 0;
-+ const char *q;
-+ char *p, wbuf[2][MAXPATHLEN], *fres;
-+ size_t len;
-+ ssize_t n;
-+
-+ /* POSIX sez we must test for this */
-+ if (path == NULL) {
-+ errno = EINVAL;
-+ return NULL;
-+ }
-+
-+ if (resolved == NULL) {
-+ fres = resolved = malloc(MAXPATHLEN);
-+ if (resolved == NULL)
-+ return NULL;
-+ } else
-+ fres = NULL;
-+
-+
-+ /*
-+ * Build real path one by one with paying an attention to .,
-+ * .. and symbolic link.
-+ */
-+
-+ /*
-+ * `p' is where we'll put a new component with prepending
-+ * a delimiter.
-+ */
-+ p = resolved;
-+
-+ if (*path == '\0') {
-+ *p = '\0';
-+ errno = ENOENT;
-+ goto out;
-+ }
-+
-+ /* If relative path, start from current working directory. */
-+ if (*path != '/') {
-+ /* check for resolved pointer to appease coverity */
-+ if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
-+ p[0] = '.';
-+ p[1] = '\0';
-+ goto out;
-+ }
-+ len = strlen(resolved);
-+ if (len > 1)
-+ p += len;
-+ }
-+
-+loop:
-+ /* Skip any slash. */
-+ while (*path == '/')
-+ path++;
-+
-+ if (*path == '\0') {
-+ if (p == resolved)
-+ *p++ = '/';
-+ *p = '\0';
-+ return resolved;
-+ }
-+
-+ /* Find the end of this component. */
-+ q = path;
-+ do
-+ q++;
-+ while (*q != '/' && *q != '\0');
-+
-+ /* Test . or .. */
-+ if (path[0] == '.') {
-+ if (q - path == 1) {
-+ path = q;
-+ goto loop;
-+ }
-+ if (path[1] == '.' && q - path == 2) {
-+ /* Trim the last component. */
-+ if (p != resolved)
-+ while (*--p != '/')
-+ continue;
-+ path = q;
-+ goto loop;
-+ }
-+ }
-+
-+ /* Append this component. */
-+ if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
-+ errno = ENAMETOOLONG;
-+ if (p == resolved)
-+ *p++ = '/';
-+ *p = '\0';
-+ goto out;
-+ }
-+ p[0] = '/';
-+ memcpy(&p[1], path,
-+ /* LINTED We know q > path. */
-+ q - path);
-+ p[1 + q - path] = '\0';
-+
-+ /*
-+ * If this component is a symlink, toss it and prepend link
-+ * target to unresolved path.
-+ */
-+ if (lstat(resolved, &sb) == -1)
-+ goto out;
-+
-+ if (S_ISLNK(sb.st_mode)) {
-+ if (nlnk++ >= MAXSYMLINKS) {
-+ errno = ELOOP;
-+ goto out;
-+ }
-+ n = readlink(resolved, wbuf[idx], sizeof(wbuf[0]) - 1);
-+ if (n < 0)
-+ goto out;
-+ if (n == 0) {
-+ errno = ENOENT;
-+ goto out;
-+ }
-+
-+ /* Append unresolved path to link target and switch to it. */
-+ if (n + (len = strlen(q)) + 1 > sizeof(wbuf[0])) {
-+ errno = ENAMETOOLONG;
-+ goto out;
-+ }
-+ memcpy(&wbuf[idx][n], q, len + 1);
-+ path = wbuf[idx];
-+ idx ^= 1;
-+
-+ /* If absolute symlink, start from root. */
-+ if (*path == '/')
-+ p = resolved;
-+ goto loop;
-+ }
-+ if (*q == '/' && !S_ISDIR(sb.st_mode)) {
-+ errno = ENOTDIR;
-+ goto out;
-+ }
-+
-+ /* Advance both resolved and unresolved path. */
-+ p += 1 + q - path;
-+ path = q;
-+ goto loop;
-+out:
-+ free(fres);
-+ return NULL;
-+}
-+#endif
-
- static char *
- skip_token (char *line, bool eat_whitespace)
-@@ -395,9 +587,14 @@
-
- /* The mount operation will resolve any symlinks in the destination
- path, so to find it in the mount table we need to do that too. */
-+#ifdef __GLIBC__
- resolved_dest = realpath (dest, NULL);
-- if (resolved_dest == NULL)
-+#else
-+ resolved_dest = realpath_int (dest, NULL);
-+#endif
-+ if (resolved_dest == NULL) {
- return 2;
-+ }
-
- mount_tab = parse_mountinfo (proc_fd, resolved_dest);
- if (mount_tab[0].mountpoint == NULL)
diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template
index 4df1dac59395..85e07d0e4d8a 100644
--- a/srcpkgs/bubblewrap/template
+++ b/srcpkgs/bubblewrap/template
@@ -1,8 +1,8 @@
# Template file for 'bubblewrap'
pkgname=bubblewrap
-version=0.4.1
-revision=2
-build_style=gnu-configure
+version=0.6.2
+revision=1
+build_style=meson
hostmakedepends="libxslt docbook-xsl pkg-config"
makedepends="libcap-devel"
short_desc="Unprivileged sandboxing tool"
@@ -10,10 +10,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/containers/bubblewrap"
distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03
-
-post_install() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- vlicense LICENSE.realpath
- fi
-}
+checksum=8a0ec802d1b3e956c5bb0a40a81c9ce0b055a31bf30a8efa547433603b8af20b
From 3609fbd9802d97633cab9039deff9baac000fbb2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 22:15:18 -0700
Subject: [PATCH 466/608] gspell: update to 1.11.1.
---
srcpkgs/gspell/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index 00b40406ffc5..ac19b14b08da 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,7 +1,7 @@
# Template file for 'gspell'
pkgname=gspell
-version=1.9.1
-revision=2
+version=1.11.1
+revision=1
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static $(vopt_enable gir introspection)
@@ -14,19 +14,18 @@ short_desc="Flexible API to add spell checking to a GTK+ application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gspell"
+changelog="https://gitlab.gnome.org/GNOME/gspell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd
+checksum=ef6aa4e3f711775158a7e241a5f809cf2426bc0e02c23a7d2b5c71fc3de00292
+make_check_pre="xvfb-run"
# Package build options
build_options="gir vala"
build_options_default="gir vala"
-pre_check() {
- make_cmd='xvfb-run make check'
-}
-
gspell-devel_package() {
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ depends="libglib-devel enchant2-devel gtk+3-devel icu-devel
+ ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 08492c9589a78f7e4e8b221bfa8c03fa24451548 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 12:47:39 -0700
Subject: [PATCH 467/608] ghex: update to 42.3
---
common/shlibs | 2 +-
srcpkgs/ghex/template | 29 +++++++++++++++++++++--------
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7e4bcbef47f7..a5f385f719b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1566,7 +1566,7 @@ libmediaart-2.0.so.0 libmediaart-1.9.1_1
libinput.so.10 libinput-1.2.0_1
libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
-libgtkhex-3.so.0 libgtkhex-3.10.0_1
+libgtkhex-4.so.0 libgtkhex-42.1_1
libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
libdmraid.so.1 dmraid-1.0.0.rc16.3_5
libdovecot.so.0 dovecot-2.3.13_3
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index e11080c647fd..8e8387f9e090 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -1,17 +1,25 @@
# Template file for 'ghex'
pkgname=ghex
-version=3.18.4
+version=42.3
revision=1
build_style=meson
-hostmakedepends="pkg-config gtk-update-icon-cache intltool itstool glib-devel"
-makedepends="gtk+3-devel iso-codes glib-devel"
+build_helper=gir
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="pkg-config iso-codes gettext itstool glib-devel
+ desktop-file-utils $(vopt_if gtk_doc gi-docgen)"
+makedepends="gtk4-devel"
depends="hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Simple binary editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, GFDL-1.1-only"
-homepage="http://www.gnome.org"
+homepage="https://gitlab.gnome.org/GNOME/ghex"
+changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-42/NEWS"
distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-$version.tar.xz"
-checksum=c2d9c191ff5bce836618779865bee4059db81a3a0dff38bda3cc7a9e729637c0
+checksum=add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
libgtkhex_package() {
short_desc+=" - runtime library"
@@ -19,14 +27,19 @@ libgtkhex_package() {
vmove usr/lib/*.so.*
}
}
+
ghex-devel_package() {
- depends="gtk+3-devel libgtkhex>=${version}_${revision}"
+ depends="gtk4-devel libgtkhex>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.so
- #vmove usr/share/gtk-doc
- #vmove usr/share/ghex/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/doc
+ fi
}
}
From 5a5d9e6833959531073b6cdd8df0ba49d5a5c11f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 12:49:03 -0700
Subject: [PATCH 468/608] nemiver: remove ghex dependency
doesn't work with libgtkhex-4
---
srcpkgs/nemiver/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template
index 947ef8352a17..67ada9d02dc7 100644
--- a/srcpkgs/nemiver/template
+++ b/srcpkgs/nemiver/template
@@ -1,12 +1,12 @@
# Template file for 'nemiver'
pkgname=nemiver
version=0.9.6
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --enable-gsettings=yes
--disable-schemas-install --disable-schemas-compile"
hostmakedepends="pkg-config gdb intltool itstool glib-devel"
-makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel ghex-devel
+makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel
gtksourceviewmm-devel vte3-devel gsettings-desktop-schemas-devel
libgdlmm-devel"
depends="gdb gsettings-desktop-schemas"
@@ -14,7 +14,7 @@ short_desc="Graphical front-end for gdb"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://wiki.gnome.org/Apps/Nemiver"
-distfiles="https://download.gnome.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2
lib32disabled=yes
From 2a587f7266da3d0022a3faff6af44ed4cb4635aa Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 22 Apr 2022 01:36:09 -0700
Subject: [PATCH 469/608] New package: gnome-connections-42.1.2
---
srcpkgs/gnome-connections/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/gnome-connections/template
diff --git a/srcpkgs/gnome-connections/template b/srcpkgs/gnome-connections/template
new file mode 100644
index 000000000000..69ea64b19d1f
--- /dev/null
+++ b/srcpkgs/gnome-connections/template
@@ -0,0 +1,16 @@
+# Template file for 'gnome-connections'
+pkgname=gnome-connections
+version=42.1.2
+revision=1
+build_style=meson
+build_helper="gir"
+hostmakedepends="pkg-config gettext itstool vala desktop-file-utils glib-devel"
+makedepends="gtk+3-devel libhandy1-devel gtk-vnc-devel libgcrypt-devel
+ gnutls-devel libsasl-devel libsecret-devel freerdp-devel"
+short_desc="Remote desktop client for the GNOME desktop environment"
+maintainer="oreo6391 <oreo6391@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/connections/"
+changelog="https://gitlab.gnome.org/GNOME/connections/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/gnome-connections/${version%.*.*}/gnome-connections-${version}.tar.xz"
+checksum=d8e6e72741091d892dfc84281f625551d0568cd482d48db58a4edb8afa1377b6
From e44d6c8f97678e98bc70fe45857602eac3d71fb4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 14:06:01 +0200
Subject: [PATCH 470/608] ghex: fix cross
---
srcpkgs/ghex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index 8e8387f9e090..ac3080f2baf1 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -7,7 +7,7 @@ build_helper=gir
configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="pkg-config iso-codes gettext itstool glib-devel
- desktop-file-utils $(vopt_if gtk_doc gi-docgen)"
+ desktop-file-utils gtk-update-icon-cache $(vopt_if gtk_doc gi-docgen)"
makedepends="gtk4-devel"
depends="hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Simple binary editor for GNOME"
From cd7b17469e678a541cfdfb99e1a70f8210ddbce9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 14:15:15 +0200
Subject: [PATCH 471/608] ghex: fix docs cross
---
srcpkgs/ghex/template | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index ac3080f2baf1..6d9b98d886ab 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -21,6 +21,13 @@ checksum=add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
+pre_build() {
+ # help gi-docgen find gi files on cross
+ if [ -n "$CROSS_BUILD" ]; then
+ export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+ fi
+}
+
libgtkhex_package() {
short_desc+=" - runtime library"
pkg_install() {
From b254518800fb34f7bbc23d8869c7eb6d8d74d8ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 14:44:53 +0200
Subject: [PATCH 472/608] gtk4: update to 4.6.6.
---
srcpkgs/gtk4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 5e2837806d37..a0c39ac378ed 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
# Template file for 'gtk4'
pkgname=gtk4
-version=4.6.5
+version=4.6.6
revision=1
wrksrc="gtk-${version}"
build_style=meson
@@ -29,7 +29,7 @@ license="LGPL-2.1-or-later"
homepage="https://www.gtk.org/"
changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS"
distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=fa42c371f49c90916711e15591d87d4bee4438c27bf0692715581807628be9c2
+checksum=7bbfe4d13569f7c297ed49834ac7263e318b7bf102d3271cb466d5971f59ae70
# Package build options
build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
From 07c663d2d1739a512a208d2529e8c6e0bb6a2b2a Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Tue, 5 Jul 2022 20:01:03 +0530
Subject: [PATCH 473/608] ltris: update to 1.2.5
---
srcpkgs/ltris/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index 80d9f0a9f455..b9e449fc5051 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -1,6 +1,6 @@
# Template file for 'ltris'
pkgname=ltris
-version=1.2.4
+version=1.2.5
revision=1
build_style=gnu-configure
configure_args="--localstatedir=/var/games/ltris"
@@ -11,6 +11,6 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
license="GPL-2.0-or-later"
homepage="http://lgames.sourceforge.net/index.php?project=LTris"
distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
-checksum=d6eb7b301023278604d9292a92f2fd2f5103ee412a75a126d2550e2ec2368f83
+checksum=2ac6f94dd40c4c4cda25f8c756182adbb75216f67152735443a3a9014fb1c333
nocheckperms=yes # uses a world-writable .hscr file for global leaderboard
CFLAGS+=" -fgnu89-inline"
From 00c1f7c3eb62839dac2e6d4595b6cd871bb6fb9e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 5 Jul 2022 20:01:14 +0530
Subject: [PATCH 474/608] xarchiver: update to 0.5.4.18.
---
srcpkgs/xarchiver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index 052082720174..56c781bea0dd 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,6 +1,6 @@
# Template file for 'xarchiver'
pkgname=xarchiver
-version=0.5.4.17
+version=0.5.4.18
revision=1
build_style=gnu-configure
configure_args="--disable-doc --enable-gtk2=no"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/ib/xarchiver"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=fec755ffbd50e3575bd2497c755e9fe93265c5735f20de03328485f57d1123e2
+checksum=639889e052aad60c4a4ecacd607de3128ab765686570e93d954171ffdc22333e
From 4c172023c4308cfcbce9fc9e2fc4569f79a5c5c5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 5 Jul 2022 02:51:30 +0300
Subject: [PATCH 475/608] zimg: update to 3.0.4.
---
srcpkgs/zimg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zimg/template b/srcpkgs/zimg/template
index 3f2f7291d0aa..63f693b06954 100644
--- a/srcpkgs/zimg/template
+++ b/srcpkgs/zimg/template
@@ -1,6 +1,6 @@
# Template file for 'zimg'
pkgname=zimg
-version=3.0.3
+version=3.0.4
revision=1
wrksrc=zimg-release-${version}
build_style=gnu-configure
@@ -11,7 +11,7 @@ license="WTFPL"
homepage="https://github.com/sekrit-twc/zimg"
changelog="https://raw.githubusercontent.com/sekrit-twc/zimg/master/ChangeLog"
distfiles="https://github.com/sekrit-twc/zimg/archive/release-${version}.tar.gz"
-checksum=5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7
+checksum=219d1bc6b7fde1355d72c9b406ebd730a4aed9c21da779660f0a4c851243e32f
case "$XBPS_TARGET_MACHINE" in
armv7*) configure_args+=" --disable-simd";;
From aaaf3067974a7ddae4e6dfca698b02a7be29bd98 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Tue, 5 Jul 2022 19:52:33 +0530
Subject: [PATCH 476/608] cloc: update to 1.94
---
srcpkgs/cloc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index e5a24140afc5..91bf040e3b9f 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,6 +1,6 @@
# Template file for 'cloc'
pkgname=cloc
-version=1.92
+version=1.94
revision=1
hostmakedepends="perl"
depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/AlDanial/cloc"
distfiles="https://github.com/AlDanial/cloc/archive/v${version}.tar.gz"
-checksum=b5f18f4dbc05eff08ada215b6c2a8cbdab397e9b4b4e25c7427d4ed86fb6e248
+checksum=c835fe343e1c25194a61eb74d7a36e98413682ed0c3b4d6b8e35a327077bf926
do_build() {
make -C Unix man
From 63e5178acf31be17cbcd9140396406eb877e5288 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 4 Jul 2022 23:54:19 -0400
Subject: [PATCH 477/608] texlab: update to 4.2.0
---
srcpkgs/texlab/patches/no-rustfmt.patch | 13 -------------
srcpkgs/texlab/template | 4 ++--
2 files changed, 2 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/texlab/patches/no-rustfmt.patch
diff --git a/srcpkgs/texlab/patches/no-rustfmt.patch b/srcpkgs/texlab/patches/no-rustfmt.patch
deleted file mode 100644
index 7b82bc0f5e9d..000000000000
--- a/srcpkgs/texlab/patches/no-rustfmt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Ignore rustfmt check because we don't have it packaged
-diff --git a/tests/integration/dev.rs b/tests/integration/dev.rs
-index 7ba1e93d0c..92807b3124 100644
---- a/tests/integration/dev.rs
-+++ b/tests/integration/dev.rs
-@@ -2,6 +2,7 @@ use std::process::{Command, Stdio};
-
- use anyhow::Result;
-
-+#[ignore]
- #[test]
- fn rustfmt() -> Result<()> {
- let success = Command::new("cargo")
diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 732e846cefc4..b2c001be5331 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
# Template file for 'texlab'
pkgname=texlab
-version=4.1.0
+version=4.2.0
revision=1
build_style=cargo
short_desc="Implementation of the Language Server Protocol for LaTeX"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
homepage="https://texlab.netlify.app/"
changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz"
-checksum=f7b5300c6fc93d7c339c755c67ea84f9c5daced2fb2735545d01a67ccf2ff770
+checksum=fd7cc35c63e041b7947d31eb321669736edc900a71c31c53f5d5b7841273d494
if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
broken="smartstring fails to compile"
From b10470360bc3fb9a0a5390911ba4bed35fff3a9e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 4 Jul 2022 19:03:52 -0700
Subject: [PATCH 478/608] bemenu: update to 0.6.9
---
srcpkgs/bemenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 976318e83361..a0515da000a9 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,6 +1,6 @@
# Template file for 'bemenu'
pkgname=bemenu
-version=0.6.8
+version=0.6.9
revision=1
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -13,7 +13,7 @@ maintainer="Issam Maghni <me@concati.me>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/Cloudef/bemenu"
distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
-checksum=d68c0c35c63c1dc26e3f2e67be1008f1f66a1ecdf7d3c9ccb261523175f22156
+checksum=9cca8674ac719104333691a6298838d934bf26c5bf8624e89985c9ba6bec30a4
bemenu-devel_package() {
depends="bemenu-${version}_${revision}"
From 7f48835abd4ec5574560c84c35fc2a888adc88e6 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 5 Jul 2022 02:57:14 +0300
Subject: [PATCH 479/608] python3-xdg: update to 0.28.
---
srcpkgs/python3-xdg/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-xdg/template b/srcpkgs/python3-xdg/template
index a206480fd45d..fe13e8feae09 100644
--- a/srcpkgs/python3-xdg/template
+++ b/srcpkgs/python3-xdg/template
@@ -1,7 +1,7 @@
# Template file for 'python3-xdg'
pkgname=python3-xdg
-version=0.27
-revision=2
+version=0.28
+revision=1
wrksrc="pyxdg-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-only"
homepage="https://freedesktop.org/Software/pyxdg"
distfiles="${PYPI_SITE}/p/pyxdg/pyxdg-${version}.tar.gz"
-checksum=80bd93aae5ed82435f20462ea0208fb198d8eec262e831ee06ce9ddb6b91c5a5
+checksum=3267bb3074e934df202af2ee0868575484108581e6f3cb006af1da35395e88b4
+
+# Both provide Python module xdg.
+conflicts="python3-xdg-variables"
From c3c1527052dba83df7b2948cb63f7c7391e89936 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 5 Jul 2022 19:26:26 +0530
Subject: [PATCH 480/608] hg-git: update to 1.0.0.
---
srcpkgs/hg-git/patches/fix-encoding-test.patch | 15 +++++++++++++++
srcpkgs/hg-git/template | 17 +++++------------
2 files changed, 20 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/hg-git/patches/fix-encoding-test.patch
diff --git a/srcpkgs/hg-git/patches/fix-encoding-test.patch b/srcpkgs/hg-git/patches/fix-encoding-test.patch
new file mode 100644
index 000000000000..944d4f2d96b3
--- /dev/null
+++ b/srcpkgs/hg-git/patches/fix-encoding-test.patch
@@ -0,0 +1,15 @@
+--- a/tests/test-encoding.t
++++ b/tests/test-encoding.t
+@@ -33,10 +33,10 @@
+ $ . $TESTDIR/latin-1-encoding
+ Warning: commit message (did|does) not conform to UTF-8. (re)
+ You may want to amend it after fixing the message, or set the config
+- variable i18n.commitencoding to the encoding your project uses.
++ variable i18n.commitEncoding to the encoding your project uses.
+ Warning: commit message (did|does) not conform to UTF-8. (re)
+ You may want to amend it after fixing the message, or set the config
+- variable i18n.commitencoding to the encoding your project uses.
++ variable i18n.commitEncoding to the encoding your project uses.
+
+ $ cd ..
+ $ git init -q --bare repo.git
diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index 37ef7e6b91ee..89db4e79fffc 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,9 +1,9 @@
# Template file for 'hg-git'
pkgname=hg-git
-version=0.9.0
-revision=3
+version=1.0.0
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-setuptools_scm"
depends="python3-dulwich mercurial"
checkdepends="$depends git unzip openssh"
short_desc="Mercurial plugin adding the ability to push and pull to/from Git"
@@ -11,18 +11,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
# https://www.mercurial-scm.org/wiki/HgGit
homepage="https://foss.heptapod.net/mercurial/hg-git"
+changelog="https://foss.heptapod.net/mercurial/hg-git/-/raw/branch/default/NEWS.rst"
distfiles="$PYPI_SITE/h/hg-git/hg-git-$version.tar.gz"
-checksum=77acbd8c322847ec109046d931e0731a91fcf13e10cfe9c183812706ec867671
+checksum=3911833962eb9c899c6bea8fb49666c82f211b124d0840beb6ad95e23a4621b6
do_check() {
cd tests
- rm -f test-branch-bookmark-suffix.t
- # Git 2.28 appends merge into master, Git 2.29 reverts that change
- rm -f test-merge.t test-octopus.t test-pull.t
- # test hg serve, bind to localhost instead *
- rm -f test-http.t
- # Differ in warning, which is new in Git 2.28
- rm -f test-subrepos.t
-
python3 run-tests.py --with-hg=/usr/bin/hg
}
From 9e0b48eebf4d8cf8d8b8e19289bfbc133aefabf1 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Tue, 5 Jul 2022 03:26:41 +0530
Subject: [PATCH 481/608] xwallpaper: update to 0.7.4
---
srcpkgs/xwallpaper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xwallpaper/template b/srcpkgs/xwallpaper/template
index 05c6ecaf8f9a..2e6c7de64d15 100644
--- a/srcpkgs/xwallpaper/template
+++ b/srcpkgs/xwallpaper/template
@@ -1,6 +1,6 @@
# Template file for 'xwallpaper'
pkgname=xwallpaper
-version=0.6.6
+version=0.7.4
revision=1
build_style=gnu-configure
hostmakedepends="automake pkg-config"
@@ -11,7 +11,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="ISC"
homepage="https://github.com/stoeckmann/xwallpaper"
distfiles="https://github.com/stoeckmann/xwallpaper/archive/v${version}.tar.gz"
-checksum=8d56f573b5af8f04ec9260b0b2cc676a12489c0420820b868de187bdd11b6a16
+checksum=1f7b0b2162221065b63f2498bc9a8d7a53d59ac893ab32e527bb02f031015084
pre_configure() {
autoreconf -fiv
From e733b4abb03203b6d9715cfad85fa5e8326ec6bc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:16:40 -0700
Subject: [PATCH 482/608] gnome-boxes: update to 42.2.
---
srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 --------------------
srcpkgs/gnome-boxes/template | 14 ++++----
2 files changed, 7 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch
deleted file mode 100644
index 3d9c56f5841c..000000000000
--- a/srcpkgs/gnome-boxes/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sat, 15 Jan 2022 00:07:31 +0100
-Subject: [PATCH] build: remove positional i18n.merge_file arguments
-
-otherwise building with meson 0.61+ fails:
-
- ERROR: Function does not take positional arguments.
----
- data/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index d32638a8..2dc1798b 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
- desktop_conf = configuration_data ()
- desktop_conf.set ('icon', application_id)
- desktop = i18n.merge_file (
-- 'desktop',
- input: configure_file (
- input: files ('org.gnome.Boxes.desktop.in'),
- output: 'org.gnome.Boxes.desktop.in',
-@@ -65,7 +64,7 @@ configure_file (
-
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
- input: configure_file (
- input: files ('org.gnome.Boxes.appdata.xml.in'),
- output: 'org.gnome.Boxes.appdata.xml.in',
---
-2.34.1
-
diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index ca7bd0ca61a2..11c787708f5c 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-boxes'
pkgname=gnome-boxes
-version=41.3
+version=42.2
revision=1
build_helper="gir"
build_style=meson
@@ -9,12 +9,12 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
- tracker3-devel libgcrypt-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
-short_desc="GNOME 3 application to access remote or virtual systems"
+ tracker-devel libgcrypt-devel"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+short_desc="GNOME application to access remote or virtual systems"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Boxes"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9b840680d1e7386fddfd6a15ad4dd0f2cda58efe818cf547837b46ae8bf0e189
+changelog="https://gitlab.gnome.org/GNOME/gnome-boxes/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+checksum=f7c2bca14dcae2838db11fa2c80e23408e3548178af861a0d4d0dcc6a9780015
From 4da9846b8b1279b41fb3692cb0f451529bc3ab14 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Jul 2022 17:13:37 +0200
Subject: [PATCH 483/608] common: correctly unset build_option_* variables
We can use the bash feature ${!prefix@}/${!prefix*} which expands to
all variables with the prefix.
This avoids leaking build_options between sourced templates.
---
common/environment/setup/sourcepkg.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index 1191993c9abc..5b31f6c1f81d 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -21,6 +21,9 @@ unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF PKG_CONFIG
unset -v CMAKE_GENERATOR
+# unset all $build_option_ variables
+unset -v "${!build_option_@}"
+
# hooks/do-extract/00-distfiles
unset -v skip_extraction
From 9e95bbf0022e8ac4f11c92284d0588230989858d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:32:10 -0700
Subject: [PATCH 484/608] gnome-photos: update to 42.0
---
srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 -------------------
srcpkgs/gnome-photos/template | 11 ++++---
2 files changed, 6 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
deleted file mode 100644
index f406b1c494c0..000000000000
--- a/srcpkgs/gnome-photos/patches/meson-0.61.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Fri, 21 Jan 2022 12:36:02 +0000
-Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
-
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 6e7192e0..94271de2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -3,7 +3,6 @@ subdir('icons')
- appdata = photos_namespace + '.appdata.xml'
-
- i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
-@@ -23,7 +22,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
---
-GitLab
-
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index 5f03503be8c7..dbdbf6850a6f 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,22 +1,23 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
-version=40.0
-revision=3
+version=42.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- gfbgraph-devel tracker3-devel libexif-devel librsvg-devel grilo-devel
+ gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 tracker3-miners"
+depends="desktop-file-utils tracker tracker-miners"
short_desc="Access, organize, and share your photos on GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Photos"
+changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af
+checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551
build_options="gir"
build_options_default="gir"
From e804fcbe8912bc1652d6a22a61fc5bd72974f4ea Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:28:37 -0700
Subject: [PATCH 485/608] gnote: update to 42.0
---
srcpkgs/gnote/patches/meson-0.61.patch | 36 --------------------------
srcpkgs/gnote/template | 8 +++---
2 files changed, 5 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/gnote/patches/meson-0.61.patch
diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
deleted file mode 100644
index e5575c0fa3f7..000000000000
--- a/srcpkgs/gnote/patches/meson-0.61.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:53:17 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:4:0: ERROR: Function does not take positional arguments.
-data/meson.build:41:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index a6138165..8d16368a 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -2,7 +2,6 @@ install_man('gnote.1')
-
- desktop_file = 'org.gnome.Gnote.desktop'
- gnote_desktop_file = i18n.merge_file(
-- desktop_file,
- type: 'desktop',
- input: desktop_file + '.in',
- output: desktop_file,
-@@ -39,7 +38,6 @@ configure_file(
-
- gnote_appdata = 'org.gnome.Gnote.appdata.xml'
- appdata_file = i18n.merge_file(
-- gnote_appdata,
- input: gnote_appdata + '.in',
- output: gnote_appdata,
- po_dir: '../po',
---
-GitLab
-
diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index e25af9532c7e..75efcfdb48a5 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,16 +1,18 @@
# Template file for 'gnote'
pkgname=gnote
-version=41.2
+version=42.0
revision=1
build_style=meson
-hostmakedepends="pkg-config intltool itstool desktop-file-utils"
+hostmakedepends="pkg-config gettext itstool desktop-file-utils"
makedepends="libsecret-devel libxslt-devel libuuid-devel gtkmm-devel
libxml2-devel gtkspell3-devel"
depends="desktop-file-utils"
+checkdepends="glib-devel"
short_desc="GNOME note taking application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gnote"
+changelog="https://gitlab.gnome.org/GNOME/gnote/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=21b0ef43514e6b68a08ed8573130185be36dbb9fb463b426ebd9f18c5092423f
+checksum=319269f3ad6101bbd75d9d905916113dea22bc65c1fb579ac255cb9fae0a6499
lib32disabled=yes
From f71f2f0c03fdd4984e987f5f7148d24b58e28ef6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 20:13:41 -0700
Subject: [PATCH 486/608] zenity: update to 3.42.1
---
srcpkgs/zenity/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index b452a7a61a57..e5513bcbedf8 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.41.0
+version=3.42.1
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -10,8 +10,9 @@ short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
+changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b676c3510e22badfcc3204062d432ba537402f5e0ae26128c0d90c954037e1
+checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
build_options="webkit"
build_options_default="webkit"
From f967edd1d605c16853cd45ed39dfaa0ec4cb8b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 5 Jul 2022 18:33:05 +0200
Subject: [PATCH 487/608] python3-PyPDF2: update to 2.4.1.
---
srcpkgs/python3-PyPDF2/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-PyPDF2/template b/srcpkgs/python3-PyPDF2/template
index 8f09921ac3f2..be976304ea93 100644
--- a/srcpkgs/python3-PyPDF2/template
+++ b/srcpkgs/python3-PyPDF2/template
@@ -1,25 +1,26 @@
# Template file for 'python3-PyPDF2'
pkgname=python3-PyPDF2
-version=1.27.12
+version=2.4.1
revision=1
-_sample_files_gitrev=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+_sample_files_gitrev=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
create_wrksrc=yes
build_wrksrc="PyPDF2-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-Pillow"
-checkdepends="python3-pytest ${depends}"
+checkdepends="python3-pytest python3-pycryptodome ${depends}"
short_desc="PDF library for splitting, merging, cropping, and transforming pages"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="BSD-3-Clause"
homepage="https://pypdf2.readthedocs.io/en/latest/"
changelog="https://raw.githubusercontent.com/py-pdf/PyPDF2/main/CHANGELOG"
-distfiles="${PYPI_SITE}/P/PyPDF2/PyPDF2-${version}.tar.gz
+distfiles="https://github.com/py-pdf/PyPDF2/archive/refs/tags/${version}.tar.gz
https://github.com/py-pdf/sample-files/archive/${_sample_files_gitrev}.tar.gz"
-checksum="20929fad10a3b4890862f65f3a46f563cfdf53132faae5193b54e18658467a60
- dc2fb112e800400c7891bcff9d48dc8cae5e8ecf6c5058a2ecea2de09d241e78"
+checksum="ec3b2792744c2bac3a51e1e3646b491e3b9374575e0e9361fcb4ec6756fb2061
+ 04257ac9185da140a3463e1efd049ffe1ad2a9a8224375c13f2b5aec02f4f672"
post_extract() {
+ rmdir ${build_wrksrc}/sample-files
mv sample-files-${_sample_files_gitrev} ${build_wrksrc}/sample-files
}
From 9daeb7aa9f842a782bde67a239d42aa0c5f2b847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 5 Jul 2022 18:33:06 +0200
Subject: [PATCH 488/608] diffoscope: update to 217.
---
srcpkgs/diffoscope/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index e4eb386165e0..e2dca38a1355 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
# Template file for 'diffoscope'
pkgname=diffoscope
-version=211
+version=217
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://diffoscope.org/"
changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=8e75f3acb181096632e43935ba7a85304703ac54739810b4523919188367ec03
+checksum=1e9791e3f718ca809d98fb319b150ce6222a682b4009ea00838b9d8705003950
From 9a12a7e3a54f3d58e05b6f22a4f5f5d2e46a3886 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 18 Apr 2022 10:50:26 -0700
Subject: [PATCH 489/608] gvfs: update to 1.50.2
---
srcpkgs/gvfs/patches/meson-0.61.patch | 10 ----------
srcpkgs/gvfs/template | 12 ++++++------
2 files changed, 6 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch
diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
deleted file mode 100644
index 38f04b2e894c..000000000000
--- a/srcpkgs/gvfs/patches/meson-0.61.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -366,7 +366,6 @@ if enable_admin
- )
-
- i18n.merge_file(
-- policy,
- input: policy_in,
- output: '@BASENAME@',
- po_dir: po_dir,
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 6adb51e279bd..fc90e400d928 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,26 +1,26 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.48.1
-revision=2
+version=1.50.2
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
-Dman=true"
-hostmakedepends="docbook-xsl glib-devel intltool libxslt openssh pkg-config
+hostmakedepends="docbook-xsl glib-devel gettext libxslt openssh pkg-config
polkit-devel"
makedepends="avahi-glib-libs-devel dbus-glib-devel fuse3-devel gcr-devel
libarchive-devel libbluetooth-devel libbluray-devel libcap-devel
libcdio-paranoia-devel libgcrypt-devel libgdata-devel libglib-devel
libgphoto2-devel libgudev-devel libimobiledevice-devel libmtp-devel
- libnfs-devel libsecret-devel libsoup-gnome-devel libxml2-devel polkit-devel
+ libnfs-devel libsecret-devel libsoup3-devel libxml2-devel polkit-devel
samba-devel udisks2-devel gsettings-desktop-schemas-devel
gnome-online-accounts-devel"
short_desc="Userspace virtual filesystem"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
-changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2
+checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From a6d2381e20602f75e98ca627a0924d33a974d232 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 00:55:27 -0700
Subject: [PATCH 490/608] gedit-plugins: update to 42.1
---
srcpkgs/gedit-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 6ee3057a462b..939d068e074e 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
# Template file for 'gedit-plugins'
pkgname=gedit-plugins
-version=41.0
+version=42.1
revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
@@ -15,5 +15,5 @@ license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gedit-plugins"
changelog="https://gitlab.gnome.org/GNOME/gedit-plugins/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a38f949460914f054063671bf0bb8e8a5184e6210be89f64bb304652d4520e87
+checksum=c6b741de7d2610b0e474ef1b72a2a587e236998573403d527fe18e9e3de2623d
python_version=3
From de81977974689ba050ca2631f192cfeac3a8e2e1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 00:55:08 -0700
Subject: [PATCH 491/608] gedit: update to 42.1
---
srcpkgs/gedit/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index c6f401487ca0..822d3e282cd8 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
# Template file for 'gedit'
pkgname=gedit
-version=41.0
+version=42.1
revision=1
build_helper="gir"
build_style=meson
@@ -13,8 +13,9 @@ short_desc="Text editor for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
+changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5
+checksum=7f1fd43df5110d4c37de6541993f41f0fbc3efc790900e92053479ba069920e9
shlib_provides="libgedit-41.so"
python_version=3
From 8fa4ac91329e83fa9b0be7320334c0af4a18b674 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:55:44 -0700
Subject: [PATCH 492/608] gnome-autoar: update to 0.4.3
---
srcpkgs/gnome-autoar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index a35c22359b6f..5edd6e9381a7 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-autoar'
pkgname=gnome-autoar
-version=0.4.2
+version=0.4.3
revision=1
build_style=meson
build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3
+checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88
build_options="gir"
build_options_default="gir"
From 58c9776d7f234c85a3e60c8e521baed019174901 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:54:12 +0200
Subject: [PATCH 493/608] mm-common: update to 1.0.4.
---
srcpkgs/mm-common/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mm-common/template b/srcpkgs/mm-common/template
index 37911a499859..1b28eba6870f 100644
--- a/srcpkgs/mm-common/template
+++ b/srcpkgs/mm-common/template
@@ -1,13 +1,13 @@
# Template file for 'mm-common'
pkgname=mm-common
-version=1.0.3
+version=1.0.4
revision=1
build_style=meson
-hostmakedepends="pkg-config intltool itstool"
+hostmakedepends="pkg-config"
depends="gtk-doc gettext-devel glib-devel yelp-tools"
short_desc="Common development macros for GTK+ C++"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gtkmm.org/en/"
distfiles="http://download.gnome.org/sources/mm-common/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e81596625899aacf1d0bf27ccc2fcc7f373405ec48735ca1c7273c0fbcdc1ef5
+checksum=e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8
From ed3cf98c5d6d15d71546a81e3084ad7dad2986bd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:47:07 -0700
Subject: [PATCH 494/608] file-roller: update to 3.42.0
---
srcpkgs/file-roller/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 737a81972b2a..1baaf1e1922f 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,17 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.40.0
+version=3.42.0
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel"
+ libnotify-devel nautilus-devel libhandy1-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
+changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d
-
-CFLAGS="-fcommon"
+checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
From d6b034a47397c0b2bb9e4dfdc24c0e202cba481e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:27:53 -0700
Subject: [PATCH 495/608] gnome-sound-recorder: update to 42.0
---
.../patches/meson-0.61.patch | 41 -------------------
srcpkgs/gnome-sound-recorder/template | 11 ++---
2 files changed, 6 insertions(+), 46 deletions(-)
delete mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
deleted file mode 100644
index 40392e6a9fe8..000000000000
--- a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:37:06 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
-data/meson.build:16:0: ERROR: Function does not take positional arguments.
----
- data/appdata/meson.build | 1 -
- data/meson.build | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index 1f5744e..d2c2c3a 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
- metainfo_conf.set('gettext-package', gettext_package)
-
- metainfo_file = i18n.merge_file(
-- 'metainfo-file',
- input: configure_file(
- input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
- output: '@BASENAME@',
-diff --git a/data/meson.build b/data/meson.build
-index 44117ad..0ff8fa5 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -14,7 +14,6 @@ install_data(
- desktop_conf = configuration_data()
- desktop_conf.set('app-id', application_id)
- desktop_file = i18n.merge_file(
-- 'desktop',
- input: configure_file(
- input: 'org.gnome.SoundRecorder.desktop.in.in',
- output: '@BASENAME@',
---
-GitLab
-
diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2887819e5a8b..7b01a37919b3 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,18 +1,19 @@
# Template file for 'gnome-sound-recorder'
pkgname=gnome-sound-recorder
-version=40.0
-revision=2
+version=42.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel gst-plugins-bad1-devel
- libhandy1-devel"
+makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel
+ gst-plugins-bad1-devel"
depends="desktop-file-utils gjs gsettings-desktop-schemas gst-plugins-bad1
gst-plugins-good1 libhandy1"
short_desc="GNOME sound recorder application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/SoundRecorder"
+changelog="https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
+checksum=4c08c315282f3ebf7a2da6f20e0ff9f0c71daa5229fcd2fe0b5c0aaaaa06f0ad
lib32disabled=yes
From dad5af8ed659bbfdefebcc40ba38dfaafdc16f81 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:00:31 -0700
Subject: [PATCH 496/608] gnome-music: update to 42.1
---
srcpkgs/gnome-music/patches/meson-0.61.patch | 30 --------------------
srcpkgs/gnome-music/template | 16 ++++++-----
2 files changed, 9 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch
deleted file mode 100644
index aca43b5608a2..000000000000
--- a/srcpkgs/gnome-music/patches/meson-0.61.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001
-From: Jean Felder <jfelder@src.gnome.org>
-Date: Thu, 18 Nov 2021 12:09:26 +0100
-Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument
-
-The positional argument was being silently ignored until meson 0.60.0
-where it returns a deprecation message:
-"DEPRECATION: i18n.merge_file does not take any positional
-arguments. This will become a hard error in the next Meson release."
-
-See: https://github.com/mesonbuild/meson/issues/9441
----
- data/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 25ff1e102..145ee5221 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID)
- appdata_conf.set('package_url', PACKAGE_URL)
- appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
- i18n.merge_file(
-- 'appdata',
- input: configure_file(
- output: PROJECT_RDNN_NAME + '.appdata.xml.in',
- input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
---
-GitLab
-
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index fa38578939d3..c19480dff00a 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,20 +1,22 @@
# Template file for 'gnome-music'
pkgname=gnome-music
-version=41.0
+version=42.1
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config
+ gtk-update-icon-cache desktop-file-utils"
makedepends="gnome-desktop-devel grilo-devel libmediaart-devel
- python3-gobject-devel python3-dbus tracker3-devel gnome-online-accounts-devel
- libdazzle-devel grilo-plugins python3-cairo-devel libhandy1-devel"
+ python3-gobject-devel python3-dbus tracker-devel gnome-online-accounts-devel
+ libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils python3-dbus python3-gobject python3-requests
- tracker3 tracker3-miners gst-plugins-good1 grilo-plugins libdazzle
- libmediaart"
+ tracker tracker-miners gst-plugins-good1 grilo-plugins libdazzle
+ libmediaart libadwaita"
short_desc="GNOME music playing application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Music"
+changelog="https://gitlab.gnome.org/GNOME/gnome-music/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=69b13567a87dc77dcf0c926d71d0fa2ebfa5a97f37817828df71d8a1b0129fd2
+checksum=c7747fa6a86b56b18ad6ff950ff901e59ee7fac11c68b2a6727af86eaeed8270
lib32disabled=yes
From c9a65c7688639fb620a1cc6f9f84b52b6ca47d92 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Tue, 5 Jul 2022 13:34:17 -0300
Subject: [PATCH 497/608] i3lock: update to 2.14.1.
---
srcpkgs/i3lock/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/i3lock/template b/srcpkgs/i3lock/template
index b0245825af09..572403425f16 100644
--- a/srcpkgs/i3lock/template
+++ b/srcpkgs/i3lock/template
@@ -1,8 +1,8 @@
# Template file for 'i3lock'
pkgname=i3lock
-version=2.13
+version=2.14.1
revision=1
-build_style=gnu-configure
+build_style=meson
hostmakedepends="pkg-config"
makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel
xcb-util-devel xcb-util-image-devel xcb-util-xrm-devel"
@@ -11,8 +11,8 @@ short_desc="Improved screenlocker based upon XCB and PAM"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://i3wm.org/i3lock/"
-distfiles="https://i3wm.org/i3lock/i3lock-${version}.tar.bz2"
-checksum=637fe898acb324337d3ebc4fcdb2e390b082147fdc8a0cda6c19e7f395965f0b
+distfiles="https://i3wm.org/i3lock/i3lock-${version}.tar.xz"
+checksum=062ef27eba0bc5a0c7ae91f7b7cbbf03b316d6a49fe80a58fc9f20c18a4e6843
CFLAGS="-fcommon"
From b9fd12be76d1730f1a5d25ae00527a20e1a42b9c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:08:28 -0700
Subject: [PATCH 498/608] gnome-characters: update to 42.0
---
.../gnome-characters/patches/meson-0.61.patch | 18 ------------------
srcpkgs/gnome-characters/template | 8 ++++----
2 files changed, 4 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch
deleted file mode 100644
index 248f8d5dced7..000000000000
--- a/srcpkgs/gnome-characters/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id)
- desktop_conf.set('bindir', characters_bindir)
-
- i18n.merge_file(
-- 'desktop-file',
- type: 'desktop',
- input: configure_file (
- input: characters_name + '.desktop.in',
-@@ -61,7 +60,6 @@ i18n.merge_file(
- )
-
- appdata_file = i18n.merge_file(
-- 'appdata-file',
- input: characters_name + '.appdata.xml.in',
- output: characters_application_id + '.appdata.xml',
- po_dir: po_dir,
diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index 24607f718b15..3814889e1d76 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-characters'
pkgname=gnome-characters
-version=41.0
+version=42.0
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
-depends="gnome-desktop gjs libhandy1"
+makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel libunistring-devel"
+depends="gnome-desktop gjs"
short_desc="Utility to find and insert unusual characters for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e129eca93d0099490bc2bfe6437e685fd9855e264b32fb918c0e58ee6aac867b
+checksum=5da0ffb816f8a6b44f303744ca827a34080118c1c938d8d79af17b7fe67980f8
lib32disabled=yes
From d60130fab3d291197efd532734aa2994851c0394 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:54:55 -0700
Subject: [PATCH 499/608] gnome-text-editor: update to 42.2
---
srcpkgs/gnome-text-editor/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
index 631dc7b77dad..df716615b6d1 100644
--- a/srcpkgs/gnome-text-editor/template
+++ b/srcpkgs/gnome-text-editor/template
@@ -1,16 +1,17 @@
# Template file for 'gnome-text-editor'
pkgname=gnome-text-editor
-version=41.1
-revision=2
+version=42.2
+revision=1
build_style=meson
-hostmakedepends="pkg-config gettext itstool glib-devel"
+hostmakedepends="pkg-config gettext itstool glib-devel
+ gtk-update-icon-cache desktop-file-utils"
makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel
icu-devel libadwaita-devel pcre2-devel"
short_desc="Simple text editor"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor"
-changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz"
-checksum=619ec520d6e0905d431167024e43dce0dbf6a345f2d48693501d70dc7626f861
+checksum=e56d4a8cdcbce8a8f1c0881b45de799f8b25205ec0cbf2269e532025761cc5da
make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.
From 841eab5b6af144e19e57130d9f4791868cee40a7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:52:06 -0700
Subject: [PATCH 500/608] gnome-system-monitor: update to 42.0
---
srcpkgs/gnome-system-monitor/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 85e4c9b5e66e..f35a4ea217f4 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,16 @@
# Template file for 'gnome-system-monitor'
pkgname=gnome-system-monitor
-version=41.0
+version=42.0
revision=1
build_style=meson
configure_args="-Dsystemd=false"
-hostmakedepends="pkg-config intltool itstool glib-devel polkit"
+hostmakedepends="pkg-config gettext itstool glib-devel polkit
+ gtk-update-icon-cache"
makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
short_desc="Process viewer and system resource monitor for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/SystemMonitor"
+changelog="https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa81ed45c12139e5f
+checksum=13239d22032201a22bd29833c575b684816700d2de168a1530223577c5c075dc
From 256526bf31cee515cc49dfdf3ca9f23bbfbc671e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:47:06 -0700
Subject: [PATCH 501/608] gnome-disk-utility: update to 42.0
---
.../patches/meson-0.61.patch | 34 -------------------
srcpkgs/gnome-disk-utility/template | 4 +--
2 files changed, 2 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
deleted file mode 100644
index 09e0c33d0798..000000000000
--- a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Fri, 17 Dec 2021 12:29:30 +0000
-Subject: [PATCH] build: fix arguments of i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments for a time
-and explicitly rejects with error since meson 0.60.0
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index e38a1d8e..38fb5207 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -11,7 +11,6 @@ desktops = [
-
- foreach desktop: desktops
- i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop + '.in',
- output: desktop,
-@@ -38,7 +37,6 @@ install_data(
- info = 'org.gnome.DiskUtility.appdata.xml'
-
- i18n.merge_file(
-- info,
- input: info + '.in',
- output: info,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 6b3d1aa4aba7..6164ffb20058 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=41.0
+version=42.0
revision=1
build_style=meson
configure_args="-Dlogind=none"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Disks"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df
+checksum=1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b
lib32disabled=yes
From 147fc6023e7e7483b6bfa5c8e55e084629db7afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 4 Jul 2022 10:45:26 +0200
Subject: [PATCH 502/608] quakespasm: update to 0.94.6.
---
srcpkgs/quakespasm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/quakespasm/template b/srcpkgs/quakespasm/template
index 3808fa178260..1ec9992aa951 100644
--- a/srcpkgs/quakespasm/template
+++ b/srcpkgs/quakespasm/template
@@ -1,6 +1,6 @@
# Template file for 'quakespasm'
pkgname=quakespasm
-version=0.94.5
+version=0.94.6
revision=1
build_wrksrc="Quake"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://quakespasm.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/quakespasm/Source/quakespasm-${version}.tar.gz"
-checksum=a5369c0f100c919846991ebc4d2c801eaff2c6a6f3645ca913f7479bbbcda0e8
+checksum=7e8184acbefc003c712e40af17dfdf91233bfd89adea5cbded513fc0495f543c
case "$XBPS_TARGET_MACHINE" in
arm*) makedepends+=" MesaLib-devel"
From 89a3b855fc156d17b504fd47ddd9ee21faf3e442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 5 Jul 2022 22:24:19 +0200
Subject: [PATCH 503/608] bfs: update to 2.6.1.
---
srcpkgs/bfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index de85ef0a52fe..b1d011a206e0 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
# Template file for 'bfs'
pkgname=bfs
-version=2.6
+version=2.6.1
revision=1
build_style=gnu-makefile
makedepends="acl-devel libcap-devel oniguruma-devel"
@@ -11,7 +11,7 @@ license="0BSD"
homepage="https://github.com/tavianator/bfs"
changelog="https://raw.githubusercontent.com/tavianator/bfs/main/docs/CHANGELOG.md"
distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=5812a4c62004c851eb02e23c0b6698dbb40061ce1c4069bb33c5b14f5361d81b
+checksum=15e35b46774af305cbdfbfaa9889591440579a8233bc7308e050ec27b791647d
post_install() {
vlicense LICENSE
From a2426aacc17d1cf1285162f067f76056671ca522 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:28:08 -0700
Subject: [PATCH 504/608] poppler: update to 22.07.0
---
common/shlibs | 2 +-
.../patches/cmake-build-type-none.patch | 13 ++++++++++++
srcpkgs/poppler/patches/fix-cflags.patch | 21 -------------------
srcpkgs/poppler/template | 13 ++++++++----
4 files changed, 23 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/poppler/patches/cmake-build-type-none.patch
delete mode 100644 srcpkgs/poppler/patches/fix-cflags.patch
diff --git a/common/shlibs b/common/shlibs
index a5f385f719b9..8064f62c7a02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -350,7 +350,7 @@ libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.111 libpoppler-21.07.0_1
+libpoppler.so.122 libpoppler-22.06.0_1
libpoppler-glib.so.8 poppler-glib-0.18.2_1
libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
diff --git a/srcpkgs/poppler/patches/cmake-build-type-none.patch b/srcpkgs/poppler/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..3f107d36bc6d
--- /dev/null
+++ b/srcpkgs/poppler/patches/cmake-build-type-none.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 2aed0284..ea8d7e57 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -80,7 +80,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE_UPPER)
+-set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE)
++set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE;NONE)
+ # We override CMAKE_CXX_FLAGS_${_CMAKE_BUILD_TYPE_UPPER} below. If the user
+ # selects a CMAKE_BUILD_TYPE that is not handled by the logic below, we will
+ # end up dropping the previous flags (e.g. those set in a cross-compilation
diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch
deleted file mode 100644
index f1a408d03cce..000000000000
--- a/srcpkgs/poppler/patches/fix-cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index fe1182d..6013bd2 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
-+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 0aa4edf20b57..74af1e5d2b63 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,13 +3,15 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5".
#
pkgname=poppler
-version=21.07.0
+version=22.07.0
revision=1
+_testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
build_style=cmake
build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
-DENABLE_GLIB=ON -DENABLE_GOBJECT_INTROSPECTION=$(vopt_if gir ON OFF)
- -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)"
+ -DENABLE_QT5=OFF -DENABLE_UTILS=ON -DENABLE_BOOST=$(vopt_if boost ON OFF)
+ -DTESTDATADIR='${XBPS_BUILDDIR}/test-${_testVersion}'"
hostmakedepends="pkg-config glib-devel"
makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
libcurl-devel libopenjpeg2-devel $(vopt_if boost boost-devel)"
@@ -17,8 +19,11 @@ short_desc="PDF rendering library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://poppler.freedesktop.org"
-distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
+changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
+distfiles="${homepage}/${pkgname}-${version}.tar.xz
+ https://gitlab.freedesktop.org/poppler/test/-/archive/${_testVersion}/test-${_testVersion}.tar.gz"
+checksum="420230c5c43782e2151259b3e523e632f4861342aad70e7e20b8773d9eaf3428
+ ca35f168a18038a2d817ea30d6c7b4ab8294a40a5f5950f3c2a15183ba08c900"
build_options="gir boost"
build_options_default="gir boost"
From 6bd678618798f8af0e953263a1c3a5f0cc8a289d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:29:02 -0700
Subject: [PATCH 505/608] poppler-qt5: update to 22.07.0
---
srcpkgs/poppler-qt5/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template
index 2a15f56128c1..23dcc6485ac1 100644
--- a/srcpkgs/poppler-qt5/template
+++ b/srcpkgs/poppler-qt5/template
@@ -4,7 +4,7 @@
# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5.
#
pkgname=poppler-qt5
-version=21.07.0
+version=22.07.0
revision=1
wrksrc="poppler-${version}"
build_style=cmake
@@ -17,8 +17,9 @@ short_desc="PDF rendering library - Qt5 bindings"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://poppler.freedesktop.org"
+changelog="https://gitlab.freedesktop.org/poppler/poppler/-/raw/master/NEWS"
distfiles="${homepage}/poppler-${version}.tar.xz"
-checksum=e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
+checksum=420230c5c43782e2151259b3e523e632f4861342aad70e7e20b8773d9eaf3428
# fails to find a bunch of files
make_check=no
From 72a52fd55e0bb36fdb0bacf7eba2a1db0136171f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:29:32 -0700
Subject: [PATCH 506/608] poppler-data: update to 0.4.11
---
srcpkgs/poppler-data/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/poppler-data/template b/srcpkgs/poppler-data/template
index 48dba2497fb6..4b6e956b7b72 100644
--- a/srcpkgs/poppler-data/template
+++ b/srcpkgs/poppler-data/template
@@ -1,13 +1,13 @@
# Template file for 'poppler-data'
pkgname=poppler-data
-version=0.4.10
+version=0.4.11
revision=1
short_desc="Encoding data for the poppler PDF rendering library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, GPL-2.0-or-later, BSD-3-Clause"
homepage="https://poppler.freedesktop.org/"
distfiles="https://poppler.freedesktop.org/${pkgname}-${version}.tar.gz"
-checksum=6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30
+checksum=2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
do_install() {
make prefix=/usr DESTDIR=${DESTDIR} install
From 12c7219a8ae58e3f551c8438bfac6b17c4136aa8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:33:32 -0700
Subject: [PATCH 507/608] calligra: rebuild against libpoppler 22.06.0
---
.../patches/0001-Fix-some-more-warnings.patch | 440 ++++++++++++++++++
.../0002-Make-show-hidden-row-s-work.patch | 29 ++
srcpkgs/calligra/patches/c++17.patch | 16 +
.../patches/poppler-22.03.0-fix.patch | 70 +++
.../patches/poppler-22.04.0-fix.patch | 91 ++++
srcpkgs/calligra/template | 2 +-
6 files changed, 647 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch
create mode 100644 srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch
create mode 100644 srcpkgs/calligra/patches/c++17.patch
create mode 100644 srcpkgs/calligra/patches/poppler-22.03.0-fix.patch
create mode 100644 srcpkgs/calligra/patches/poppler-22.04.0-fix.patch
diff --git a/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch b/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch
new file mode 100644
index 000000000000..6cc132925b16
--- /dev/null
+++ b/srcpkgs/calligra/patches/0001-Fix-some-more-warnings.patch
@@ -0,0 +1,440 @@
+From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001
+From: Pierre Ducroquet <pinaraf@pinaraf.info>
+Date: Sun, 28 Feb 2021 23:23:02 +0100
+Subject: [PATCH] Fix some more warnings
+
+---
+ filters/libmsooxml/MsooXmlDiagramReader_p.cpp | 1 +
+ filters/sheets/csv/csvimport.cc | 2 +-
+ filters/sheets/excel/sidewinder/excel.cpp | 1 +
+ filters/sheets/excel/sidewinder/formulas.cpp | 2 +-
+ filters/sheets/gnumeric/gnumericexport.cc | 5 ++---
+ filters/sheets/html/htmlexport.cc | 2 --
+ filters/sheets/latex/export/latexexport.cc | 1 -
+ filters/sheets/latex/export/table.cc | 1 +
+ filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp | 1 -
+ filters/stage/pptx/PptxXmlDocumentReader.cpp | 2 +-
+ filters/words/msword-odf/texthandler.cpp | 2 ++
+ filters/words/msword-odf/wv2/src/parser9x.cpp | 4 +++-
+ filters/words/msword-odf/wv2/src/styles.cpp | 4 +---
+ filters/words/msword-odf/wv2/src/styles.h | 11 ++++++++---
+ gemini/lib/GeminiMainWindow.cpp | 2 ++
+ libs/pageapp/KoPAOdfPageSaveHelper.cpp | 2 +-
+ plugins/spacenavigator/SpaceNavigatorDevice.h | 6 ++----
+ plugins/spacenavigator/SpaceNavigatorEvent.h | 2 +-
+ plugins/spacenavigator/SpaceNavigatorPollingThread.h | 3 +--
+ plugins/vectorshape/VectorShape.cpp | 1 +
+ sheets/functions/datetime.cpp | 1 +
+ sheets/part/Digest.cpp | 8 ++++----
+ sheets/shape/TableToolFactory.h | 2 +-
+ sheets/tests/TestSort.cpp | 4 ++--
+ 24 files changed, 38 insertions(+), 32 deletions(-)
+
+diff --git a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
+index 14b08531262..14fc6ab9a71 100644
+--- a/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
++++ b/filters/libmsooxml/MsooXmlDiagramReader_p.cpp
+@@ -872,6 +872,7 @@ void LayoutNodeAtom::finishBuild(Context* context) {
+ case AlgorithmAtom::UnknownAlg:
+ warnMsooXml << "Layout with name=" << m_name << "defines an unknown algorithm.";
+ // fall through and use the composite-algorithm
++ // fall through
+ case AlgorithmAtom::CompositeAlg: m_algorithmImpl = new CompositeAlgorithm; break;
+ case AlgorithmAtom::ConnectorAlg: m_algorithmImpl = new ConnectorAlgorithm; break;
+ case AlgorithmAtom::CycleAlg: m_algorithmImpl = new CycleAlgorithm; break;
+diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc
+index 89fb7162e00..1008d186f18 100644
+--- a/filters/sheets/csv/csvimport.cc
++++ b/filters/sheets/csv/csvimport.cc
+@@ -97,8 +97,8 @@ KoFilter::ConversionStatus CSVFilter::convert(const QByteArray& from, const QByt
+ return KoFilter::FileNotFound;
+ }
+
+- QString csv_delimiter;
+ // ###### FIXME: disabled for now
++ //QString csv_delimiter;
+ //if (!config.isNull())
+ // csv_delimiter = config[0];
+
+diff --git a/filters/sheets/excel/sidewinder/excel.cpp b/filters/sheets/excel/sidewinder/excel.cpp
+index ab592225ca6..7fa5633d433 100644
+--- a/filters/sheets/excel/sidewinder/excel.cpp
++++ b/filters/sheets/excel/sidewinder/excel.cpp
+@@ -2449,6 +2449,7 @@ bool ExcelReader::load(Workbook* workbook, const char* filename)
+ } else {
+ bytes_read = combObjStream->read( buffer, markerOrLength );
+ QString ansiString = readByteString(buffer, markerOrLength);
++ Q_UNUSED(ansiString);
+ //TODO...
+ //printf( "markerOrLength=%i ansiString=%s\n",markerOrLength,ansiString.ascii() );
+ }
+diff --git a/filters/sheets/excel/sidewinder/formulas.cpp b/filters/sheets/excel/sidewinder/formulas.cpp
+index 62747469a49..0132d39e024 100644
+--- a/filters/sheets/excel/sidewinder/formulas.cpp
++++ b/filters/sheets/excel/sidewinder/formulas.cpp
+@@ -1513,7 +1513,7 @@ static void mergeTokens(UStringStack* stack, unsigned count, const QString &merg
+ if (!stack) return;
+ if (stack->size() < count) return;
+
+- QString s1, s2;
++ QString s1;
+
+ while (count) {
+ count--;
+diff --git a/filters/sheets/gnumeric/gnumericexport.cc b/filters/sheets/gnumeric/gnumericexport.cc
+index 1256c68bc74..2468548edb3 100644
+--- a/filters/sheets/gnumeric/gnumericexport.cc
++++ b/filters/sheets/gnumeric/gnumericexport.cc
+@@ -1293,15 +1293,13 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const
+ i = 0;
+ }
+
+- QString line;
+ for (int currentcolumn = 1; currentcolumn <= iMaxColumn; currentcolumn++) {
+ QDomElement cell_contents;
+ Cell cell(table, currentcolumn, currentrow);
+
+- QString text, style;
++ QString text;
+ QDomDocument domLink;
+ QDomElement domRoot;
+- QDomNode domNode;
+ QDomNodeList childNodes;
+
+ if (!cell.isDefault() && !cell.isEmpty()) {
+@@ -1342,6 +1340,7 @@ KoFilter::ConversionStatus GNUMERICExport::convert(const QByteArray& from, const
+ text = domNode.toElement().text();
+
+ while (!domNode.isNull()) {
++ QString style;
+ style = domNode.toElement().tagName();
+
+ if (style == "b")
+diff --git a/filters/sheets/html/htmlexport.cc b/filters/sheets/html/htmlexport.cc
+index 2d116e0608c..bf41a6f743e 100644
+--- a/filters/sheets/html/htmlexport.cc
++++ b/filters/sheets/html/htmlexport.cc
+@@ -242,7 +242,6 @@ void HTMLExport::convertSheet(Sheet *sheet, QString &str, int iMaxUsedRow, int i
+ i = 0;
+ }
+
+- QString separators;
+ QString line;
+ unsigned int nonempty_cells = 0;
+
+@@ -435,7 +434,6 @@ void HTMLExport::detectFilledCells(Sheet *sheet, int &rows, int &columns)
+ int iUsedColumn = 0;
+ for (int currentcolumn = 1 ; currentcolumn <= iMaxColumn ; currentcolumn++) {
+ cell = Cell(sheet, currentcolumn, currentrow);
+- QString text;
+ if (!cell.isDefault() && !cell.isEmpty()) {
+ iUsedColumn = currentcolumn;
+ }
+diff --git a/filters/sheets/latex/export/latexexport.cc b/filters/sheets/latex/export/latexexport.cc
+index 8d0698a3420..4f8caf235d9 100644
+--- a/filters/sheets/latex/export/latexexport.cc
++++ b/filters/sheets/latex/export/latexexport.cc
+@@ -38,7 +38,6 @@ LATEXExport::LATEXExport(QObject* parent, const QVariantList&) :
+
+ KoFilter::ConversionStatus LATEXExport::convert(const QByteArray& from, const QByteArray& to)
+ {
+- QString config;
+
+ if (to != "text/x-tex" || from != "application/x-kspread")
+ return KoFilter::NotImplemented;
+diff --git a/filters/sheets/latex/export/table.cc b/filters/sheets/latex/export/table.cc
+index 8d8b6701a39..e58827dfbc7 100644
+--- a/filters/sheets/latex/export/table.cc
++++ b/filters/sheets/latex/export/table.cc
+@@ -118,6 +118,7 @@ void Table::analyzePaper(const QDomNode node)
+
+ /* borders */
+ QDomNode border = getChild(node, "borders");
++ Q_UNUSED(border);
+ setBorderRight(getAttr(node, "right").toLong());
+ setBorderLeft(getAttr(node, "left").toLong());
+ setBorderBottom(getAttr(node, "bottom").toLong());
+diff --git a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
+index 782a5914729..eda8ffc6b47 100644
+--- a/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
++++ b/filters/sheets/xlsx/XlsxXmlWorksheetReader.cpp
+@@ -872,7 +872,6 @@ KoFilter::ConversionStatus XlsxXmlWorksheetReader::read_conditionalFormatting()
+ while (index < m_conditionalIndices.size()) {
+ QString conditionalArea;
+ Condition examinedCondition = m_conditionalIndices.at(index);
+- QString sqrefOriginal = sqref;
+ int areaIndex = 0;
+ Condition previousCond;
+
+diff --git a/filters/stage/pptx/PptxXmlDocumentReader.cpp b/filters/stage/pptx/PptxXmlDocumentReader.cpp
+index 4cf86aea8c8..11b5ad266b9 100644
+--- a/filters/stage/pptx/PptxXmlDocumentReader.cpp
++++ b/filters/stage/pptx/PptxXmlDocumentReader.cpp
+@@ -316,7 +316,7 @@ KoFilter::ConversionStatus PptxXmlDocumentReader::read_sldId()
+
+ QString slideMasterPath, slideMasterFile;
+ MSOOXML::Utils::splitPathAndFile(m_context->relationships->targetForType(slidePath, slideFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideLayout"), &slideMasterPath, &slideMasterFile);
+- const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster");
++ // const QString slideMasterPathAndFile = m_context->relationships->targetForType(slideMasterPath, slideMasterFile, QLatin1String(MSOOXML::Schemas::officeDocument::relationships) + "/slideMaster");
+
+ // Delay the reading of a tableStyle until we find a table as we need the
+ // clrMap from the master slide
+diff --git a/filters/words/msword-odf/texthandler.cpp b/filters/words/msword-odf/texthandler.cpp
+index e167d86e028..89ef678961a 100644
+--- a/filters/words/msword-odf/texthandler.cpp
++++ b/filters/words/msword-odf/texthandler.cpp
+@@ -408,6 +408,7 @@ void WordsTextHandler::footnoteFound(wvWare::FootnoteData data,
+ }
+ case msonfcUCLetter:
+ letter = 'A';
++ // fall through
+ case msonfcLCLetter:
+ {
+ while (noteNumber / 25 > 0) {
+@@ -1064,6 +1065,7 @@ void WordsTextHandler::fieldStart(const wvWare::FLD* fld, wvWare::SharedPtr<cons
+ break;
+ case UNSUPPORTED:
+ warnMsDoc << "Warning: Fld data missing, ignoring!";
++ // fall through
+ default:
+ warnMsDoc << "Warning: unrecognized field type, ignoring!";
+ m_fld->m_type = UNSUPPORTED;
+diff --git a/filters/words/msword-odf/wv2/src/parser9x.cpp b/filters/words/msword-odf/wv2/src/parser9x.cpp
+index 9a6d1606ce9..e5d7d14691c 100644
+--- a/filters/words/msword-odf/wv2/src/parser9x.cpp
++++ b/filters/words/msword-odf/wv2/src/parser9x.cpp
+@@ -581,7 +581,8 @@ void Parser9x::processPiece( String* string, U32 fc, U32 limit, const Position&
+ // same ASCII code as TTP_MARK (0x0007), NOTE: table depth == 1
+ case CELL_MARK:
+ m_cellMarkFound = true;
+- // Fall-through intended. A row/cell end is also a paragraph end.
++ // A row/cell end is also a paragraph end.
++ // fall through
+ case PARAGRAPH_MARK:
+ {
+ // No "index - start + 1" here, as we don't want to copy the
+@@ -1064,6 +1065,7 @@ void Parser9x::emitSpecialCharacter( UChar character, U32 globalCP, SharedPtr<co
+ if (m_subDocument == Main) {
+ emitAnnotation( UString(character), globalCP, chp );
+ }
++ break;
+ }
+ case TextHandler::FieldEscapeChar:
+ wvlog << "Found an escape character ++++++++++++++++++++?" << endl;
+diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp
+index f47c3dd8d51..d2c96e3d92b 100644
+--- a/filters/words/msword-odf/wv2/src/styles.cpp
++++ b/filters/words/msword-odf/wv2/src/styles.cpp
+@@ -42,7 +42,6 @@ STD::STD()
+ }
+
+ STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos )
+-throw(InvalidFormatException)
+ {
+ clearInternal();
+ if (!read( baseSize, totalSize, stream, preservePos )) {
+@@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs )
+ }
+
+ bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos )
+-throw(InvalidFormatException)
+ {
+ U16 shifterU16;
+ S32 startOffset=stream->tell(); // address where the STD starts
+@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version )
+ }
+
+
+-StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException)
++StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf )
+ : m_udsNum(0)
+ {
+ WordVersion version = Word8;
+diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h
+index ba02def6845..41c8278dd21 100644
+--- a/filters/words/msword-odf/wv2/src/styles.h
++++ b/filters/words/msword-odf/wv2/src/styles.h
+@@ -58,8 +58,9 @@ struct STD
+ STD();
+ /**
+ * Simply calls read(...)
++ * @throw InvalidFormatException
+ */
+- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
++ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false );
+ /**
+ * Attention: This struct allocates memory on the heap
+ */
+@@ -74,8 +75,9 @@ struct STD
+ * false the state of stream will be changed!
+ *
+ * @return true - success, false - failed
++ * @throw InvalidFormatException
+ */
+- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
++ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false );
+
+ /**
+ * Same as reading :)
+@@ -365,7 +367,10 @@ class WV2_EXPORT Style
+ class WV2_EXPORT StyleSheet
+ {
+ public:
+- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException);
++ /**
++ * @throw InvalidFormatException
++ */
++ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf );
+ ~StyleSheet();
+
+ /**
+diff --git a/gemini/lib/GeminiMainWindow.cpp b/gemini/lib/GeminiMainWindow.cpp
+index 3d05f6461e0..eb5f120c0f7 100644
+--- a/gemini/lib/GeminiMainWindow.cpp
++++ b/gemini/lib/GeminiMainWindow.cpp
+@@ -136,8 +136,10 @@ void GeminiMainWindow::setFullScreen(bool newState)
+ }
+
+
++
+ void GeminiMainWindow::changeState(GeminiMainWindow::GeminiState newState, bool lockNewState)
+ {
++ Q_UNUSED(lockNewState);
+ d->syncObject = new GeminiModeSynchronisationObject;
+
+ if(centralWidget()) {
+diff --git a/libs/pageapp/KoPAOdfPageSaveHelper.cpp b/libs/pageapp/KoPAOdfPageSaveHelper.cpp
+index 92c6dfd4cb4..068501c8af1 100644
+--- a/libs/pageapp/KoPAOdfPageSaveHelper.cpp
++++ b/libs/pageapp/KoPAOdfPageSaveHelper.cpp
+@@ -49,7 +49,7 @@ KoPAOdfPageSaveHelper::KoPAOdfPageSaveHelper( KoPADocument * doc, QList<KoPAPage
+ KoPAPage * p = static_cast<KoPAPage *>( page );
+ masterPages.insert( p->masterPage() );
+ }
+- m_masterPages = masterPages.toList();
++ m_masterPages = masterPages.values();
+ }
+ }
+
+diff --git a/plugins/spacenavigator/SpaceNavigatorDevice.h b/plugins/spacenavigator/SpaceNavigatorDevice.h
+index b9056ac98c1..ecd696e415f 100644
+--- a/plugins/spacenavigator/SpaceNavigatorDevice.h
++++ b/plugins/spacenavigator/SpaceNavigatorDevice.h
+@@ -31,10 +31,8 @@ class SpaceNavigatorDevice : public KoInputDeviceHandler
+ explicit SpaceNavigatorDevice(QObject *parent);
+ virtual ~SpaceNavigatorDevice();
+
+- /// reimplemented from KoInputDeviceHandler
+- virtual bool start();
+- /// reimplemented from KoInputDeviceHandler
+- virtual bool stop();
++ virtual bool start() override;
++ virtual bool stop() override;
+ private Q_SLOTS:
+ void slotMoveEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons );
+ void slotButtonEvent( int x, int y, int z, int rx, int ry, int rz, Qt::MouseButtons, Qt::MouseButton, int type );
+diff --git a/plugins/spacenavigator/SpaceNavigatorEvent.h b/plugins/spacenavigator/SpaceNavigatorEvent.h
+index 73751ec88ff..76ee8e2f880 100644
+--- a/plugins/spacenavigator/SpaceNavigatorEvent.h
++++ b/plugins/spacenavigator/SpaceNavigatorEvent.h
+@@ -33,7 +33,7 @@ class SpaceNavigatorEvent : public KoInputDeviceHandlerEvent
+ void setPosition( int x, int y, int z );
+ void setRotation( int rx, int ry, int rz );
+
+- virtual KoPointerEvent * pointerEvent();
++ virtual KoPointerEvent * pointerEvent() override;
+
+ private:
+ int m_x, m_y, m_z;
+diff --git a/plugins/spacenavigator/SpaceNavigatorPollingThread.h b/plugins/spacenavigator/SpaceNavigatorPollingThread.h
+index 62c4de8ab73..67d59177021 100644
+--- a/plugins/spacenavigator/SpaceNavigatorPollingThread.h
++++ b/plugins/spacenavigator/SpaceNavigatorPollingThread.h
+@@ -39,8 +39,7 @@ class SpaceNavigatorPollingThread : public QThread
+
+ protected:
+
+- /// reimplemented from QThread
+- virtual void run();
++ virtual void run() override;
+
+ private:
+ bool m_stopped;
+diff --git a/plugins/vectorshape/VectorShape.cpp b/plugins/vectorshape/VectorShape.cpp
+index a25ab3fc561..9acbd251c94 100644
+--- a/plugins/vectorshape/VectorShape.cpp
++++ b/plugins/vectorshape/VectorShape.cpp
+@@ -294,6 +294,7 @@ void VectorShape::saveOdf(KoShapeSavingContext & context) const
+ break;
+ case VectorTypeSvg:
+ mimeType = "image/svg+xml";
++ break;
+ default:
+ // FIXME: What here?
+ mimeType = "application/x-what";
+diff --git a/sheets/functions/datetime.cpp b/sheets/functions/datetime.cpp
+index 9f59fe2cf75..6157b0996c1 100644
+--- a/sheets/functions/datetime.cpp
++++ b/sheets/functions/datetime.cpp
+@@ -597,6 +597,7 @@ Value func_currentDate(valVector, ValueCalc * calc, FuncExtra *)
+ // Function: CURRENTTIME
+ Value func_currentTime(valVector, ValueCalc * calc, FuncExtra *)
+ {
++ Q_UNUSED(calc);
+ return Value(QTime::currentTime());
+ }
+
+diff --git a/sheets/part/Digest.cpp b/sheets/part/Digest.cpp
+index 8cd972db989..e9246ce6e7d 100644
+--- a/sheets/part/Digest.cpp
++++ b/sheets/part/Digest.cpp
+@@ -596,10 +596,10 @@ static void __rtl_digest_endSHA(DigestContextSHA *ctx)
+ }
+
+ switch (ctx->m_nDatLen & 0x03) {
+- case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L;
+- case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L;
+- case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
+- case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L;
++ case 0: X[i] = ((sal_uInt32)(*(p++))) << 0L; /* fall through */
++ case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L; /* fall through */
++ case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L; /* fall through */
++ case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L; /* fall through */
+ }
+
+ __rtl_digest_swapLong(X, i + 1);
+diff --git a/sheets/shape/TableToolFactory.h b/sheets/shape/TableToolFactory.h
+index 679bfe14b8e..9412d8ffdc5 100644
+--- a/sheets/shape/TableToolFactory.h
++++ b/sheets/shape/TableToolFactory.h
+@@ -34,7 +34,7 @@ class TableToolFactory : public KoToolFactoryBase
+ TableToolFactory();
+ ~TableToolFactory();
+
+- KoToolBase* createTool(KoCanvasBase* canvas);
++ KoToolBase* createTool(KoCanvasBase* canvas) override;
+ };
+
+ } // namespace Sheets
+diff --git a/sheets/tests/TestSort.cpp b/sheets/tests/TestSort.cpp
+index b3f1e35169d..6354d79abc5 100644
+--- a/sheets/tests/TestSort.cpp
++++ b/sheets/tests/TestSort.cpp
+@@ -68,7 +68,7 @@ void TestSort::AscendingOrder()
+ command->setSheet(sheet);
+
+ // Parameters.
+- command->setSortRows(Qt::Vertical);
++ command->setSortRows(true);
+ command->setSkipFirst(false);
+ command->setCopyFormat(false);
+
+@@ -121,7 +121,7 @@ void TestSort::DescendingOrder()
+ command->setSheet(sheet);
+
+ // Parameters.
+- command->setSortRows(Qt::Vertical);
++ command->setSortRows(true);
+ command->setSkipFirst(false);
+ command->setCopyFormat(false);
+
diff --git a/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch b/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch
new file mode 100644
index 000000000000..d4b082b9a0f1
--- /dev/null
+++ b/srcpkgs/calligra/patches/0002-Make-show-hidden-row-s-work.patch
@@ -0,0 +1,29 @@
+From 22e02998dec8af15a25b7e8e3d53c174810cc3be Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+Date: Thu, 11 Jun 2020 10:43:38 +0200
+Subject: [PATCH] Make show hidden row(s) work
+
+Check for hidden rows was inverted to check for shown rows,
+hence hidden rows would never be unhidden.
+
+BUG:338816
+BUG:354236
+FIXED-IN:3.2.2
+(cherry picked from commit 28920c50e6300d643477f256aba91c8c51836682)
+---
+ sheets/commands/RowColumnManipulators.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sheets/commands/RowColumnManipulators.cpp b/sheets/commands/RowColumnManipulators.cpp
+index 95282d6e31b..25e8c454e27 100644
+--- a/sheets/commands/RowColumnManipulators.cpp
++++ b/sheets/commands/RowColumnManipulators.cpp
+@@ -192,7 +192,7 @@ bool HideShowManipulator::preProcessing()
+ }
+ }
+ for (int row = range.top(); row <= range.bottom(); ++row) {
+- if (!m_sheet->rowFormats()->isHidden(row)) {
++ if (m_sheet->rowFormats()->isHidden(row)) {
+ region.add(QRect(1, row, KS_colMax, 1));
+ }
+ }
diff --git a/srcpkgs/calligra/patches/c++17.patch b/srcpkgs/calligra/patches/c++17.patch
new file mode 100644
index 000000000000..1db8385161a3
--- /dev/null
+++ b/srcpkgs/calligra/patches/c++17.patch
@@ -0,0 +1,16 @@
+diff -Naur CMakeLists.txt.orig CMakeLists.txt
+--- a/CMakeLists.txt.orig
++++ b/CMakeLists.txt
+@@ -106,9 +106,9 @@
+
+ # use CPP-11
+ if (CMAKE_VERSION VERSION_LESS "3.1")
+- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ else ()
+- set (CMAKE_CXX_STANDARD 11)
++ set (CMAKE_CXX_STANDARD 17)
+ endif ()
+
+ ############
+
diff --git a/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch b/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch
new file mode 100644
index 000000000000..7dab53bcfc7f
--- /dev/null
+++ b/srcpkgs/calligra/patches/poppler-22.03.0-fix.patch
@@ -0,0 +1,70 @@
+From 236bacbe13739414e919de868283b0caf2df5d8a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Apr 2022 01:25:44 +0200
+Subject: [PATCH] PdfImport: Fix compile with newer poppler
+
+Brings a dependency on poppler-qt5 to be able to include the version
+header, honestly it's not strictly needed, one could do a
+check_cxx_source_compiles, but I don't care about Calligra enough to
+spend more time making it compile while it's using poppler the wrong
+way.
+---
+ CMakeLists.txt | 1 +
+ filters/karbon/pdf/CMakeLists.txt | 2 +-
+ filters/karbon/pdf/PdfImport.cpp | 9 +++++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 51f1d65b8e6..06bbad5c24c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -952,6 +952,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG
+ calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG
+ NOT_WIN "not supported on Windows"
+ PopplerXPDFHeaders_FOUND "poppler xpdf headers not found"
++ Poppler_FOUND "poppler qt5 headers not found"
+ )
+
+ calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index 8fddf1ad757..b71c92cbf04 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -3,7 +3,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+ calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop)
+
+-target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core)
++target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5)
+
+ install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
+
+diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+index abbe681b4e8..e97974fc133 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -17,6 +17,10 @@
+
+ #include <kpluginfactory.h>
+
++#include <poppler-version.h>
++
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ // Don't show this warning: it's an issue in poppler
+ #ifdef __GNUC__
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+@@ -54,8 +58,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
++ PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
++#endif
+ if (! pdfDoc) {
+ globalParams.reset();
+ return KoFilter::StupidError;
diff --git a/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch b/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch
new file mode 100644
index 000000000000..e47169950b8b
--- /dev/null
+++ b/srcpkgs/calligra/patches/poppler-22.04.0-fix.patch
@@ -0,0 +1,91 @@
+From 6b75bec784c9835c78993349845d8c2ef22ec3de Mon Sep 17 00:00:00 2001
+From: Dag Andersen <dag.andersen@kdemail.net>
+Date: Wed, 13 Apr 2022 14:45:33 +0200
+Subject: [PATCH] PdfImport: Fix compile with newer poppler
+
+Also fixes odg2pdf filter.
+
+Same solution as commit 236bacbe13739414e919de868283b0caf2df5d8a
+by accid@kde.org.
+---
+ filters/karbon/pdf/CMakeLists.txt | 2 +-
+ filters/karbon/pdf/Pdf2OdgImport.cpp | 9 +++++++++
+ filters/karbon/pdf/SvgOutputDev.cpp | 9 +++++++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index b71c92cbf04..4ce138ccdd6 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -13,6 +13,6 @@ set(pdf2odg_PART_SRCS PdfImportDebug.cpp Pdf2OdgImport.cpp SvgOutputDev.cpp)
+ add_library(calligra_filter_pdf2odg MODULE ${pdf2odg_PART_SRCS})
+ calligra_filter_desktop_to_json(calligra_filter_pdf2odg calligra_filter_pdf2odg.desktop)
+
+-target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core)
++target_link_libraries(calligra_filter_pdf2odg kopageapp karbonui Poppler::Core Poppler::Qt5)
+
+ install(TARGETS calligra_filter_pdf2odg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
+diff --git a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp
+index 934e31dd5aa..a21eac97a77 100644
+--- a/filters/karbon/pdf/Pdf2OdgImport.cpp
++++ b/filters/karbon/pdf/Pdf2OdgImport.cpp
+@@ -27,6 +27,8 @@
+
+ #include <kpluginfactory.h>
+
++#include <poppler-version.h>
++
+ // Don't show this warning: it's an issue in poppler
+ #ifdef __GNUC__
+ #pragma GCC diagnostic ignored "-Wunused-parameter"
+@@ -36,6 +38,8 @@
+ #include <PDFDoc.h>
+ #include <GlobalParams.h>
+
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ K_PLUGIN_FACTORY_WITH_JSON(Pdf2OdgImportFactory, "calligra_filter_pdf2odg.json",
+ registerPlugin<Pdf2OdgImport>();)
+
+@@ -69,8 +73,13 @@ KoFilter::ConversionStatus Pdf2OdgImport::convert(const QByteArray& from, const
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++ std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
++ PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
++#endif
+ if (! pdfDoc) {
+ globalParams.reset();
+ return KoFilter::StupidError;
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 0e6e5a934ca..7caec15175a 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -22,6 +22,10 @@
+ #include <QPen>
+ #include <QImage>
+
++#include <poppler-version.h>
++
++#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
++
+ class SvgOutputDev::Private
+ {
+ public:
+@@ -386,7 +390,12 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ if (s->getLength() == 0)
+ return;
+
++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
+ GfxFont * font = state->getFont();
++#else
++ std::shared_ptr<GfxFont> font = state->getFont();
++#endif
++
+
+ QString str;
+
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 7c1411bf3da6..6f924d62f8ff 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=7
+revision=8
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 9c2d6152e5cc83a96ddc095f87eec9682ee2df9e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:34:07 -0700
Subject: [PATCH 508/608] inkscape: rebuild against libpoppler 22.06.0
---
...ibility-with-Poppler-22.03-and-later.patch | 50 ++++++
.../Fix-build-with-poppler-21.11.0.patch | 29 ++++
.../Fix-build-with-poppler-22.04.patch | 143 ++++++++++++++++++
srcpkgs/inkscape/template | 2 +-
4 files changed, 223 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
create mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
create mode 100644 srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
diff --git a/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
new file mode 100644
index 000000000000..297ef677665e
--- /dev/null
+++ b/srcpkgs/inkscape/patches/Ensure-compatibility-with-Poppler-22.03-and-later.patch
@@ -0,0 +1,50 @@
+From a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Sun, 20 Mar 2022 22:41:51 -0300
+Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
+
+This change ensures that Inkscape will build against Poppler 22.03 after
+the changes that were made to the constructor of `PDFDoc`.
+
+See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
+
+Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
+---
+ src/extension/internal/pdfinput/pdf-input.cpp | 3 +--
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
+index 3dabc94ba2..079b0dc713 100644
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -688,8 +688,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+
+ // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
+ // glib gstdio.c
+- GooString *filename_goo = new GooString(uri);
+- pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
++ pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
+
+ if (!pdf_doc->isOk()) {
+ int error = pdf_doc->getErrorCode();
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 87a19d4c42..50b617c25c 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
++#else
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+ #define _POPPLER_CONST_83 const
+ #else
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
new file mode 100644
index 000000000000..5d7f4801273d
--- /dev/null
+++ b/srcpkgs/inkscape/patches/Fix-build-with-poppler-21.11.0.patch
@@ -0,0 +1,29 @@
+From 5724c21b9cb7b6176a7b36ca24068b148c817e82 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Mon, 1 Nov 2021 21:45:38 +0200
+Subject: [PATCH] Fix build with poppler 21.11.0
+
+GfxFont::tag is now of type std::string instead of GooString *.
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index e3d04d544b..feecefa043 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ }
+ if (printCommands) {
+ printf(" font: tag=%s name='%s' %g\n",
++#if POPPLER_CHECK_VERSION(21,11,0)
++ font->getTag().c_str(),
++#else
+ font->getTag()->getCString(),
++#endif
+ font->getName() ? font->getName()->getCString() : "???",
+ args[1].getNum());
+ fflush(stdout);
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
new file mode 100644
index 000000000000..f12054268a3c
--- /dev/null
+++ b/srcpkgs/inkscape/patches/Fix-build-with-poppler-22.04.patch
@@ -0,0 +1,143 @@
+From d989cdf1059c78bc3bb6414330242073768d640b Mon Sep 17 00:00:00 2001
+From: Rafael Siejakowski <rs@rs-math.net>
+Date: Mon, 4 Apr 2022 22:09:39 -0300
+Subject: [PATCH] Compatibility with Poppler 22.04
+
+Replace vanilla pointers with std::shared_ptr for pointers to fonts;
+eliminate manual ref-counting.
+
+Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 14 ++++++++------
+ .../internal/pdfinput/poppler-transition-api.h | 6 ++++++
+ src/extension/internal/pdfinput/svg-builder.cpp | 7 +------
+ src/extension/internal/pdfinput/svg-builder.h | 1 -
+ 4 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index feecefa043..d6e2ede4f3 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -30,6 +30,7 @@
+ #include "Gfx.h"
+ #include "pdf-parser.h"
+ #include "util/units.h"
++#include "poppler-transition-api.h"
+
+ #include "glib/poppler-features.h"
+ #include "goo/gmem.h"
+@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
+ // TODO not good that numArgs is ignored but args[] is used:
+ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ {
+- GfxFont *font = res->lookupFont(args[0].getName());
++ auto font = res->lookupFont(args[0].getName());
+
+ if (!font) {
+ // unsetting the font (drawing no text) is better than using the
+@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ fflush(stdout);
+ }
+
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+ font->incRefCnt();
++#endif
+ state->setFont(font, args[1].getNum());
+ fontChanged = gTrue;
+ }
+@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
+ #else
+ void PdfParser::doShowText(GooString *s) {
+ #endif
+- GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+ CharCode code;
+@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
+ #endif
+ int len, n, uLen;
+
+- font = state->getFont();
++ auto font = state->getFont();
+ wMode = font->getWMode();
+
+ builder->beginString(state);
+@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
+ //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
+ if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
+ code, u, uLen)) {*/
+- _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
+- if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
++ _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
++ if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
+ pushResources(resDict);
+- }
++ }
+ if (charProc.isStream()) {
+ //parse(&charProc, gFalse); // TODO: parse into SVG font
+ } else {
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 50b617c25c..dc9e47e45b 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+
+ #include <glib/poppler-features.h>
+
++#if POPPLER_CHECK_VERSION(22, 4, 0)
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
++#else
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 3, 0)
+ #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
+ #else
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index eede668893..901cc8cddb 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
+
+ void SvgBuilder::_init() {
+ _font_style = nullptr;
+- _current_font = nullptr;
+ _font_specification = nullptr;
+ _font_scaling = 1;
+ _need_font_update = true;
+@@ -1064,11 +1063,8 @@ void SvgBuilder::updateFont(GfxState *state) {
+ _need_font_update = false;
+ updateTextMatrix(state); // Ensure that we have a text matrix built
+
+- if (_font_style) {
+- //sp_repr_css_attr_unref(_font_style);
+- }
+ _font_style = sp_repr_css_attr_new();
+- GfxFont *font = state->getFont();
++ auto font = state->getFont();
+ // Store original name
+ if (font->getName()) {
+ _font_specification = font->getName()->getCString();
+@@ -1213,7 +1209,6 @@ void SvgBuilder::updateFont(GfxState *state) {
+ sp_repr_css_set_property(_font_style, "writing-mode", "tb");
+ }
+
+- _current_font = font;
+ _invalidated_style = true;
+ }
+
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index fb4e64fa19..e91febd717 100644
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -204,7 +204,6 @@ private:
+ std::vector<SvgGraphicsState> _state_stack;
+
+ SPCSSAttr *_font_style; // Current font style
+- GfxFont *_current_font;
+ const char *_font_specification;
+ double _font_scaling;
+ bool _need_font_update;
+--
+GitLab
+
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 45f48ccda0dc..4d902e663f73 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=3
+revision=4
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From 00249218eaa1c220b33626b0fad7123a70b17fdc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:34:43 -0700
Subject: [PATCH 509/608] ipe: rebuild against libpoppler 22.06.0
---
srcpkgs/ipe/patches/poppler-22.03.0-fix.patch | 33 +++++++++++++++++++
srcpkgs/ipe/template | 2 +-
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ipe/patches/poppler-22.03.0-fix.patch
diff --git a/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch b/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch
new file mode 100644
index 000000000000..df2894809c1c
--- /dev/null
+++ b/srcpkgs/ipe/patches/poppler-22.03.0-fix.patch
@@ -0,0 +1,33 @@
+diff -Naur pdftoipe.cpp.orig pdftoipe.cpp
+--- a/ipe-tools/pdftoipe/pdftoipe.cpp.orig
++++ b/ipe-tools/pdftoipe/pdftoipe.cpp
+@@ -84,22 +84,20 @@
+ if (quiet)
+ globalParams->setErrQuiet(quiet);
+
+- GooString *ownerPW, *userPW;
++ std::optional<GooString> ownerPW, userPW;
+ if (ownerPassword[0]) {
+- ownerPW = new GooString(ownerPassword);
++ ownerPW = GooString(ownerPassword);
+ } else {
+- ownerPW = 0;
++ ownerPW = std::nullopt;
+ }
+ if (userPassword[0]) {
+- userPW = new GooString(userPassword);
++ userPW = GooString(userPassword);
+ } else {
+- userPW = 0;
++ userPW = std::nullopt;
+ }
+
+ // open PDF file
+- PDFDoc *doc = new PDFDoc(fileName, ownerPW, userPW);
+- delete userPW;
+- delete ownerPW;
++ PDFDoc *doc = new PDFDoc(std::make_unique<GooString>(fileName), ownerPW, userPW);
+
+ if (!doc->isOk())
+ return 1;
+
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index a84d5c036b2f..72398e7ff924 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
# Template file for 'ipe'
pkgname=ipe
version=7.2.24
-revision=6
+revision=7
_tools_commit=v7.2.20.1
hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
From 9d7c609d6b8cc8bc1789ffc0bf5240431cc8fc7f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:35:30 -0700
Subject: [PATCH 510/608] kitinerary: rebuild against libpoppler 22.06.0
---
srcpkgs/kitinerary/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index 343ef64911d6..a2cfcaa178b6 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
# Template file for 'kitinerary'
pkgname=kitinerary
version=22.04.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel
From 15d78b91372adf1a882aeb95a8a4038dc645421e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:36:24 -0700
Subject: [PATCH 511/608] scribus: rebuild against libpoppler 22.06.0
---
.../patches/0001-poppler-22.02.0-fix.patch | 129 ++++++++
.../patches/0002-poppler-22.03.0-fix.patch | 52 ++++
.../patches/0003-poppler-22.04.0-fix.patch | 288 ++++++++++++++++++
srcpkgs/scribus/template | 2 +-
4 files changed, 470 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch
create mode 100644 srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch
create mode 100644 srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch
diff --git a/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch b/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch
new file mode 100644
index 000000000000..4e0f607c6a07
--- /dev/null
+++ b/srcpkgs/scribus/patches/0001-poppler-22.02.0-fix.patch
@@ -0,0 +1,129 @@
+From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 2 Feb 2022 23:12:52 +0000
+Subject: [PATCH] #16734: Build break with poppler 22.2.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24884 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 47 +++++++++++++++++++-----
+ 1 file changed, 37 insertions(+), 10 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 5894bf2ad6..3650c96f52 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place.
+
+ #include "slaoutput.h"
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#include <memory>
++#include <optional>
++#endif
++
+ #include <poppler/GlobalParams.h>
+ #include <poppler/poppler-config.h>
+ #include <poppler/FileSpec.h>
+@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
+ void SlaOutputDev::updateFont(GfxState *state)
+ {
+ GfxFont *gfxFont;
+- GfxFontLoc *fontLoc;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ std::optional<GfxFontLoc> fontLoc;
++ const GooString * fileName = nullptr;
++ std::unique_ptr<FoFiTrueType> ff;
++#else
++ GfxFontLoc * fontLoc = nullptr;
++ GooString * fileName = nullptr;
++ FoFiTrueType * ff = nullptr;
++#endif
+ GfxFontType fontType;
+ SlaOutFontFileID *id;
+ SplashFontFile *fontFile;
+ SplashFontSrc *fontsrc = nullptr;
+- FoFiTrueType *ff;
+ Object refObj, strObj;
+- GooString *fileName;
+- char *tmpBuf;
++ char *tmpBuf = nullptr;
+ int tmpBufLen = 0;
+- int *codeToGID;
+- const double *textMat;
++ int *codeToGID = nullptr;
++ const double *textMat = nullptr;
+ double m11, m12, m21, m22, fontSize;
+ SplashCoord mat[4];
+ int n = 0;
+@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state)
+ SplashCoord matrix[6];
+
+ m_font = nullptr;
+- fileName = nullptr;
+- tmpBuf = nullptr;
+- fontLoc = nullptr;
+
+ gfxFont = state->getFont();
+ if (!gfxFont)
+@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+ }
+ else
+ { // gfxFontLocExternal
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ fileName = fontLoc->pathAsGooString();
++#else
+ fileName = fontLoc->path;
++#endif
+ fontType = fontLoc->fontType;
+ }
+
+@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state)
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+ if (ff)
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get());
++ ff.reset();
++#else
+ codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
+- n = 256;
+ delete ff;
++#endif
++ n = 256;
+ }
+ else
+ {
+@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state)
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+ if (! ff)
+ goto err2;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);
++ ff.reset();
++#else
+ codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
+ delete ff;
++#endif
+ }
+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+ id,
+@@ -3247,14 +3269,19 @@ void SlaOutputDev::updateFont(GfxState *state)
+ mat[3] = -m22;
+ m_font = m_fontEngine->getFont(fontFile, mat, matrix);
+
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ delete fontLoc;
++#endif
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
+ return;
+
+ err2:
+ delete id;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
+ delete fontLoc;
++#endif
++
+ err1:
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
diff --git a/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch b/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch
new file mode 100644
index 000000000000..f7a0c03fdd96
--- /dev/null
+++ b/srcpkgs/scribus/patches/0002-poppler-22.03.0-fix.patch
@@ -0,0 +1,52 @@
+From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 2 Mar 2022 22:22:53 +0000
+Subject: [PATCH] #16764: Build break with poppler 22.03.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24982 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
+index 154e58a3f0..392dcd9e64 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
++++ b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName)
+ #endif
+ globalParams->setErrQuiet(gTrue);
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ PDFDoc pdfDoc{ std::make_unique<GooString>(fname) };
++#else
+ PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};
++#endif
+ if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)
+ return QImage();
+
+@@ -342,7 +346,11 @@ bool PdfPlug::convert(const QString& fn)
+ globalParams->setErrQuiet(gTrue);
+ // globalParams->setPrintCommands(gTrue);
+ QList<OptionalContentGroup*> ocgGroups;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ auto pdfDoc = std::make_unique<PDFDoc>(std::make_unique<GooString>(fname));
++#else
+ auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(fname, nullptr, nullptr, nullptr));
++#endif
+ if (pdfDoc)
+ {
+ if (pdfDoc->getErrorCode() == errEncrypted)
+@@ -361,8 +369,13 @@ bool PdfPlug::convert(const QString& fn)
+ #else
+ auto fname = new GooString(QFile::encodeName(fn).data());
+ #endif
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ std::optional<GooString> userPW(std::in_place, text.toLocal8Bit().data());
++ pdfDoc.reset(new PDFDoc(std::make_unique<GooString>(fname), userPW, userPW, nullptr));
++#else
+ auto userPW = new GooString(text.toLocal8Bit().data());
+ pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr));
++#endif
+ qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+ }
+ if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))
diff --git a/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch b/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch
new file mode 100644
index 000000000000..e15ec7d81266
--- /dev/null
+++ b/srcpkgs/scribus/patches/0003-poppler-22.04.0-fix.patch
@@ -0,0 +1,288 @@
+From f2237b8f0b5cf7690e864a22ef7a63a6d769fa36 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Fri, 1 Apr 2022 23:52:32 +0000
+Subject: [PATCH] Fix build with poppler 22.04.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@25074 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 123 ++++++++++++++---------
+ 1 file changed, 78 insertions(+), 45 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index e20a81f99e..5626fe3477 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -174,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s)
+ int shade = 100;
+ currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);
+ fontSize = state->getFontSize();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (state->getFont() && state->getFont()->getName())
++ fontName = new GooString(state->getFont()->getName().value());
++#else
+ if (state->getFont())
+ fontName = state->getFont()->getName()->copy();
++#endif
+ itemText = s->copy();
+ }
+
+@@ -357,7 +362,12 @@ std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key
+ GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
+ {
+ SlaOutputDev *dev = (SlaOutputDev*)user_data;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ const PDFRectangle& annotRect = annota->getRect();;
++ const PDFRectangle* box = &annotRect;
++#else
+ PDFRectangle *box = annota->getRect();
++#endif
+ double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX;
+ double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY;
+ double width = box->x2 - box->x1;
+@@ -684,7 +694,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
+ if (apa || !achar)
+ {
+ AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ const PDFRectangle& annotaRect = annota->getRect();
++ Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr);
++#else
+ Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr);
++#endif
+ ano->draw(gfx, false);
+ if (!bgFound)
+ m_currColorFill = annotOutDev->currColorFill;
+@@ -2916,22 +2931,27 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
+
+ void SlaOutputDev::updateFont(GfxState *state)
+ {
+- GfxFont *gfxFont;
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ std::optional<GfxFontLoc> fontLoc;
++ std::string fileName;
++ std::unique_ptr<FoFiTrueType> ff;
++ std::optional<std::vector<unsigned char>> tmpBuf;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ std::optional<GfxFontLoc> fontLoc;
+ const GooString * fileName = nullptr;
+ std::unique_ptr<FoFiTrueType> ff;
++ char* tmpBuf = nullptr;
+ #else
+ GfxFontLoc * fontLoc = nullptr;
+ GooString * fileName = nullptr;
+ FoFiTrueType * ff = nullptr;
++ char* tmpBuf = nullptr;
+ #endif
+ GfxFontType fontType;
+ SlaOutFontFileID *id;
+ SplashFontFile *fontFile;
+ SplashFontSrc *fontsrc = nullptr;
+ Object refObj, strObj;
+- char *tmpBuf = nullptr;
+ int tmpBufLen = 0;
+ int *codeToGID = nullptr;
+ const double *textMat = nullptr;
+@@ -2943,7 +2963,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+
+ m_font = nullptr;
+
+- gfxFont = state->getFont();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ GfxFont* gfxFont = state->getFont().get();
++#else
++ GfxFont* gfxFont = state->getFont();
++#endif
+ if (!gfxFont)
+ goto err1;
+
+@@ -2968,15 +2992,23 @@ void SlaOutputDev::updateFont(GfxState *state)
+ if (fontLoc->locType == gfxFontLocEmbedded)
+ {
+ // if there is an embedded font, read it to memory
+- tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef());
+ if (! tmpBuf)
+ goto err2;
++#else
++ tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
++ if (!tmpBuf)
++ goto err2;
++#endif
+
+ // external font
+ }
+ else
+ { // gfxFontLocExternal
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ fileName = fontLoc->path;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ fileName = fontLoc->pathAsGooString();
+ #else
+ fileName = fontLoc->path;
+@@ -2985,52 +3017,54 @@ void SlaOutputDev::updateFont(GfxState *state)
+ }
+
+ fontsrc = new SplashFontSrc;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ fontsrc->setFile(fileName);
++ else
++ fontsrc->setBuf(std::move(tmpBuf.value()));
++#else
+ if (fileName)
+ fontsrc->setFile(fileName, gFalse);
+ else
+ fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
++#endif
+
+ // load the font file
+ switch (fontType) {
+ case fontType1:
+- if (!(fontFile = m_fontEngine->loadType1Font(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontType1C:
+- if (!(fontFile = m_fontEngine->loadType1CFont(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontType1COT:
+- if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(
+- id,
+- fontsrc,
+- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
++ if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontTrueType:
+ case fontTrueTypeOT:
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ ff = FoFiTrueType::load(fileName.c_str());
++ else
++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
++#else
+ if (fileName)
+ ff = FoFiTrueType::load(fileName->getCString());
+ else
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
++#endif
+ if (ff)
+ {
+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+@@ -3047,24 +3081,17 @@ void SlaOutputDev::updateFont(GfxState *state)
+ codeToGID = nullptr;
+ n = 0;
+ }
+- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+- id,
+- fontsrc,
+- codeToGID, n)))
++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+ case fontCIDType0:
+ case fontCIDType0C:
+- if (!(fontFile = m_fontEngine->loadCIDFont(
+- id,
+- fontsrc)))
++ if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+@@ -3080,10 +3107,7 @@ void SlaOutputDev::updateFont(GfxState *state)
+ codeToGID = nullptr;
+ n = 0;
+ }
+- if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
+- id,
+- fontsrc,
+- codeToGID, n)))
++ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))
+ {
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+ gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+@@ -3105,10 +3129,17 @@ void SlaOutputDev::updateFont(GfxState *state)
+ }
+ else
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (!fileName.empty())
++ ff = FoFiTrueType::load(fileName.c_str());
++ else
++ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
++#else
+ if (fileName)
+ ff = FoFiTrueType::load(fileName->getCString());
+ else
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
++#endif
+ if (! ff)
+ goto err2;
+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+@@ -3119,13 +3150,9 @@ void SlaOutputDev::updateFont(GfxState *state)
+ delete ff;
+ #endif
+ }
+- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+- id,
+- fontsrc,
+- codeToGID, n, faceIndex)))
++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))
+ {
+- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ goto err2;
+ }
+ break;
+@@ -3269,9 +3296,15 @@ void SlaOutputDev::drawChar(GfxState* state, double x, double y, double dx, doub
+ GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
+ {
+ // qDebug() << "beginType3Char";
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ GfxFont *gfxFont;
++ if (!(gfxFont = state->getFont().get()))
++ return gTrue;
++#else
++ GfxFont* gfxFont;
+ if (!(gfxFont = state->getFont()))
+ return gTrue;
++#endif
+ if (gfxFont->getType() != fontType3)
+ return gTrue;
+ F3Entry f3e;
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 791cdea712c5..125a7d54e4cf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -4,7 +4,7 @@ version=1.5.8
revision=2
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
- -DWANT_GRAPHICSMAGICK=1"
+ -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3"
makedepends="qt5-devel qt5-tools-devel zlib-devel cairo-devel lcms2-devel
cups-devel libxml2-devel hyphen-devel ghostscript-devel boost-devel
From 445db84b1acc6a5dfa91ce05def409e958999777 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 16 Jun 2022 17:05:36 -0700
Subject: [PATCH 512/608] libreoffice: rebuild against libpoppler 22.06.0
---
.../libreoffice/patches/poppler-22.03.0.patch | 28 ++++++++
.../libreoffice/patches/poppler-22.04.0.patch | 71 +++++++++++++++++++
srcpkgs/libreoffice/template | 2 +-
3 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libreoffice/patches/poppler-22.03.0.patch
create mode 100644 srcpkgs/libreoffice/patches/poppler-22.04.0.patch
diff --git a/srcpkgs/libreoffice/patches/poppler-22.03.0.patch b/srcpkgs/libreoffice/patches/poppler-22.03.0.patch
new file mode 100644
index 000000000000..c6544b2575f9
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/poppler-22.03.0.patch
@@ -0,0 +1,28 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index ad6320139..e5f6d9c68 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -138,6 +138,15 @@ int main(int argc, char **argv)
+ _setmode( _fileno( g_binary_out ), _O_BINARY );
+ #endif
+
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++ PDFDoc aDoc( std::make_unique<GooString>(pFileName),
++ GooString(pOwnerPasswordStr),
++ GooString(pUserPasswordStr) );
++
++ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
++ GooString(pOwnerPasswordStr),
++ GooString(pUserPasswordStr) );
++#else
+ PDFDoc aDoc( pFileName,
+ pOwnerPasswordStr,
+ pUserPasswordStr );
+@@ -145,6 +154,7 @@ int main(int argc, char **argv)
+ PDFDoc aErrDoc( pErrFileName,
+ pOwnerPasswordStr,
+ pUserPasswordStr );
++#endif
+
+ // Check various permissions for aDoc.
+ PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
diff --git a/srcpkgs/libreoffice/patches/poppler-22.04.0.patch b/srcpkgs/libreoffice/patches/poppler-22.04.0.patch
new file mode 100644
index 000000000000..47f59673d69e
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/poppler-22.04.0.patch
@@ -0,0 +1,71 @@
+# Patch from FreeBSD (https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd)
+
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* g
+ {
+ // TODO(P3): Unfortunately, need to read stream twice, since
+ // we must write byte count to stdout before
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+ if( pBuf )
+ {
+ aNewFont.isEmbedded = true;
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ gfree(pBuf);
++#endif
+ }
+ }
+
+@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons
+ return;
+
+ int nSize = 0;
+- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+ if( !pBuf )
+ return;
+
+ // ---sync point--- see SYNC STREAMS above
+ fflush(stdout);
+-
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#else
++ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#endif
+ {
+- gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ gfree(pBuf);
++#endif
+ exit(1); // error
+ }
+ // ---sync point--- see SYNC STREAMS above
+ fflush(g_binary_out);
+- gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ gfree(pBuf);
++#endif
+ }
+
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state)
+ {
+ assert(state);
+
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ GfxFont *gfxFont = state->getFont();
++#else
++ GfxFont *gfxFont = state->getFont().get();
++#endif
+ if( !gfxFont )
+ return;
+
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6d35e14a3274..158df0f30ebc 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.3.3.2
-revision=2
+revision=3
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
From adb2e248c3d293612a90a92a16696d54c60ea21a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 5 Jul 2022 16:10:12 -0700
Subject: [PATCH 513/608] texlive: Remove poppler from makedepends
Texlive previously dropped support for libpoppler on 2020-05-14
---
srcpkgs/texlive/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 7a922bc07f2b..f3f8aa9995a2 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -60,7 +60,6 @@ configure_args="
--with-system-libpaper
--with-system-libpng
--with-system-mpfr
- --with-system-poppler
--with-system-pixman
--with-system-teckit
--with-system-zlib
@@ -69,8 +68,7 @@ configure_args="
hostmakedepends="pkg-config perl lua52-BitOp texinfo"
makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel
harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
- poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel
- libXaw-devel"
+ pixman-devel libteckit-devel zlib-devel zziplib-devel libXaw-devel"
depends="dialog ghostscript perl-Tk texlive-core texlive-latexmk xbps-triggers"
short_desc="TeX Live"
maintainer="fosslinux <fosslinux@aussies.space>"
From 6cf92743712a34e7f5ea82f2f93d3c92576a0942 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jul 2022 11:25:23 +0200
Subject: [PATCH 514/608] libuninameslist: update to 20220701.
---
srcpkgs/libuninameslist/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libuninameslist/template b/srcpkgs/libuninameslist/template
index 8b97662a4a31..0f31d5fe2c2a 100644
--- a/srcpkgs/libuninameslist/template
+++ b/srcpkgs/libuninameslist/template
@@ -1,6 +1,6 @@
# Template file for 'libuninameslist'
pkgname=libuninameslist
-version=20211114
+version=20220701
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/fontforge/libuninameslist"
distfiles="https://github.com/fontforge/libuninameslist/archive/${version}.tar.gz"
-checksum=c089c6164f2cef361c3419a07408be72d6b58d6ef224ec226724a9fa93c0d46e
+checksum=d3067298a5a8037a842400b48d8799abc1718ce0bd32828e8828303be79a8b37
pre_configure() {
autoreconf -fi
From f5b37d883fb5b2506db4f1a93bc9a47cb4d18d72 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jul 2022 11:27:00 +0200
Subject: [PATCH 515/608] perl-File-ShareDir-Install: update to 0.14.
---
srcpkgs/perl-File-ShareDir-Install/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-File-ShareDir-Install/template b/srcpkgs/perl-File-ShareDir-Install/template
index 7c49bdf8ce86..cddfa26d3616 100644
--- a/srcpkgs/perl-File-ShareDir-Install/template
+++ b/srcpkgs/perl-File-ShareDir-Install/template
@@ -1,7 +1,7 @@
# Template file for 'perl-File-ShareDir-Install'
pkgname=perl-File-ShareDir-Install
-version=0.13
-revision=3
+version=0.14
+revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/File-ShareDir-Install"
distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-$version.tar.gz"
-checksum=45befdf0d95cbefe7c25a1daf293d85f780d6d2576146546e6828aad26e580f9
+checksum=8f9533b198f2d4a9a5288cbc7d224f7679ad05a7a8573745599789428bc5aea0
pre_configure() {
export PERL_MM_FALLBACK_SILENCE_WARNING=yes
From b9e334bec901e53bc97b83e291366760586c4331 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jul 2022 11:27:05 +0200
Subject: [PATCH 516/608] perl-WWW-Mechanize: update to 2.10.
---
srcpkgs/perl-WWW-Mechanize/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index a098cc8e75a2..1ff4c9c27e97 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
# Template file for 'perl-WWW-Mechanize'
pkgname=perl-WWW-Mechanize
-version=2.09
+version=2.10
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/WWW-Mechanize"
distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=a671310766e11a963d0795915ec2335ab5b282d96db160e352bbd254720f3fa5
+checksum=e62787bfd9149b06989c86d55e4cde529e400c98b4dca40d51adb8a267a2cc3f
From 1e22e257b321845ae98621202e501d9aadcdccd5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 11:09:09 +0200
Subject: [PATCH 517/608] gtksourceview5: update to 5.4.2.
---
srcpkgs/gtksourceview5/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 2f056edbeeab..ade311c55c16 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
# Template file for 'gtksourceview5'
pkgname=gtksourceview5
-version=5.4.1
+version=5.4.2
revision=1
wrksrc="gtksourceview-${version}"
build_style=meson
@@ -19,19 +19,19 @@ homepage="https://wiki.gnome.org/Projects/GtkSourceView"
#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=eb3584099cfa0adc9a0b1ede08def6320bd099e79e74a2d0aefb4057cd93d68e
+checksum=ad140e07eb841910de483c092bd4885abd29baadd6e95fa22d93ed2df0b79de7
+make_check_pre="xvfb-run"
# Package build options
build_options="gir gtk_doc"
desc_option_gtk_doc="Build API docs via gtk-doc"
-build_options_default="gir"
+build_options_default="gir gtk_doc"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-do_check() {
- xvfb-run ninja -C build test
+pre_build() {
+ # help gi-docgen find gi files on cross
+ if [ -n "$CROSS_BUILD" ]; then
+ export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+ fi
}
gtksourceview5-devel_package() {
From b49662eedfdaa3a7660f9330c3f9602a01ba3ffd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Jul 2022 12:49:04 +0200
Subject: [PATCH 518/608] openssl: update to 1.1.1q.
---
srcpkgs/openssl/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index b77267e3d098..317ae4995bb6 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
# Template file for 'openssl'
pkgname=openssl
-version=1.1.1n
+version=1.1.1q
revision=1
bootstrap=yes
build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <johnz@posteo.net>"
license="OpenSSL"
homepage="https://www.openssl.org"
distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a
+checksum=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
conf_files="/etc/ssl/openssl.cnf"
replaces="libressl>=0"
@@ -52,6 +52,11 @@ pre_build() {
make ${makejobs} depend
}
+pre_check() {
+ # developer test, fails due to different nm output
+ rm -f test/recipes/01-test_symbol_presence.t
+}
+
post_install() {
if [ ! "$CHROOT_READY" ]; then
rm -f "${DESTDIR}/usr/bin/c_rehash"
From 6c109e734d6221a6100fce548f1dc03de4268858 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 16 Apr 2022 18:50:48 -0700
Subject: [PATCH 519/608] simple-scan: update to 42.1
---
srcpkgs/simple-scan/patches/meson-0.61.patch | 37 --------------------
srcpkgs/simple-scan/patches/vala-0.56.patch | 25 -------------
srcpkgs/simple-scan/template | 5 +--
3 files changed, 3 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch
delete mode 100644 srcpkgs/simple-scan/patches/vala-0.56.patch
diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch
deleted file mode 100644
index e193747322c0..000000000000
--- a/srcpkgs/simple-scan/patches/meson-0.61.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Tue, 16 Nov 2021 02:43:11 +0800
-Subject: [PATCH] Remove incorrect i18n.merge_file argument
-
-The positional argument was being silently ignored until meson 0.60.0 where
-it fails with "ERROR: Function does not take positional arguments".
----
- data/meson.build | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2b5a0ee3..cf6e4ae1 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
- install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
- meson.add_install_script ('meson_compile_gschema.py')
-
--i18n.merge_file ('desktop-file',
-- input: 'simple-scan.desktop.in',
-+i18n.merge_file (input: 'simple-scan.desktop.in',
- output: 'simple-scan.desktop',
- install: true,
- install_dir: join_paths (datadir, 'applications'),
- po_dir: '../po',
- type: 'desktop')
-
--i18n.merge_file ('appdata-file',
-- input: 'simple-scan.appdata.xml.in',
-+i18n.merge_file (input: 'simple-scan.appdata.xml.in',
- output: 'simple-scan.appdata.xml',
- install: true,
- install_dir: join_paths (datadir, 'metainfo'),
---
-GitLab
-
diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch
deleted file mode 100644
index 0820cee20e40..000000000000
--- a/srcpkgs/simple-scan/patches/vala-0.56.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 6 Nov 2021 19:46:07 +0100
-Subject: [PATCH] Fix accessibility conflict of constant and its value
-
----
- src/simple-scan.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/simple-scan.vala b/src/simple-scan.vala
-index c15a5418..71f32de9 100644
---- a/src/simple-scan.vala
-+++ b/src/simple-scan.vala
-@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application
- static bool show_version;
- static bool debug_enabled;
- static string? fix_pdf_filename = null;
-- public const OptionEntry[] options =
-+ const OptionEntry[] options =
- {
- { "version", 'v', 0, OptionArg.NONE, ref show_version,
- /* Help string for command line --version flag */
---
-GitLab
-
diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index 50ac5f2ea0bf..effd37a933ed 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,6 +1,6 @@
# Template file for 'simple-scan'
pkgname=simple-scan
-version=40.7
+version=42.1
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -10,5 +10,6 @@ short_desc="GTK Simple scanning utility"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/simple-scan"
+changelog="https://gitlab.gnome.org/GNOME/simple-scan/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7c551852cb5af7d34aa989f8ad5ede3cbe31828cf8dd5aec2b2b6fdcd1ac3d53
+checksum=859bc0611c1769b5bdaba9639deed359f50474c2eecf58bbbfd7ce21911b2226
From 57cc8552496e03355df46858ec5a640e06c268c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 16 Apr 2022 18:52:04 -0700
Subject: [PATCH 520/608] totem: update to 42.0
---
srcpkgs/totem/patches/meson-0.61.patch | 39 --------------------------
srcpkgs/totem/template | 11 ++++----
2 files changed, 6 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/totem/patches/meson-0.61.patch
diff --git a/srcpkgs/totem/patches/meson-0.61.patch b/srcpkgs/totem/patches/meson-0.61.patch
deleted file mode 100644
index 8f05c5c7a015..000000000000
--- a/srcpkgs/totem/patches/meson-0.61.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 61e3a957cb7339c6614e764fcf1120d967d687e9 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Thu, 6 Jan 2022 17:21:28 +0100
-Subject: [PATCH] build: Remove unused i18n.merge_file() "name"
-
-data/meson.build:78:0: ERROR: Function does not take positional arguments.
-data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments.
----
- data/appdata/meson.build | 1 -
- data/meson.build | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index c4d17e927..c2e646327 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,7 +1,6 @@
- appdata = 'org.gnome.Totem.appdata.xml'
-
- appdata_file = i18n.merge_file (
-- 'appdata',
- input: appdata + '.in',
- output: appdata,
- install: true,
-diff --git a/data/meson.build b/data/meson.build
-index b31ce755c..8eebe3db1 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -76,7 +76,6 @@ desktop_in = configure_file(
- )
-
- desktop_file = i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
---
-GitLab
-
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index bccea7f2a7c3..aed625f2f65a 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,24 +1,25 @@
# Template file for 'totem'
pkgname=totem
-version=3.38.2
-revision=2
+version=42.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
hostmakedepends="gettext itstool pkg-config gstreamer1 gst-plugins-base1
gst-plugins-good1 glib-devel"
-makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
+makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel libhandy1-devel
evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
gst-plugins-ugly1 libSM-devel libXtst-devel libepc-devel libpeas-devel
nautilus-devel zeitgeist-devel gst-plugins-base1-devel"
-depends="grilo-plugins gst-libav gst-plugins-good1 gst-plugins-ugly1 tracker3"
+depends="grilo-plugins gst-libav gst-plugins-good1 gst-plugins-ugly1 tracker"
checkdepends="xvfb-run"
short_desc="GNOME integrated movie player based on Gstreamer"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Videos"
+changelog="https://gitlab.gnome.org/GNOME/totem/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce562e2b26cbcfc0c678538dcc81f9dc15ce60d5a89ee4358907bf634304c40
+checksum=4af0491ddb95df8b33aee399d3a50f9c7ab17de88d3af63356567cf88f57e6ab
make_check_pre="xvfb-run"
# XXX xulrunner plugin.
From b003aaf9469f4be401eb6b6c053969290578e868 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:02:53 -0700
Subject: [PATCH 521/608] evince: update to 42.3.
---
srcpkgs/evince/patches/docs-cross.patch | 28 +++++++++++++
srcpkgs/evince/patches/meson-0.61.patch | 52 -------------------------
srcpkgs/evince/template | 27 +++++++------
3 files changed, 43 insertions(+), 64 deletions(-)
create mode 100644 srcpkgs/evince/patches/docs-cross.patch
delete mode 100644 srcpkgs/evince/patches/meson-0.61.patch
diff --git a/srcpkgs/evince/patches/docs-cross.patch b/srcpkgs/evince/patches/docs-cross.patch
new file mode 100644
index 000000000000..dbb8ce7324b4
--- /dev/null
+++ b/srcpkgs/evince/patches/docs-cross.patch
@@ -0,0 +1,28 @@
+From 26051aa87e50e075e3acd87c9a698f2026efb5f7 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 6 Jul 2022 12:47:04 +0200
+Subject: [PATCH] build: fix docs cross build
+
+gi-docgen is a binary that runs on the host, so the meson should search
+for it on the host
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index b5dbea53a..1e3115f05 100644
+--- a/meson.build
++++ b/meson.build
+@@ -169,7 +169,8 @@ m_dep = cc.find_library('m')
+
+ gidocgen_dep = dependency('gi-docgen', version: '>= 2021.1',
+ fallback: ['gi-docgen', 'dummy_dep'],
+- required: get_option('gtk_doc'))
++ required: get_option('gtk_doc'),
++ native: true)
+
+ # Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with
+ # cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi,
+--
+GitLab
+
diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch
deleted file mode 100644
index baed9dc1af8f..000000000000
--- a/srcpkgs/evince/patches/meson-0.61.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:22:45 +0800
-Subject: [PATCH] Remove incorrect args for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments for
-a time and explicitly rejects with error since meson 0.60.0
----
- backend/meson.build | 1 -
- data/meson.build | 1 -
- meson.build | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/backend/meson.build b/backend/meson.build
-index e44c1d6d7..ab3df9acf 100644
---- a/backend/meson.build
-+++ b/backend/meson.build
-@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
- )
-
- i18n.merge_file(
-- appstream,
- input: appstream_in,
- output: appstream,
- po_dir: po_dir,
-diff --git a/data/meson.build b/data/meson.build
-index 8a308b853..afc302098 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -15,7 +15,6 @@ foreach desktop: desktops
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
-diff --git a/meson.build b/meson.build
-index 34c86661f..f74efb3c4 100644
---- a/meson.build
-+++ b/meson.build
-@@ -492,7 +492,6 @@ install_headers(
- appdata = ev_namespace + '.appdata.xml'
-
- i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 1fbba2b8c8bc..228f202a23b2 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,14 +1,13 @@
# Template file for 'evince'
pkgname=evince
-version=41.3
+version=42.3
revision=1
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
- -Dcomics=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled
- -Dt1lib=disabled"
-hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
- itstool pkg-config perl-XML-Parser appstream-glib"
+ -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled"
+hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen)
+ glib-devel itstool pkg-config perl-XML-Parser appstream-glib"
# XXX missing packages for DVI backend.
makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
libgxps-devel libsecret-devel libspectre-devel nautilus-devel
@@ -18,15 +17,19 @@ short_desc="GNOME Document viewer for multiple document formats"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evince"
+changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0
+checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e
build_options="gir gtk_doc"
-build_options_default="gir"
+build_options_default="gir gtk_doc"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
+pre_build() {
+ # help gi-docgen find gi files on cross
+ if [ -n "$CROSS_BUILD" ]; then
+ export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+ fi
+}
libevince_package() {
short_desc+=" - runtime libraries"
@@ -39,14 +42,14 @@ libevince_package() {
}
evince-devel_package() {
- depends="gtk+3-devel libevince>=${version}_${revision}"
+ depends="gtk+3-devel libglib-devel libevince>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
+ vmove usr/share/doc
fi
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
From d59cb59f8f909e1432f289d7bae7298273356625 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:54:34 -0700
Subject: [PATCH 522/608] yelp: update to 42.0
---
srcpkgs/yelp/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index f921e1c76c63..ee51f61289ca 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,28 +1,27 @@
# Template file for 'yelp'
pkgname=yelp
-version=41.2
+version=42.1
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl"
+ libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
short_desc="Help browser for GNOME desktop"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp"
# change this when it moves to a new major release
-changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5
+checksum=25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41
yelp-devel_package() {
depends="yelp-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
}
}
From 530615544e4a9d89a23d22f8cc08db85ba4fef85 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:34 -0700
Subject: [PATCH 523/608] yelp-xsl: update to 42.0
---
srcpkgs/yelp-xsl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 1858aeba250c..8a44b352bfe1 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,10 +1,10 @@
# Template file for 'yelp-xsl'
# keep up to date with yelp
pkgname=yelp-xsl
-version=41.1
+version=42.0
revision=1
build_style=gnu-configure
-hostmakedepends="pkg-config intltool itstool libxslt"
+hostmakedepends="pkg-config gettext itstool libxslt"
makedepends="libxslt-devel"
short_desc="Help browser for GNOME desktop - XSL and misc files"
maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54
+checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846
From cdb6b55a9f7afdc44e8892bf3bca168165abf738 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:29:52 -0700
Subject: [PATCH 524/608] yelp-tools: update to 42.0
---
srcpkgs/yelp-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index ac7dd742357f..8ce722e9b5f2 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,6 +1,6 @@
# Template file for 'yelp-tools'
pkgname=yelp-tools
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends="pkg-config itstool libxslt python3-lxml"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272
+checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4
From c7670c8f5ec6aa07034591b04ec8fe0fa65da062 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:59:38 -0700
Subject: [PATCH 525/608] gsettings-desktop-schemas: update to 42.0
---
srcpkgs/gsettings-desktop-schemas/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 3d841c45f8a8..1779e26f56df 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=41.0
+version=42.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,8 +11,9 @@ short_desc="Collection of GSettings schemas"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
+changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed
+checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
# Package build options
build_options="gir"
From d1f42edf8827e2fe71f9e9a5716a8f85d5666fd2 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:40:26 -0700
Subject: [PATCH 526/608] libportal: update to 0.6
---
common/shlibs | 4 +-
srcpkgs/libportal-gtk3 | 1 +
srcpkgs/libportal-gtk3-devel | 1 +
srcpkgs/libportal-gtk4 | 1 +
srcpkgs/libportal-gtk4-devel | 1 +
srcpkgs/libportal/template | 80 ++++++++++++++++++++++++++++++------
6 files changed, 75 insertions(+), 13 deletions(-)
create mode 120000 srcpkgs/libportal-gtk3
create mode 120000 srcpkgs/libportal-gtk3-devel
create mode 120000 srcpkgs/libportal-gtk4
create mode 120000 srcpkgs/libportal-gtk4-devel
diff --git a/common/shlibs b/common/shlibs
index 8064f62c7a02..7a0259426425 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3924,7 +3924,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1
libhidrd_fmt.so.0 hidrd-0.2.0_1
libjcat.so.1 libjcat-0.1.2_1
libmatio.so.9 matio-1.5.17_2
-libportal.so.0 libportal-0.3_1
+libportal.so.1 libportal-0.6_1
+libportal-gtk3.so.1 libportal-gtk3-0.6_1
+libportal-gtk4.so.1 libportal-gtk4-0.6_1
libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
diff --git a/srcpkgs/libportal-gtk3 b/srcpkgs/libportal-gtk3
new file mode 120000
index 000000000000..2e15139a5d95
--- /dev/null
+++ b/srcpkgs/libportal-gtk3
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal-gtk3-devel b/srcpkgs/libportal-gtk3-devel
new file mode 120000
index 000000000000..2e15139a5d95
--- /dev/null
+++ b/srcpkgs/libportal-gtk3-devel
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal-gtk4 b/srcpkgs/libportal-gtk4
new file mode 120000
index 000000000000..2e15139a5d95
--- /dev/null
+++ b/srcpkgs/libportal-gtk4
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal-gtk4-devel b/srcpkgs/libportal-gtk4-devel
new file mode 120000
index 000000000000..2e15139a5d95
--- /dev/null
+++ b/srcpkgs/libportal-gtk4-devel
@@ -0,0 +1 @@
+libportal
\ No newline at end of file
diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template
index 2e8cd79422b2..31228a120f12 100644
--- a/srcpkgs/libportal/template
+++ b/srcpkgs/libportal/template
@@ -1,33 +1,89 @@
# Template file for 'libportal'
pkgname=libportal
-version=0.4
+version=0.6
revision=1
build_style=meson
-configure_args="$(vopt_bool gtk_doc gtk_doc)"
-hostmakedepends="pkg-config gtk-doc glib-devel"
-makedepends="glib-devel"
+configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi) -Dbackends=gtk3,gtk4"
+hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala)
+ $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel"
short_desc="Flatpak portal library"
maintainer="q66 <daniel@octaforge.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/flatpak/libportal"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28
+checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
-build_options="gtk_doc"
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
+if [ -n "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qemu-user-static prelink-cross"
fi
libportal-devel_package() {
depends="libportal>=${version}_${revision} glib-devel"
short_desc+=" - development files"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
+ vmove usr/include/libportal
+ vmove "usr/lib/libportal.so"
+ vmove usr/lib/pkgconfig/libportal.pc
if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
+ vmove usr/share/doc
+ fi
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/Xdp-1.0.gir
+ vmove "usr/share/vala/vapi/libportal.*"
+ fi
+ }
+}
+
+libportal-gtk3_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - GTK3"
+ pkg_install() {
+ vmove "usr/lib/libportal-gtk3.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove "usr/lib/girepository-1.0/XdpGtk3*"
+ fi
+ }
+}
+
+libportal-gtk3-devel_package() {
+ depends="libportal-gtk3>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk+3-devel"
+ short_desc+=" - GTK3 - development files"
+ pkg_install() {
+ vmove usr/include/libportal-gtk3
+ vmove "usr/lib/libportal-gtk3.so"
+ vmove usr/lib/pkgconfig/libportal-gtk3.pc
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/XdpGtk3*
+ vmove "usr/share/vala/vapi/libportal-gtk3*"
+ fi
+ }
+}
+
+libportal-gtk4_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - GTK4"
+ pkg_install() {
+ vmove "usr/lib/libportal-gtk4.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove "usr/lib/girepository-1.0/XdpGtk4*"
+ fi
+ }
+}
+
+libportal-gtk4-devel_package() {
+ depends="libportal-gtk4>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk4-devel"
+ short_desc+=" - GTK4 - development files"
+ pkg_install() {
+ vmove usr/include/libportal-gtk4
+ vmove "usr/lib/libportal-gtk4.so"
+ vmove usr/lib/pkgconfig/libportal-gtk4.pc
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/XdpGtk4*
+ vmove "usr/share/vala/vapi/libportal-gtk4*"
fi
}
}
From 2b1e2def19fdb889f78ba64d74b60cfb7d567fa1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:26:08 -0700
Subject: [PATCH 527/608] nautilus: update to 42.2
---
srcpkgs/nautilus/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index b2594ca3d8d9..571013b24c7d 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,24 +1,25 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=41.2
+version=42.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
+hostmakedepends="gettext glib-devel libxslt pkg-config tracker"
makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
- libhandy1-devel libportal-devel"
+ libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
- tracker3-miners tracker3"
-checkdepends="tracker3 tracker3-miners python3-gobject dbus"
+ tracker-miners tracker"
+checkdepends="tracker tracker-miners python3-gobject dbus"
short_desc="GNOME file manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Nautilus"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+checksum=99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2
# tests timeout:
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=extended
From 54fffdced658943885c93413ec2625779b5a9dd8 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:42:41 -0700
Subject: [PATCH 528/608] gnome-todo: rebuild against libportal 0.6
---
srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++
srcpkgs/gnome-todo/template | 4 +-
2 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch
diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
new file mode 100644
index 000000000000..380c6285922e
--- /dev/null
+++ b/srcpkgs/gnome-todo/patches/libportal5.patch
@@ -0,0 +1,54 @@
+From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Thu, 18 Nov 2021 19:46:13 -0300
+Subject: [PATCH] flatpak: Adjust to libportal changes
+
+---
+ build-aux/flatpak/org.gnome.Todo.json | 3 +++
+ src/plugins/background/gtd-plugin-background.c | 2 +-
+ src/plugins/background/meson.build | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
+index 034e200c..44b83d66 100644
+--- a/build-aux/flatpak/org.gnome.Todo.json
++++ b/build-aux/flatpak/org.gnome.Todo.json
+@@ -143,6 +143,9 @@
+ {
+ "name" : "libportal",
+ "buildsystem" : "meson",
++ "config-opts" : [
++ "-Dbackends=gtk4"
++ ],
+ "sources" : [
+ {
+ "type" : "git",
+diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
+index cf48786c..f64d07aa 100644
+--- a/src/plugins/background/gtd-plugin-background.c
++++ b/src/plugins/background/gtd-plugin-background.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk4.h>
++#include <libportal-gtk4/portal-gtk4.h>
+
+ #define AUTOSTART_NOTIFICATION_ID "Gtd::BackgroundPlugin::autostart_notification"
+ #define AUTOSTART_NOTIFICATION_TIMEOUT 3 /* seconds */
+diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
+index a671a4f3..59d3635f 100644
+--- a/src/plugins/background/meson.build
++++ b/src/plugins/background/meson.build
+@@ -1,7 +1,7 @@
+ plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
+
+ plugins_deps += [
+- dependency('libportal'),
++ dependency('libportal-gtk4'),
+ ]
+
+ plugins_sources += files(
+--
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index fe2e78bab912..dc3031156c79 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-todo'
pkgname=gnome-todo
version=41.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="pkg-config glib-devel gettext itstool
$(vopt_if gir 'gobject-introspection')"
makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
- libpeas-devel libportal-devel evolution-data-server-devel"
+ libpeas-devel libportal-gtk4-devel evolution-data-server-devel"
short_desc="Task manager designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From ca2be47365323feb16572c96db146a5e4675eebc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:40:43 -0700
Subject: [PATCH 529/608] gcolor3: rebuild against libportal 0.6
---
srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++
srcpkgs/gcolor3/template | 4 +-
2 files changed, 55 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch
diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch
new file mode 100644
index 000000000000..7db2bb94ba1b
--- /dev/null
+++ b/srcpkgs/gcolor3/patches/libportal5.patch
@@ -0,0 +1,53 @@
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+ 'libportal',
+ required: true,
++ version: '>= 0.5',
+ fallback: ['libportal', 'libportal_dep'],
+ default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+ dependencies: [
+ dep_gtk,
+ dep_libportal,
++ dep_libportal_gtk3,
+ dep_lm
+ ],
+ install: true,
+--
diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template
index b07d99472705..fd95c684a674 100644
--- a/srcpkgs/gcolor3/template
+++ b/srcpkgs/gcolor3/template
@@ -1,11 +1,11 @@
# Template file for 'gcolor3'
pkgname=gcolor3
version=2.4.0
-revision=1
+revision=2
wrksrc="gcolor3-v${version}"
build_style=meson
hostmakedepends="pkg-config gettext glib-devel"
-makedepends="gtk+3-devel libportal-devel"
+makedepends="gtk+3-devel libportal-gtk3-devel"
short_desc="Color selection dialog written in GTK+3"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
From 6adc53b4042eacd40ab0358703ca46f10a27ef92 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:58 -0700
Subject: [PATCH 530/608] gnome-builder: update to 42.1
---
srcpkgs/gnome-builder/patches/format-bug.diff | 11 -----------
srcpkgs/gnome-builder/template | 10 +++++-----
2 files changed, 5 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/gnome-builder/patches/format-bug.diff
diff --git a/srcpkgs/gnome-builder/patches/format-bug.diff b/srcpkgs/gnome-builder/patches/format-bug.diff
deleted file mode 100644
index cc86932a9155..000000000000
--- a/srcpkgs/gnome-builder/patches/format-bug.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c.orig 2022-01-21 08:41:29.263933575 +0100
-+++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c 2022-01-21 08:42:52.177180207 +0100
-@@ -597,7 +597,7 @@ is_known_worker (GTask *task,
- }
-
- finish:
-- g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size);
-+ g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size);
- ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task),
- g_steal_pointer (&state->invocation),
- found,
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 93559b21774f..67de24f18938 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=41.3
+version=42.1
revision=1
build_style=meson
build_helper=qemu
@@ -10,17 +10,17 @@ hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-intro
makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- python3-gobject-devel sysprof-devel glade3-devel libportal-devel cmark-devel"
+ libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel libhandy1-devel
+ python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel cmark-devel"
depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
checkdepends="xvfb-run"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1
+checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
case "$XBPS_TARGET_MACHINE" in
*-musl)
From 408533af50be96a85d7955db76163451f5c5706e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:35:48 -0700
Subject: [PATCH 531/608] eog: update to 42.2
---
srcpkgs/eog/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 54f322ee5be3..30522c83eb5a 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,20 +1,21 @@
# Template file for 'eog'
pkgname=eog
-version=41.1
+version=42.2
revision=1
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
- librsvg-devel lcms2-devel libportal-devel"
+ librsvg-devel lcms2-devel libportal-gtk3-devel libhandy1-devel"
depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
short_desc="Eye of GNOME graphics viewer program"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
+changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9
+checksum=0e4d4a6a2ee1a240ae8b58449f02ba2c64b7f99490d0b8915d7f52c90a58045e
shlib_provides="libeog.so"
lib32disabled=yes
@@ -22,7 +23,7 @@ build_options="gir"
build_options_default="gir"
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" libglib-devel"
+ hostmakedepends+=" libglib-devel gtk-update-icon-cache"
fi
eog-devel_package() {
From 5a7f2c94e0fd48dc50437e66649309c49b519456 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:36:03 -0700
Subject: [PATCH 532/608] eog-plugins: update to 42.1
---
srcpkgs/eog-plugins/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index e590c4f61c84..cea2832f73d3 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,19 +1,20 @@
# Template file for 'eog-plugins'
pkgname=eog-plugins
-version=3.26.8
+version=42.1
revision=1
-build_style=gnu-configure
+build_style=meson
pycompile_dirs="usr/lib/eog/plugins"
-hostmakedepends="glib-devel pkg-config intltool"
-makedepends="eog-devel libgdata-devel
+hostmakedepends="glib-devel pkg-config gettext"
+makedepends="eog-devel libhandy1-devel libgdata-devel
libchamplain-devel libpeas-devel libexif-devel exempi-devel
gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
depends="eog gsettings-desktop-schemas python3-gobject"
short_desc="Eye of GNOME plugins"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
+homepage="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
+changelog="https://gitlab.gnome.org/GNOME/eog-plugins/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5
+checksum=8b7211ca145a57fd5a929afd07905de742fd150743aaa2f600d718e832ad3e5f
python_version=3
lib32disabled=yes
From 72f868ea5c8ad00260012174384eaa3f76dd2705 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:29:46 -0700
Subject: [PATCH 533/608] epiphany: update to 42.2
---
srcpkgs/epiphany/patches/meson-0.61.patch | 33 -----------------------
srcpkgs/epiphany/template | 8 +++---
2 files changed, 4 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch
diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch
deleted file mode 100644
index 1584627ca2d9..000000000000
--- a/srcpkgs/epiphany/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Wed, 24 Nov 2021 04:52:42 +0000
-Subject: [PATCH] Remove incorrect args for i18n.merge_file
-
-Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 46df3fd80..eac6b8224 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -16,7 +16,6 @@ install_data(
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop = i18n.merge_file(
-- 'desktop',
- input: configure_file(
- input: files('org.gnome.Epiphany.desktop.in.in'),
- output: 'org.gnome.Epiphany.desktop.in',
-@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
- appdata = i18n.merge_file(
-- 'appdata',
- input: configure_file(
- input: files('org.gnome.Epiphany.appdata.xml.in.in'),
- output: 'org.gnome.Epiphany.appdata.xml.in',
---
-GitLab
-
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 37b59d23b90c..88eb6d8a8800 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=41.3
+version=42.2
revision=1
build_helper="gir"
build_style=meson
@@ -9,13 +9,13 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ nettle-devel nss-devel webkit2gtk-devel libportal-gtk3-devel libsoup-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
short_desc="Intuitive GNOME web browser"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad
+checksum=92c02cf886d10d2ccff5de658e1a420eab31d20bb50e746d430e9535b485192d
From 5b43d22ea0e615c863b041e48eb6900b2bb7d5b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:31:15 -0700
Subject: [PATCH 534/608] New package: gnome-bluetooth1-3.34.5
---
common/shlibs | 2 +-
srcpkgs/gnome-bluetooth1-devel | 1 +
.../gnome-bluetooth1/patches/meson-0.61.patch | 25 +++++++++++
srcpkgs/gnome-bluetooth1/template | 42 +++++++++++++++++++
srcpkgs/gnome-bluetooth1/update | 2 +
5 files changed, 71 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/gnome-bluetooth1-devel
create mode 100644 srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
create mode 100644 srcpkgs/gnome-bluetooth1/template
create mode 100644 srcpkgs/gnome-bluetooth1/update
diff --git a/common/shlibs b/common/shlibs
index 7a0259426425..fa1bbe96c3fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -686,7 +686,7 @@ libatkmm-1.6.so.1 atkmm-2.22.1_1
libgtkmm-3.0.so.1 gtkmm-2.99.5_1
libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
-libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1
+libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth1-devel b/srcpkgs/gnome-bluetooth1-devel
new file mode 120000
index 000000000000..61c3fca4c52b
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1-devel
@@ -0,0 +1 @@
+gnome-bluetooth1
\ No newline at end of file
diff --git a/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-bluetooth1/template b/srcpkgs/gnome-bluetooth1/template
new file mode 100644
index 000000000000..a7eb602dcb2c
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/template
@@ -0,0 +1,42 @@
+# Template file for 'gnome-bluetooth1'
+pkgname=gnome-bluetooth1
+version=3.34.5
+revision=1
+wrksrc="gnome-bluetooth-${version}"
+build_helper="gir"
+build_style=meson
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
+hostmakedepends="pkg-config gettext itstool $(vopt_if gir gobject-introspection) glib-devel"
+makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
+short_desc="GNOME Bluetooth Subsystem"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
+distfiles="${GNOME_SITE}/gnome-bluetooth/${version%.*}/gnome-bluetooth-${version}.tar.xz"
+checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+
+build_options="gir"
+build_options_default="gir"
+
+post_install() {
+ # conflicts with gnome-bluetooth
+ rm ${DESTDIR}/usr/bin/bluetooth-sendto
+ rm ${DESTDIR}/usr/share/applications/bluetooth-sendto.desktop
+ rm ${DESTDIR}/usr/share/man/man1/bluetooth-sendto.1
+}
+
+gnome-bluetooth1-devel_package() {
+ depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
diff --git a/srcpkgs/gnome-bluetooth1/update b/srcpkgs/gnome-bluetooth1/update
new file mode 100644
index 000000000000..6b527006d24d
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth1/update
@@ -0,0 +1,2 @@
+pkgname="gnome-bluetooth"
+pattern="\Q$pkgname\E-\K3\.[0-9.]*[0-9](?=)"
From 123cadb9a2bece4e0594a59b1a9e8e252f9c6100 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:46:28 -0700
Subject: [PATCH 535/608] gnome-bluetooth: update to 42.1
---
common/shlibs | 1 +
.../gnome-bluetooth/patches/meson-0.61.patch | 25 -------------------
srcpkgs/gnome-bluetooth/template | 12 ++++-----
3 files changed, 7 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
diff --git a/common/shlibs b/common/shlibs
index fa1bbe96c3fa..d6a318a81250 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -687,6 +687,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1
libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
+libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
deleted file mode 100644
index c6962edd4f05..000000000000
--- a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 7 Jan 2022 12:51:22 +0100
-Subject: [PATCH] build: Fix build for newer versions of meson
-
-sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
----
- sendto/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/sendto/meson.build b/sendto/meson.build
-index 24a4e394..3e233a03 100644
---- a/sendto/meson.build
-+++ b/sendto/meson.build
-@@ -22,7 +22,6 @@ desktop_in = configure_file(
- )
-
- i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
---
-GitLab
-
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index e6861631b08d..c764e5b760fa 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-bluetooth'
pkgname=gnome-bluetooth
-version=3.34.5
+version=42.1
revision=1
build_helper="gir"
build_style=meson
configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
-makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
- gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
+hostmakedepends="pkg-config gettext itstool $(vopt_if gir gobject-introspection) glib-devel"
+makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel
+ gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel"
depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
checkdepends="python3-dbus"
short_desc="GNOME Bluetooth Subsystem"
@@ -15,13 +15,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
+checksum=d9fe5d673f27a40a86a9e23d93cb99367e7b06df51872e8ac5ecc9938e55b5eb
build_options="gir"
build_options_default="gir"
gnome-bluetooth-devel_package() {
- depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}"
+ depends="glib-devel gtk4-devel ${sourcepkg}>=${version}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 21a5946b1ac0b9864e8f9b1e6cf756d749e0b234 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 17:52:37 +0200
Subject: [PATCH 536/608] gnome-flashback: use gnome-bluetooth1
---
srcpkgs/gnome-flashback/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index fce623766e1c..8a8561df00b2 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
version=3.42.1
-revision=1
+revision=2
build_helper=gir
build_style=gnu-configure
configure_args="--with-compiz-session --enable-compile-warnings=minimum"
@@ -9,9 +9,9 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel"
makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel
libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel
- gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel
+ gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel
gsettings-desktop-schemas-devel libXxf86vm-devel"
-depends="gnome-bluetooth gnome-session gnome-settings-daemon
+depends="gnome-bluetooth1 gnome-session gnome-settings-daemon
gnome-panel gnome-themes-extra metacity"
short_desc="GNOME session with similar user experience to the GNOME 2.x series"
maintainer="shizonic <realtiaz@gmail.com>"
From 443928bb9ba7d08fdbbd7d6f1c45699e69e43ed9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:15:58 +0200
Subject: [PATCH 537/608] budgie-control-center: use gnome-bluetooth1
---
srcpkgs/budgie-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index 15d7ee0dca87..416cbf8d584b 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,12 +1,12 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.0.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel
- colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel
+ colord-devel colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel
gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel
libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel
polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel
From 5ff40150fcd3d8ab898ea35428c0fbf5bcf767a6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:15:59 +0200
Subject: [PATCH 538/608] budgie-desktop: use gnome-bluetooth1
---
srcpkgs/budgie-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 02d90c307eaf..f7b5a2b03cd3 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
- upower-devel gtk+3-devel polkit-devel gnome-bluetooth-devel gnome-menus-devel
+ upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
From f24174798e345ac5569034519545b0a98f279069 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:07 +0200
Subject: [PATCH 539/608] gnome-control-center: use gnome-bluetooth1
---
srcpkgs/gnome-control-center/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index b0811396b6e1..92b9cb3d2f4a 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
version=41.4
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dcheese=$(vopt_if cheese true false)"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
- colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
+ colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
From d4c485622598a45cbf50b4ac63f60cd2cfcb0b8e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:09 +0200
Subject: [PATCH 540/608] gnome-core: use gnome-bluetooth1
---
srcpkgs/gnome-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index bdd854c47ac9..d7a7082b7a60 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=41.0
-revision=1
+revision=2
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="q66 <daniel@octaforge.org>"
@@ -26,7 +26,7 @@ depends="
glib-networking>=2.70.0
gmime3>=3.2.7
gnome-backgrounds>=41.0
- gnome-bluetooth>=3.34.5
+ gnome-bluetooth1>=3.34.5
gnome-color-manager>=3.36.0
gnome-control-center>=41.0
gnome-desktop>=41.0
From a55a0c99b44ebda473b71024a42442083faec6cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Jul 2022 18:16:24 +0200
Subject: [PATCH 541/608] gnome-shell: use gnome-bluetooth1
---
srcpkgs/gnome-shell/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index ff60caafa4ec..77450cb127a8 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=41.5
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
@@ -11,7 +11,7 @@ makedepends="gnome-control-center-devel at-spi2-atk-devel
evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
- gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
+ gnome-bluetooth1-devel pipewire-devel gstreamer1-devel"
depends="elogind gnome-control-center gsettings-desktop-schemas upower"
checkdepends="xvfb-run mesa-dri $depends"
short_desc="GNOME core user interface"
From 0d53b7b0de515af29259cebeec30189838477caa Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:05:14 -0700
Subject: [PATCH 542/608] gnome-calculator: update to 42.2.
---
srcpkgs/gnome-calculator/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index b496cf715cc4..28411fde0009 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-calculator'
pkgname=gnome-calculator
-version=41.1
+version=42.2
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="cmake gettext glib-devel itstool pkg-config vala"
-makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel
- libmpc-devel libsoup-devel libhandy1-devel"
+hostmakedepends="cmake gettext glib-devel itstool pkg-config vala
+ gtk-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel
+ libmpc-devel libsoup-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
short_desc="GNOME calculator"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calculator"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-calculator/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34
+checksum=33dab1bca43658d66520958b0f674cb0ad3185cfd30c12e459e7f69481c5c6a0
From 2a40c9a9d5c0573b7d188ef9a9d462ab6c91af12 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:24:55 -0700
Subject: [PATCH 543/608] gnome-contacts: update to 42.0
---
srcpkgs/gnome-contacts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 7805fa837c78..ac49f9c98db4 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel
- libchamplain-devel libnotify-devel vala-devel libhandy1-devel"
+ libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel libportal-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=63e3149b5d1475b7a2698005bb5f750f3c80a735717160e39df8cfdfebfccdf0
+checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
From a2800826a5b6ebcfc157a87272419fe5aadf8404 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:37:11 -0700
Subject: [PATCH 544/608] libdazzle: update to 3.44.0
---
srcpkgs/libdazzle/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 2abd4da3cfbd..590dce06ffe5 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
# Template file for 'libdazzle'
pkgname=libdazzle
-version=3.42.0
+version=3.44.0
revision=1
build_style=meson
build_helper="gir"
@@ -16,11 +16,8 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libdazzle"
changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925
-
-do_check() {
- xvfb-run ninja -C build test
-}
+checksum=3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae
+make_check_pre="xvfb-run"
build_options="gir"
build_options_default="gir"
From f062074770aaaefbdec52299eb8d04baa189fc19 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:33:19 -0700
Subject: [PATCH 545/608] at-spi2-core: update to 2.44.0
---
srcpkgs/at-spi2-core/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index d347d5ceed64..1a9ce8bddcb8 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,6 +1,6 @@
# Template file for 'at-spi2-core'
pkgname=at-spi2-core
-version=2.42.0
+version=2.44.0
revision=1
build_style=meson
build_helper="gir"
@@ -11,21 +11,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386
+checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
+make_check=no # non-trivial dbus setup
# Package build options
build_options="gir"
build_options_default="gir"
-# non-trivial dbus setup
-do_check() {
- :
-}
-
-post_install() {
- rm -rf ${DESTDIR}/usr/lib/systemd
-}
-
at-spi2-core-devel_package() {
depends="dbus-devel libglib-devel libX11-devel libXtst-devel libXi-devel
${sourcepkg}>=${version}_${revision}"
From 2b57059224ba7a1338e40465e15c341178d34b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 6 Jul 2022 11:19:55 +0200
Subject: [PATCH 546/608] dua-cli: update to 2.17.8.
---
srcpkgs/dua-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index 01e6bb8f26c3..e1f5a167c90b 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
# Template file for 'dua-cli'
pkgname=dua-cli
-version=2.17.7
+version=2.17.8
revision=1
build_style=cargo
short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/Byron/dua-cli"
changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=6ef774e96d256bc450da201f6f69b355c88a5dc0aa8d5ef21acda9394bf18482
+checksum=fc4df99b4445ade9c44eb71c0a5f3f329066af867fcb509abf78dea4c49df8e2
post_install() {
vlicense LICENSE
From b672a3b24a765fbd126281551754420af755310c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
<sigrid@ftrv.se>
Date: Tue, 5 Jul 2022 23:56:53 +0200
Subject: [PATCH 547/608] cmus: update to 2.10.0
---
srcpkgs/cmus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 6dc8d61b8652..0fcb424ce336 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
# Template file for 'cmus'
pkgname=cmus
-version=2.9.1
-revision=2
+version=2.10.0
+revision=1
build_style=configure
configure_args="prefix=/usr LD=$CC"
hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://cmus.github.io"
distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
-checksum=6fb799cae60db9324f03922bbb2e322107fd386ab429c0271996985294e2ef44
+checksum=ff40068574810a7de3990f4f69c9c47ef49e37bd31d298d372e8bcdafb973fff
build_options="elogind"
build_options_default="elogind"
desc_option_elogind="Support MPRIS interface via elogind"
From 2a6a6882cf4e2252cce23c7b4b5e0f4f6525c92d Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Wed, 6 Jul 2022 00:38:18 +0530
Subject: [PATCH 548/608] musikcube: update to 0.98.0
---
.../patches/fix-mpris-detection.patch | 25 -------------------
srcpkgs/musikcube/template | 8 +++---
2 files changed, 4 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch
diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
deleted file mode 100644
index dc7035d06693..000000000000
--- a/srcpkgs/musikcube/patches/fix-mpris-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-In Void linux, elogind provides libsystemd
-
-diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
-index ce0eea9b..5b067671 100644
---- a/.cmake/AddOsSpecificPlugins.cmake
-+++ b/.cmake/AddOsSpecificPlugins.cmake
-@@ -6,7 +6,7 @@ endif()
-
- # systemd / MPRIS detection
- if (NOT ENABLE_MPRIS MATCHES "false")
-- find_library(LIB_SYSTEMD NAMES systemd)
-+ find_library(LIB_SYSTEMD NAMES elogind)
- if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
- message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
- message(STATUS "[mpris] setting ENABLE_MPRIS=true")
-diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
-index fdee62d2..7a941d08 100644
---- a/src/plugins/mpris/CMakeLists.txt
-+++ b/src/plugins/mpris/CMakeLists.txt
-@@ -6,4 +6,4 @@ find_package(PkgConfig)
- pkg_check_modules (SYSTEMD REQUIRED libsystemd)
-
- add_library(mpris SHARED ${mpris_SOURCES})
--target_link_libraries(mpris systemd)
-+target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 01afa616123a..2b75cbd976ea 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,11 +1,10 @@
# Template file for 'musikcube'
pkgname=musikcube
-version=0.97.0
+version=0.98.0
revision=1
build_style=cmake
make_cmd=make
-configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true
- -DENABLE_BUNDLED_TAGLIB=false"
+configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
hostmakedepends="pkg-config"
makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
@@ -16,8 +15,9 @@ short_desc="Terminal-based music player in c++"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="BSD-3-Clause"
homepage="https://musikcube.com/"
+changelog="https://raw.githubusercontent.com/clangen/musikcube/master/CHANGELOG.txt"
distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5
+checksum=a4ae9d6d0fa5ce99de2e7bbc1de75cc8638704a2284b38a51178e23bbe55499c
build_options="elogind"
desc_option_elogind="Support MPRIS interface via elogind"
build_options_default="elogind"
From 54889129f02eb6002ae8183d1c703e5932f094c6 Mon Sep 17 00:00:00 2001
From: Ishaan Bhimwal <ishaanbhimwal@protonmail.com>
Date: Wed, 6 Jul 2022 00:26:22 +0530
Subject: [PATCH 549/608] yq: update to 3.0.1 and adopt
---
srcpkgs/yq/patches/fix-test-on-ci.patch | 15 ---------------
srcpkgs/yq/template | 10 +++++-----
2 files changed, 5 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/yq/patches/fix-test-on-ci.patch
diff --git a/srcpkgs/yq/patches/fix-test-on-ci.patch b/srcpkgs/yq/patches/fix-test-on-ci.patch
deleted file mode 100644
index 3ae4d675426d..000000000000
--- a/srcpkgs/yq/patches/fix-test-on-ci.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/kislyuk/yq/issues/114
-
-diff --git a/test/test.py b/test/test.py
-index f25dced..ffa7147 100755
---- a/test/test.py
-+++ b/test/test.py
-@@ -77,7 +77,7 @@ class TestYq(unittest.TestCase):
- unusable_tty_input = mock.Mock()
- unusable_tty_input.isatty = mock.Mock(return_value=True)
-
-- self.run_yq("{}", [], expect_exit_codes={0} if sys.stdin.isatty() else {2})
-+ self.run_yq("{}", [], expect_exit_codes={0})
- self.run_yq("{}", ["."])
- self.run_yq(unusable_non_tty_input, [".", test_doc])
- self.run_yq(unusable_non_tty_input, [".", test_doc, test_doc])
diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index a57cdf99617b..b775674672ac 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -1,18 +1,18 @@
# Template file for 'yq'
pkgname=yq
-version=2.12.2
-revision=2
+version=3.0.1
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
makedepends="python3-yaml"
depends="${makedepends} python3-xmltodict python3-toml python3-argcomplete jq"
checkdepends="${depends}"
short_desc="Command-line YAML processor written in Python that wraps around jq"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ishaan Bhimwal <ishaanbhimwal@protonmail.com>"
license="Apache-2.0"
homepage="https://github.com/kislyuk/yq"
distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz"
-checksum=2f156d0724b61487ac8752ed4eaa702a5737b804d5afa46fa55866951cd106d2
+checksum=a5e61078facd7ee4222f4346b5b50c4e9cea5e9d3330f074b5ea2c203bf639b1
do_check() {
python3 test/test.py
From 2ba1410398047aabe321b887c1e68888ce3cd035 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 6 Jul 2022 09:29:19 +0200
Subject: [PATCH 550/608] kotlin-bin: update to 1.7.0.
---
srcpkgs/kotlin-bin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kotlin-bin/template b/srcpkgs/kotlin-bin/template
index d56a18e26e88..1a9cf380641b 100644
--- a/srcpkgs/kotlin-bin/template
+++ b/srcpkgs/kotlin-bin/template
@@ -1,6 +1,6 @@
# Template file for 'kotlin-bin'
pkgname=kotlin-bin
-version=1.6.10
+version=1.7.0
revision=1
archs="x86_64"
wrksrc=kotlinc
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="Apache-2.0"
homepage="https://kotlinlang.org/"
distfiles="https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"
-checksum=432267996d0d6b4b17ca8de0f878e44d4a099b7e9f1587a98edc4d27e76c215a
+checksum=f5216644ad81571e5db62ec2322fe07468927bda40f51147ed626a2884b55f9a
nostrip=yes
replaces="kotlin>=0"
From 8ba973d8b961b713c2ba10dc8999881a09862ff0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Jul 2022 17:50:17 +0200
Subject: [PATCH 551/608] syncthing: update to 1.20.3.
---
srcpkgs/syncthing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 291724cf0f59..ea9f627b49b6 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.20.2
+version=1.20.3
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
homepage="https://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=6733ae6947497ace959c56f7c491b785ec058c8592cfd9824bc37125d1f342d9
+checksum=2a00c4a4ed64f10221c01809eddbe3bac45a1b0b735c02c6702876ef77b8a702
pre_build() {
GOARCH= go generate \
From 9d1ab2c10bdbb6ec9c076dbbc65510655c004a65 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Jul 2022 18:56:38 +0200
Subject: [PATCH 552/608] scribus: revbump for libpoppler 22.07
missed in f4a78728344493c022e6f78092ca4b9f5b53d756
---
srcpkgs/scribus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 125a7d54e4cf..6dcf42390cc1 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
version=1.5.8
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
-DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"
From b559c577a42671157cad66ac3694af1a59116f8b Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 6 Jul 2022 10:36:49 -0500
Subject: [PATCH 553/608] bemenu: update to 0.6.10.
---
srcpkgs/bemenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index a0515da000a9..6a15fa4b5001 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,6 +1,6 @@
# Template file for 'bemenu'
pkgname=bemenu
-version=0.6.9
+version=0.6.10
revision=1
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
@@ -13,7 +13,7 @@ maintainer="Issam Maghni <me@concati.me>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/Cloudef/bemenu"
distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
-checksum=9cca8674ac719104333691a6298838d934bf26c5bf8624e89985c9ba6bec30a4
+checksum=9d47557ed4572fa66e6a80364b95e4dd7a588ca75fe89c68c029b7f240b56a60
bemenu-devel_package() {
depends="bemenu-${version}_${revision}"
From c3f6ca512365723e1546ee48e274a05ee26bf7f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:08:20 -0400
Subject: [PATCH 554/608] openblas: update to 0.3.20.
---
srcpkgs/openblas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index cc44d93a9ac2..e308926c5abd 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,8 +1,8 @@
# Template file for 'openblas'
pkgname=openblas
reverts="0.3.19_1"
-version=0.3.18
-revision=2
+version=0.3.20
+revision=1
wrksrc="OpenBLAS-${version}"
build_style=gnu-makefile
make_build_args="HOSTCC=gcc USE_OPENMP=1"
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
homepage="https://www.openblas.net/"
changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"
-checksum=1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb
+checksum=8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 166dcc46095e9b64da9a7f88fba12d4e660a4b1c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:38:52 -0400
Subject: [PATCH 555/608] superlu: update to 5.3.0.
---
srcpkgs/superlu/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/superlu/template b/srcpkgs/superlu/template
index 41e27d1bf1be..c9cf6ad17cb1 100644
--- a/srcpkgs/superlu/template
+++ b/srcpkgs/superlu/template
@@ -1,6 +1,6 @@
# Template file for 'superlu'
pkgname=superlu
-version=5.2.2
+version=5.3.0
revision=1
build_style=cmake
configure_args="-DUSE_XSDK_DEFAULTS=TRUE"
@@ -11,8 +11,8 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
license="BSD-3-Clause"
homepage="https://portal.nersc.gov/project/sparse/superlu/"
changelog="https://portal.nersc.gov/project/sparse/superlu/changes.html#slu_change"
-distfiles="https://portal.nersc.gov/project/sparse/superlu/superlu_${version}.tar.gz"
-checksum=470334a72ba637578e34057f46948495e601a5988a602604f5576367e606a28c
+distfiles="https://github.com/xiaoyeli/superlu/archive/v${version}.tar.gz"
+checksum=3e464afa77335de200aeb739074a11e96d9bef6d0b519950cfa6684c4be1f350
pre_configure() {
export LDFLAGS="-fPIC"
@@ -27,6 +27,8 @@ superlu-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove "usr/include"
+ vmove "usr/lib/cmake"
+ vmove "usr/lib/pkgconfig"
vmove "usr/lib/libsuperlu.so"
}
}
From 702907fc4e333a8c8a48bf17c3f535cb4b39b4d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:34:13 -0400
Subject: [PATCH 556/608] python3-setuptools: update to 63.1.0.
---
srcpkgs/python3-setuptools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 135a3d51a99c..e92f73a5b9f5 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools'
pkgname=python3-setuptools
-version=62.3.3
+version=63.1.0
revision=1
wrksrc="setuptools-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/pypa/setuptools"
changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=e7d11f3db616cda0751372244c2ba798e8e56a28e096ec4529010b803485f3fe
+checksum=16923d366ced322712c71ccb97164d07472abeecd13f3a6c283f6d5d26722793
provides="python3-distribute-${version}_1"
replaces="python3-distribute>=0"
# Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;
From 6e2f3fef22da83e2d1be4dd37a2ee9ae9dba4e33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:33:39 -0400
Subject: [PATCH 557/608] python-cffi: update to 1.15.1.
---
srcpkgs/python-cffi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 498821b07fa8..5a098995a96f 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -1,6 +1,6 @@
# Template file for 'python-cffi'
pkgname=python-cffi
-version=1.15.0
+version=1.15.1
revision=1
wrksrc="cffi-${version}"
build_style=python-module
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://cffi.readthedocs.io/"
changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954
+checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
do_check() {
# glibc libm.so is a GNU ld script that isn't properly handled
From a08ee8e54b413c10ddb7cff5f13294a42c3e4801 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:43:39 -0400
Subject: [PATCH 558/608] python3-Pillow: update to 9.2.0.
---
srcpkgs/python3-Pillow/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index 4162a5134214..418cb33f2ad2 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
# Template file for 'python3-Pillow'
pkgname=python3-Pillow
-version=9.1.1
+version=9.2.0
revision=1
wrksrc="Pillow-${version}"
build_style=python3-module
@@ -15,7 +15,7 @@ license="custom:PIL"
homepage="https://python-pillow.org"
changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0
+checksum=75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04
post_install() {
vlicense LICENSE
From 06462828ccbf5de355ae02d9edde8271d61c6df7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:45:05 -0400
Subject: [PATCH 559/608] python3-setuptools_scm: update to 7.0.4.
---
srcpkgs/python3-setuptools_scm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-setuptools_scm/template b/srcpkgs/python3-setuptools_scm/template
index 7b4375ef5b2b..11ddc58693c9 100644
--- a/srcpkgs/python3-setuptools_scm/template
+++ b/srcpkgs/python3-setuptools_scm/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools_scm'
pkgname=python3-setuptools_scm
-version=7.0.2
+version=7.0.4
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/pypa/setuptools_scm"
distfiles="${PYPI_SITE}/s/setuptools_scm/setuptools_scm-${version}.tar.gz"
-checksum=53afbaa882f43e5ec8e14f2d93b9c268dc62eb3f6cc8b2790f8cb97903e53c02
+checksum=c27bc1f48593cfc9527251f1f0fc41ce282ea57bbc7fd5a1ea3acb99325fab4c
# Tests seem to fail unless package is installed
make_check=no
From 5ef8b10af855a0fa8b2165b4ae614cffad6c017b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:52:47 -0400
Subject: [PATCH 560/608] python3-setuptools-rust: update to 1.4.1.
---
srcpkgs/python3-setuptools-rust/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 19b7dea26647..017773d42556 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,10 +1,10 @@
# Template file for 'python3-setuptools-rust'
pkgname=python3-setuptools-rust
-version=1.3.0
+version=1.4.1
revision=1
wrksrc="${pkgname#python3-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-semanticversion python3-setuptools python3-typing_extensions"
short_desc="Setuptools plugin for Rust support"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/PyO3/setuptools-rust"
changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=958c5bf4ab6483d59dab888538121871cc5006354a42fb0fbd50acf03caad1de
+checksum=18ff850831f58ee21d5783825c99fad632da21e47645e9427fd7dec048029e76
# Tests have unpackaged dependencies
make_check=no
From e530e65ab5b41d302514236e1bc10cbfe8687c1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Jul 2022 13:53:23 -0400
Subject: [PATCH 561/608] python3-ultrajson: update to 5.4.0.
---
srcpkgs/python3-ultrajson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 5cf771ad59d7..a14fb97da706 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,19 +1,19 @@
# Template file for 'python3-ultrajson'
pkgname=python3-ultrajson
-version=5.3.0
+version=5.4.0
revision=1
wrksrc="ujson-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
makedepends="python3-devel"
depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest-xdist"
short_desc="Ultra fast JSON encoder and decoder for Python"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://github.com/ultrajson/ultrajson"
distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=ab938777b3ac0372231ee654a7f6a13787e587b1ca268d8aa7e6fb6846e477d0
+checksum=6b953e09441e307504130755e5bd6b15850178d591f66292bba4608c4f7f9b00
export UJSON_BUILD_NO_STRIP=1
From ace974f7936d8df3c96b10eaf826ee98ce918660 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:29:32 -0400
Subject: [PATCH 562/608] python3-cryptography_vectors: update to 37.0.4.
---
srcpkgs/python3-cryptography_vectors/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index e626eebdca96..3c59f21bfde6 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography_vectors'
pkgname=python3-cryptography_vectors
-version=37.0.2
+version=37.0.4
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=7c65d3de51756f418142df605417ec2c6e961c364f70cc8a103030889d5a3219
+checksum=5a61400510e28937a5654b40c6ea4e3e593c5aaf0c2081c5b912f0e7cf883ea8
post_install() {
vlicense LICENSE
From 856487b34ffbb88931e4dcd19f195e5621ec36e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 16:03:43 -0400
Subject: [PATCH 563/608] python3-cryptography: update to 37.0.4.
---
srcpkgs/python3-cryptography/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 887798a162cc..7642394970de 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography'
pkgname=python3-cryptography
-version=37.0.2
+version=37.0.4
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -18,7 +18,7 @@ license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e
+checksum=63f9c17c0e2474ccbebc9302ce2f07b55b3b3fcb211ded18a42d5764f5c10a82
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
From c86fcdde423d131da6e85f1d0749f320637d376f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:26:16 -0400
Subject: [PATCH 564/608] cpp-utilities: update to 5.17.0.
---
srcpkgs/cpp-utilities/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 1a3de9251d4e..6a55fae02b02 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
# Template file for 'cpp-utilities'
pkgname=cpp-utilities
-version=5.16.0
+version=5.17.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/cpp-utilities"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=6bb14ed60e3f84ac53cce4c5a16945d7295f49ee9019a29874a59265db6908c3
+checksum=05663fa9ca188cd7be44dc06f1257cfb39b0721443b158a5bbfdaf6400e66505
cpp-utilities-devel_package() {
short_desc+=" - development files"
From 8809436a3b5bfd33836bef7b4070557a4aa41303 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:26:42 -0400
Subject: [PATCH 565/608] tagparser: update to 11.3.0.
---
srcpkgs/tagparser/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 6849cc503475..ea331454f5b9 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
# Template file for 'tagparser'
pkgname=tagparser
-version=11.2.1
+version=11.3.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/tagparser"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=daa881d2416bdcfac5c086b5e8ce780103477cf6bc11e71d75798f5ba5422c65
+checksum=5c89fae9d87b94225e585acda58072ae24e09f3af87e5af742ec077d78230e9f
tagparser-devel_package() {
short_desc+=" - development files"
From 7086f544f99f66f66b719d20e25c2e6b1ce30336 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:28:25 -0400
Subject: [PATCH 566/608] tageditor: update to 3.7.3.
---
srcpkgs/tageditor/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5e1fe1435f4e..6951a161f585 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
# Template file for 'tageditor'
pkgname=tageditor
-version=3.7.2
+version=3.7.3
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/tageditor"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=cf79b42b03dfc3efeba01781c816dd47aff66df9c0fe8aa773bad2d3f1ca0738
+checksum=8cf16a501dff186c6fee2d2397075269666704e20bf7ce43ecc8fa80e5d2df35
build_options="qt webengine webkit script"
build_options_default="qt"
From 5efe480d1ac9f3387bc47473788a105f675f9679 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 09:28:57 -0400
Subject: [PATCH 567/608] vkQuake: update to 1.20.2.
---
srcpkgs/vkQuake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 7af2e754d21a..17a28e32a995 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
# Template file for 'vkQuake'
pkgname=vkQuake
-version=1.20.1
+version=1.20.2
revision=1
build_wrksrc="Quake"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/Novum/vkQuake"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=81ec663afba5d88e298d27cfeef5cdf40bc1aeb1d6683f13ae32021701543283
+checksum=d2ce37a4991cd1e59915d40055a86af73c934d7c43dfabeb94d3fd568b73131a
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 607f1cd783d2dab9dd5e99226a0c67ff18af449e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Jul 2022 16:39:42 -0400
Subject: [PATCH 568/608] Revert "python3-setuptools-rust: update to 1.4.1."
This version breaks cross-compilation of python3-cryptography; reverting
until this is figured out.
This reverts commit d8040ec3879320a22530d2728d3bd285377847c8.
---
srcpkgs/python3-setuptools-rust/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 017773d42556..7c91b644872a 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,10 +1,11 @@
# Template file for 'python3-setuptools-rust'
pkgname=python3-setuptools-rust
-version=1.4.1
-revision=1
+reverts="1.4.1_1"
+version=1.3.0
+revision=2
wrksrc="${pkgname#python3-}-${version}"
-build_style=python3-pep517
-hostmakedepends="python3-setuptools_scm python3-wheel"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
depends="python3-semanticversion python3-setuptools python3-typing_extensions"
short_desc="Setuptools plugin for Rust support"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
@@ -12,7 +13,7 @@ license="MIT"
homepage="https://github.com/PyO3/setuptools-rust"
changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=18ff850831f58ee21d5783825c99fad632da21e47645e9427fd7dec048029e76
+checksum=958c5bf4ab6483d59dab888538121871cc5006354a42fb0fbd50acf03caad1de
# Tests have unpackaged dependencies
make_check=no
From d847da4ffd53d20e5e1262fa39a011ca9847cec3 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:01:19 -0700
Subject: [PATCH 569/608] xdg-desktop-portal-gtk: update to 1.14.0
---
srcpkgs/xdg-desktop-portal-gtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template
index 7517d1b32d8d..fac85b7eb1a1 100644
--- a/srcpkgs/xdg-desktop-portal-gtk/template
+++ b/srcpkgs/xdg-desktop-portal-gtk/template
@@ -1,18 +1,18 @@
# Template file for 'xdg-desktop-portal-gtk'
pkgname=xdg-desktop-portal-gtk
-version=1.8.0
+version=1.14.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext"
makedepends="flatpak-devel gtk+3-devel libxslt-devel libglib-devel
- xdg-desktop-portal gnome-desktop-devel"
+ xdg-desktop-portal gsettings-desktop-schemas-devel"
depends="xdg-desktop-portal"
short_desc="Portal backend service for Flatpak using GTK+"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/flatpak/xdg-desktop-portal-gtk"
distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f
+checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954
post_install() {
rm -rf "${DESTDIR}/usr/lib/systemd"
From 3a7fa41ed254d5a74e1336016c51789428a00a98 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:25:46 -0700
Subject: [PATCH 570/608] New package: xdg-desktop-portal-gnome-42.3
---
srcpkgs/xdg-desktop-portal-gnome/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
new file mode 100644
index 000000000000..8002ddcc399c
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -0,0 +1,18 @@
+# Template file for 'xdg-desktop-portal-gnome'
+pkgname=xdg-desktop-portal-gnome
+version=42.3
+revision=1
+build_style=meson
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+makedepends="gtk4-devel libadwaita-devel libglib-devel
+ gnome-desktop-devel gsettings-desktop-schemas-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus"
+short_desc="GNOME portal backend for xdg-desktop-portal"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4ed105a667e46325467103dc7346d2023faec1d5ec153bd17316da938f53ace0
From 86d25c99206308b817a6a29f3e63f57520ae7c30 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:32:28 -0700
Subject: [PATCH 571/608] adwaita-icon-theme: update to 42.0
---
srcpkgs/adwaita-icon-theme/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index a60f4a865de9..983ae9b69d55 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=41.0
+version=42.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba
+checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
From 6824bc224777941fbbc88e3276fb650281836eac Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:34:11 -0700
Subject: [PATCH 572/608] baobab: update to 42.0
---
srcpkgs/baobab/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 259cc5bcf1a1..23e3372ea262 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
# Template file for 'baobab'
pkgname=baobab
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
+makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel"
depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
short_desc="Graphical directory tree analyzer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later"
homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855
+checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc
From 126b483e31651b89a334a82b36ad096d56d0ec21 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:41:54 -0700
Subject: [PATCH 573/608] gnome-core: update to 42.0
---
srcpkgs/gnome-core/template | 64 ++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index d7a7082b7a60..3e3ba6137b6c 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=41.0
-revision=2
+version=42.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="q66 <daniel@octaforge.org>"
@@ -9,44 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
depends="
- adwaita-icon-theme>=41.0
- at-spi2-core>=2.42.0
+ adwaita-icon-theme>=${version}
+ at-spi2-core>=2.44.0
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.42.0
- folks>=0.14.0
+ evolution-data-server>=3.${version}
+ folks>=0.15.4
font-adobe-source-code-pro>=2.030R
- gcr>=3.40.0
- gdm>=41.0
+ gcr>=3.41.0
+ gdm>=${version}
geocode-glib>=3.26.2
gfbgraph>=0.2.4
- gjs>=1.70.0
- glib>=2.70.0
- glib-networking>=2.70.0
- gmime3>=3.2.7
- gnome-backgrounds>=41.0
- gnome-bluetooth1>=3.34.5
+ gjs>=1.72.0
+ glib>=2.72.0
+ glib-networking>=2.72.0
+ gmime>=3.2.7
+ gnome-backgrounds>=${version}
+ gnome-bluetooth>=${version}
gnome-color-manager>=3.36.0
- gnome-control-center>=41.0
- gnome-desktop>=41.0
- gnome-initial-setup>=41.0
+ gnome-control-center>=${version}
+ gnome-desktop>=${version}
+ gnome-initial-setup>=${version}
gnome-keyring>=40.0
- gnome-online-accounts>=3.40.0
+ gnome-online-accounts>=3.44.0
gnome-online-miners>=3.34.0
- gnome-session>=40.1.1
- gnome-settings-daemon>=41.0
- gnome-shell>=41.0
- gnome-shell-extensions>=41.0
- gnome-themes-standard>=3.28
- gnome-user-docs>=41.0
+ gnome-session>=${version}
+ gnome-settings-daemon>=${version}
+ gnome-shell>=${version}
+ gnome-shell-extensions>=${version}
+ gnome-themes-extra>=3.28
+ gnome-user-docs>=${version}
gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=41.0
- gvfs>=1.48.1
- mutter>=41.0
- nautilus>=41.0
+ gsettings-desktop-schemas>=${version}
+ gvfs>=1.50.0
+ mutter>=${version}
+ nautilus>=${version}
sushi>=41.0
- tracker3>=3.2.1
- yelp>=41.1
- xdg-desktop-portal-gtk>=1.8.0
- zenity>=3.41.0"
+ tracker>=3.3.0
+ yelp>=${version}
+ xdg-desktop-portal-gnome>=${version}
+ zenity>=3.${version}"
From 37feec53f428c849a4e62682057ce538803754a4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:03:43 -0700
Subject: [PATCH 574/608] gnome: update to 42.0
---
srcpkgs/gnome/template | 57 +++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 0b2910094713..7860bb3cd09f 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=41.0
-revision=2
+version=42.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -11,69 +11,68 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=${version}
+ cheese>=41.1
eog>=${version}
evince>=${version}
- file-roller>=3.40.0
- gedit>=40.1
+ file-roller>=3.${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
- gnome-clocks>=40.0
+ gnome-clocks>=${version}
gnome-contacts>=${version}
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-screenshot>=40.0
gnome-system-monitor>=${version}
gnome-terminal>=3.${version}
- gnome-tweaks>=40.0
+ gnome-text-editor>=${version}
+ gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.9.1
+ gspell>=1.10.0
mousetweaks>=3.32.0
- network-manager-applet>=1.24.0
orca>=${version}
phodav>=2.5
- simple-scan>=40.5
- totem>=3.38.2"
+ simple-scan>=${version}
+ totem>=${version}"
_apps_depends="
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=41.2
epiphany>=${version}
- evolution>=3.42.0
- ghex>=3.18.4
- gitg>=3.32.1
- gedit-plugins>=40.1
+ evolution>=3.44.0
+ ghex>=${version}
+ gitg>=41
gnome-books>=40.0
gnome-boxes>=${version}
gnome-builder>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
+ gnome-connections>=${version}
gnome-characters>=${version}
- gnome-clocks>=40.0
+ gnome-clocks>=${version}
gnome-dictionary>=40.0
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
gnome-music>=${version}
- gnome-nettool>=3.8.1
- gnome-photos>=40.0
- gnome-recipes>=2.0.2
- gnome-screenshot>=40.0
- gnome-sound-recorder>=40.0
+ gnome-nettool>=${version}
+ gnome-photos>=${version}
+ gnome-recipes>=2.0.4
+ gnome-screenshot>=41.0
+ gnome-sound-recorder>=${version}
gnome-system-monitor>=${version}
- gnome-terminal>=3.41.0
- gnome-todo>=3.28.1
- gnote>=40.2
- nemiver>=0.9.6
+ gnome-terminal>=3.${version}
+ gnome-text-editor>=${version}
+ gnome-todo>=41.0
+ gnote>=${version}
+ network-manager-applet>=1.24.0
polari>=3.38.0
rygel>=0.40.2
- simple-scan>=40.5
+ simple-scan>=${version}
totem>=3.38.2
vino>=3.22.0"
@@ -82,7 +81,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=$version
+ gnome-chess>=${version}
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From e25057cfda4d7aa99fe167be669163a39a2c4a4d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:43:30 -0700
Subject: [PATCH 575/608] libgweather: update to 4.0.0
---
common/shlibs | 2 +-
.../patches/fix-cross-introspection.patch | 14 +++++
...metar-test-dont-use-known-duplicates.patch | 51 +++++++++++++++++++
srcpkgs/libgweather/template | 20 +++++---
srcpkgs/libgweather/update | 1 +
5 files changed, 80 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/fix-cross-introspection.patch
create mode 100644 srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch
diff --git a/common/shlibs b/common/shlibs
index d6a318a81250..7dd4039d1ba3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1129,7 +1129,7 @@ libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
libsecret-1.so.0 libsecret-0.10_1
-libgweather-3.so.16 libgweather-3.34.0_1
+libgweather-4.so.0 libgweather-4.0.0_1
libgnomekbd.so.8 libgnomekbd-3.6.0_1
libgnomekbdui.so.8 libgnomekbd-3.6.0_1
libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
new file mode 100644
index 000000000000..fbec0c3317fa
--- /dev/null
+++ b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
@@ -0,0 +1,14 @@
+diff --git a/libgweather/meson.build b/libgweather/meson.build
+index 08311af4..ef554f2e 100644
+--- a/libgweather/meson.build
++++ b/libgweather/meson.build
+@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4',
+ )
+
+ g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'))
+-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
++build_gir = get_option('introspection') and g_ir_scanner.found()
+
+ enable_vala = get_option('enable_vala')
+ vapigen = find_program('vapigen', required: enable_vala == 'true')
+
diff --git a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch
new file mode 100644
index 000000000000..5646cd24cc21
--- /dev/null
+++ b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch
@@ -0,0 +1,51 @@
+From 8b4fe0ad32bac4da47188207541b0aec3f786498 Mon Sep 17 00:00:00 2001
+From: Pierre Labastie <pierre.labastie@neuf.fr>
+Date: Sun, 10 Apr 2022 22:24:47 +0200
+Subject: [PATCH] metar test: Don't use "known" duplicates
+
+The metar list provided by NOAA contains duplicate ICAO codes.
+Those duplicates may change over time, so it does not make sense
+to use an array of known duplicates. Presently a duplicate is rejected
+when it is known, and inserted if it is not, leading to a difference
+in the number of insertions and the number of keys, so that the test
+fails. If any duplicate is rejected, the number of insertions is
+always equal to the number of keys (unless something goes wrong
+in g_hash_table_insert). And this is the default behavior for known
+duplicates anyway.
+
+Closes: https://gitlab.gnome.org/GNOME/libgweather/-/issues/168
+---
+ libgweather/tests/metar.c | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c
+index 7d6c7c04..a6fa7e79 100644
+--- a/libgweather/tests/metar.c
++++ b/libgweather/tests/metar.c
+@@ -41,20 +41,11 @@ parse_metar_stations (const char *contents)
+ continue;
+ }
+
++ /* If it is a duplicate discard it */
+ if (g_hash_table_lookup (stations_ht, station)) {
+- const char * const known_duplicates[] = {
+- "VOGO",
+- "KHQG",
+- "KOEL",
+- "KTQK",
+- "KX26",
+- NULL
+- };
+- if (g_strv_contains (known_duplicates, station)) {
+- g_free (station);
+- continue;
+- }
+ g_test_message ("Weather station '%s' already defined\n", station);
++ g_free (station);
++ continue;
+ }
+
+ g_hash_table_insert (stations_ht, station, g_strdup (line));
+--
+GitLab
+
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 857006ea8786..da1cea0e42c9 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,11 +1,14 @@
# Template file for 'libgweather'
pkgname=libgweather
-version=40.0
+reverts="40.0_1"
+version=4.0.0
revision=1
build_style=meson
build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
+configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
+ $(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)
+ $(vopt_if gtk_doc gi-docgen)"
makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
@@ -13,15 +16,15 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
+checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
-build_options="gir"
-build_options_default="gir"
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
post_patch() {
# This test requires LC_IDENTIFICATION, which is a GLIBC's extension
# And looks like we didn't ship it.
- vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c
+ vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c
}
libgweather-devel_package() {
@@ -35,5 +38,8 @@ libgweather-devel_package() {
vmove usr/share/gir-1.0
vmove usr/share/vala
fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/doc
+ fi
}
}
diff --git a/srcpkgs/libgweather/update b/srcpkgs/libgweather/update
index e69de29bb2d1..496ee53deb13 100644
--- a/srcpkgs/libgweather/update
+++ b/srcpkgs/libgweather/update
@@ -0,0 +1 @@
+ignore="40.*"
From 56b03fee5364e41b3521cd840bf88643dc392862 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:08:25 -0700
Subject: [PATCH 576/608] evolution-data-server: update to 3.44.3
---
srcpkgs/evolution-data-server/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 7d6937d97eaa..65e5fddbf24d 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,13 +1,13 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.42.3
-revision=2
+version=3.44.3
+revision=1
build_style=cmake
build_helper="gir qemu"
configure_args="-DENABLE_UOA=OFF
- -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
+ -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON
$(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
-hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel
+hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel
$(vopt_if gir vala)"
makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel
@@ -18,9 +18,9 @@ short_desc="Centralized access to appointments and contacts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d
+checksum=9043ab53f341da10315c550384a6b320430193fc8d7861dd25c4e9b2e0be425b
build_options="gir"
build_options_default="gir"
From 30c7414782d7eb490281b8b3b90428dec10cf0da Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:47:38 -0700
Subject: [PATCH 577/608] evolution: update to 3.44.3.
---
srcpkgs/evolution/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 226c884f3c53..66e9705a2d2e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,25 +1,26 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.42.3
+version=3.44.3
revision=1
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
- -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON"
+ -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
+ -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2"
hostmakedepends="intltool itstool pkg-config glib-devel"
makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
evolution-data-server-devel gspell-devel libcanberra-devel
libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
- gnome-desktop-devel libsoup-devel"
+ gnome-desktop-devel libsoup-devel cmark-devel"
depends="gnome-keyring"
short_desc="Integrated mail, addressbook and calendaring for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44629e6a02288ec100a66fd59413a068b6b9cd624bed3255aa29a166ea26d0b6
+checksum=536b11f4133df6f216f27af9a2481a19ed7ae08be2d4a13b128061c262a36499
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 93f3d5412b5b5d8bc01e801cf3597137970dcd2d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:52:15 -0700
Subject: [PATCH 578/608] evolution-ews: update to 3.44.3.
---
srcpkgs/evolution-ews/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 01b358864598..98f8323511a9 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
-version=3.42.1
+version=3.44.3
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services"
maintainer="Peter Kuchar <masaj@gmx.com>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d
+checksum=85ccaca2887af85bf048e473c7b6c42c5f5641ab05a5bc4cfcea34e2b6f5be17
From 60476090e2f373283f44ef8610a0147f07f56a6f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:53:41 -0700
Subject: [PATCH 579/608] gcr: update to 3.41.0
---
srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++
srcpkgs/gcr/template | 10 ++++-----
2 files changed, 28 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch
diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
new file mode 100644
index 000000000000..ca2660244c37
--- /dev/null
+++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch
@@ -0,0 +1,23 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e42bd6277d1b..5ab7455fb539 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,20 +1,20 @@
# Template file for 'gcr'
pkgname=gcr
-version=3.40.0
+version=3.41.0
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config
+hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh
libxslt $(vopt_if vala vala)"
-makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel
+makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel
$(vopt_if vala vala)"
depends="desktop-file-utils hicolor-icon-theme gnupg2"
short_desc="GNOME crypto package"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
-homepage="http://www.gnome.org"
+homepage="https://gitlab.gnome.org/GNOME/gcr"
distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
+checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
if [ "$CROSS_BUILD" ]; then
configure_args="-Dgtk_doc=false"
From 31d438d7af1322f8fc734279015ae11a6cad13f5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:06:44 -0700
Subject: [PATCH 580/608] gnome-settings-daemon: update to 42.2
---
.../patches/meson-0.61.patch | 38 -------------------
srcpkgs/gnome-settings-daemon/template | 7 ++--
2 files changed, 4 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
deleted file mode 100644
index b7c03ca2da63..000000000000
--- a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Wed, 26 Jan 2022 23:08:58 +0100
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
----
- plugins/power/meson.build | 1 -
- plugins/wacom/meson.build | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/plugins/power/meson.build b/plugins/power/meson.build
-index 69e619f2..014bb6da 100644
---- a/plugins/power/meson.build
-+++ b/plugins/power/meson.build
-@@ -76,7 +76,6 @@ if host_is_linux
- )
-
- i18n.merge_file(
-- policy,
- input: policy_in,
- output: policy,
- po_dir: po_dir,
-diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
-index d8dd0ec7..c00323d4 100644
---- a/plugins/wacom/meson.build
-+++ b/plugins/wacom/meson.build
-@@ -7,7 +7,6 @@ policy_in = configure_file(
- )
-
- i18n.merge_file(
-- policy,
- input: policy_in,
- output: policy,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index c8be36b2a457..24af1a5094b7 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=41.0
-revision=2
+version=42.2
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -18,8 +18,9 @@ short_desc="GNOME settings daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
+changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884
+checksum=9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 2d1cc7c8ac1f72019b75b2b8072d639b07a306e0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:07:24 -0700
Subject: [PATCH 581/608] gnome-control-center: update to 42.3
---
srcpkgs/gnome-control-center/template | 35 +++++++++++----------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 92b9cb3d2f4a..4563cb97e697 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,43 +1,36 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=41.4
-revision=2
+version=42.3
+revision=1
build_style=meson
build_helper="gir"
-configure_args="-Dcheese=$(vopt_if cheese true false)"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
- libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel
+ libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel
libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
- pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
- libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
- clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)"
+ pulseaudio-devel samba-devel tzdata upower-devel vala-devel
+ libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel
+ libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel
+ gsound-devel gcr-devel gnutls-devel"
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
- gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
+ gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
-changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9
+checksum=ce0ae3650de2af7ebcb0a7e1fc9912eddb6eff8d257f3fe50ff8b29c19341c7e
+make_check=no # needs X11 and requires altered filesystem
-build_options="cheese"
-build_options_default="cheese"
-
-desc_option_cheese="Add support for adding user account images with your webcam"
-
-# needs X11 and requires altered filesystem
-do_check() {
- :
+pre_build() {
+ # q66: racey, included from elsewhere but not dependencies
+ ninja -C build panels/network/cc-network-resources.h
}
-CFLAGS="-fcommon"
-
gnome-control-center-devel_package() {
short_desc+=" - development files"
pkg_install() {
From 2d482366bdf8460912e0f9e5f1137d72138cc9b1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:14:01 -0700
Subject: [PATCH 582/608] gnome-desktop: update to 42.2
---
common/shlibs | 3 +
srcpkgs/gnome-desktop/patches/build.patch | 18 ----
.../patches/optional_introspection.patch | 93 +++++++++++++++++++
.../patches/optionalise-gir.patch | 47 ----------
srcpkgs/gnome-desktop/template | 8 +-
5 files changed, 100 insertions(+), 69 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch
create mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch
diff --git a/common/shlibs b/common/shlibs
index 7dd4039d1ba3..a6792b61ffa6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1128,6 +1128,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
+libgnome-desktop-4.so.1 gnome-desktop-42.0_1
+libgnome-bg-4.so.1 gnome-desktop-42.0_1
+libgnome-rr-4.so.1 gnome-desktop-42.0_1
libsecret-1.so.0 libsecret-0.10_1
libgweather-4.so.0 libgweather-4.0.0_1
libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch
deleted file mode 100644
index 1f3acd965fea..000000000000
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 4f55ff078411993b782e74ea18c5c6ab35adf685
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed Aug 12 05:26:00 2020 +0200
-
- bla
-
-diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
-index 111bab3..7698672 100644
---- a/libgnome-desktop/gnome-rr.h
-+++ b/libgnome-desktop/gnome-rr.h
-@@ -28,6 +28,7 @@
- #error GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
- #endif
-
-+#include <stdint.h>
- #include <glib.h>
- #include <gdk/gdk.h>
-
diff --git a/srcpkgs/gnome-desktop/patches/optional_introspection.patch b/srcpkgs/gnome-desktop/patches/optional_introspection.patch
new file mode 100644
index 000000000000..b960ef27c588
--- /dev/null
+++ b/srcpkgs/gnome-desktop/patches/optional_introspection.patch
@@ -0,0 +1,93 @@
+From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] meson: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
+ meson_options.txt | 4 +++
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index a0fb11f8..375cf57c 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -125,17 +125,19 @@ if get_option('build_gtk4')
+ ],
+ )
+
+- libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+- export_packages: 'gnome-desktop-4',
+- namespace: 'GnomeDesktop',
+- nsversion: '4.0',
+- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+- identifier_prefix: 'Gnome',
+- symbol_prefix: 'gnome',
+- install: true,
+- )
++ if get_option('introspection')
++ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
++ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
++ export_packages: 'gnome-desktop-4',
++ namespace: 'GnomeDesktop',
++ nsversion: '4.0',
++ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++ identifier_prefix: 'Gnome',
++ symbol_prefix: 'gnome',
++ install: true,
++ )
++ endif
+
+ pkg.generate(
+ libgnome_desktop_base,
+@@ -255,17 +257,19 @@ if get_option('legacy_library')
+ ],
+ )
+
+- gnome.generate_gir(libgnome_desktop,
+- sources: introspection_sources + libgnome_desktop_headers,
+- export_packages: 'gnome-desktop-3.0',
+- namespace: 'GnomeDesktop',
+- nsversion: '3.0',
+- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+- identifier_prefix: 'Gnome',
+- symbol_prefix: 'gnome',
+- install: true
+- )
++ if get_option('introspection')
++ gnome.generate_gir(libgnome_desktop,
++ sources: introspection_sources + libgnome_desktop_headers,
++ export_packages: 'gnome-desktop-3.0',
++ namespace: 'GnomeDesktop',
++ nsversion: '3.0',
++ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
++ identifier_prefix: 'Gnome',
++ symbol_prefix: 'gnome',
++ install: true
++ )
++ endif
+
+ pkg.generate(
+ libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e17e7330..c4db6eaf 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+ type: 'boolean', value: true, description: 'Build debug tools'
+ )
+
++option('introspection',
++ type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+ type: 'feature', description: 'Udev support'
+ )
+--
+GitLab
diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
deleted file mode 100644
index ea4da3efc085..000000000000
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b44..33af6f4 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
- link_with: libgnome_desktop
- )
-
--gnome.generate_gir(libgnome_desktop,
-- sources: introspection_sources + libgnome_desktop_headers,
-- export_packages: 'gnome-desktop-3.0',
-- namespace: 'GnomeDesktop',
-- nsversion: '3.0',
-- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-- extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-- identifier_prefix: 'Gnome',
-- symbol_prefix: 'gnome',
-- install: true
--)
-+if get_option('introspection')
-+ gnome.generate_gir(libgnome_desktop,
-+ sources: introspection_sources + libgnome_desktop_headers,
-+ export_packages: 'gnome-desktop-3.0',
-+ namespace: 'GnomeDesktop',
-+ nsversion: '3.0',
-+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+ extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
-+ identifier_prefix: 'Gnome',
-+ symbol_prefix: 'gnome',
-+ install: true
-+ )
-+endif
-
- desktop_pc = pkg.generate(
- libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a1..1dbaf5d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,7 @@ option('gtk_doc',
- option('installed_tests',
- type: 'boolean', value: false, description: 'Enable installed tests'
- )
-+
-+option('introspection',
-+ type: 'boolean', value: false, description: 'Build GIR data'
-+)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index aa33c182a392..50df177b7bd0 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=41.3
+version=42.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext itstool pkg-config glib-devel"
-makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
+makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@@ -15,9 +15,9 @@ short_desc="GNOME desktop management utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
+changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
-make_check=no # needs X
+checksum=f42b14eac8d1456c2bfc1fbc97ef6afe49c8dd6f57796e8fd5feb39331ed55bd
build_options="gir"
build_options_default="gir"
From c5121a3ba2bb3ee2be21fb99ff92d306f3dd09e3 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:16:37 -0700
Subject: [PATCH 583/608] gnome-session: update to 42.0
---
srcpkgs/gnome-session/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index ff8dde48c7c0..cce39e931eb8 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=41.3
+version=42.0
revision=1
build_style=meson
configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -14,8 +14,9 @@ short_desc="GNOME session management utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-session"
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/blob/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
+checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
post_install() {
rm -rf ${DESTDIR}/tmp
From 6ef816fa4742cb20215e0bcd44d013b939bc2c44 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 14:25:25 -0700
Subject: [PATCH 584/608] gnome-shell: update to 42.3.
---
...-Fix-updating-suggestions-visibility.patch | 37 +++++++++
srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 -------------------
srcpkgs/gnome-shell/template | 15 ++--
3 files changed, 45 insertions(+), 89 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch
delete mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch b/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch
new file mode 100644
index 000000000000..b2e4df1052ae
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch
@@ -0,0 +1,37 @@
+From aca79c027483f86e85043f403321a8d8016ca007 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sun, 3 Jul 2022 16:44:39 +0200
+Subject: [PATCH] keyboard: Fix updating suggestions visibility
+
+Commit 237ba24dbeae added corresponding API to the keyboard actor,
+but ended up calling it on the KeyboardManager.
+
+Add the expected method to KeyboardManager that forwards the request
+to the keyboard.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5630
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2359>
+(cherry picked from commit eff23a87c36a6a96c9abab09ab27a4bb35ab1b1f)
+---
+ js/ui/keyboard.js | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
+index 9e5dbffbb1..e13652bdfe 100644
+--- a/js/ui/keyboard.js
++++ b/js/ui/keyboard.js
+@@ -1273,6 +1273,10 @@ var KeyboardManager = class KeyBoardManager {
+ this._keyboard.resetSuggestions();
+ }
+
++ setSuggestionsVisible(visible) {
++ this._keyboard?.setSuggestionsVisible(visible);
++ }
++
+ maybeHandleEvent(event) {
+ if (!this._keyboard)
+ return false;
+--
+GitLab
+
diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch
deleted file mode 100644
index ad3b7ef3923a..000000000000
--- a/srcpkgs/gnome-shell/patches/meson-0.61.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 23 Dec 2021 17:18:16 +0100
-Subject: [PATCH] build: Drop incorrect positional arg
-
-Unlike other targets that take a name, i18n.merge_file() does not.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
----
- data/meson.build | 2 +-
- src/calendar-server/meson.build | 2 +-
- subprojects/extensions-app/data/meson.build | 2 +-
- subprojects/extensions-app/data/metainfo/meson.build | 2 +-
- subprojects/extensions-tool/src/templates/meson.build | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index f924fdf806..76ae45c93a 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
-
- foreach desktop_file : desktop_files
-- i18n.merge_file('desktop',
-+ i18n.merge_file(
- input: configure_file(
- input: desktop_file + '.in.in',
- output: desktop_file + '.in',
-diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
-index 7363282a59..8b4ef411c8 100644
---- a/src/calendar-server/meson.build
-+++ b/src/calendar-server/meson.build
-@@ -27,7 +27,7 @@ configure_file(
- install_dir: servicedir
- )
-
--i18n.merge_file('evolution-calendar.desktop',
-+i18n.merge_file(
- input: 'evolution-calendar.desktop.in',
- output: 'evolution-calendar.desktop',
- po_dir: po_dir,
-diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
-index d7e7d4001c..4b601e8bd1 100644
---- a/subprojects/extensions-app/data/meson.build
-+++ b/subprojects/extensions-app/data/meson.build
-@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('app_id', app_id)
- desktopconf.set('prgname', prgname)
-
--i18n.merge_file('desktop',
-+i18n.merge_file(
- input: configure_file(
- input: base_id + '.desktop.in.in',
- output: desktop_file + '.in',
-diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
-index c4962c0576..a19bfa80a4 100644
---- a/subprojects/extensions-app/data/metainfo/meson.build
-+++ b/subprojects/extensions-app/data/metainfo/meson.build
-@@ -1,5 +1,5 @@
- metainfo = app_id + '.metainfo.xml'
--i18n.merge_file(metainfo,
-+i18n.merge_file(
- input: base_id + '.metainfo.xml.in',
- output: metainfo,
- po_dir: po_dir,
-diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
-index 670e2bf448..d693bfaddb 100644
---- a/subprojects/extensions-tool/src/templates/meson.build
-+++ b/subprojects/extensions-tool/src/templates/meson.build
-@@ -4,7 +4,7 @@ template_metas = [
- ]
- template_deps = []
- foreach template : template_metas
-- template_deps += i18n.merge_file(template,
-+ template_deps += i18n.merge_file(
- input: template + '.in',
- output: template,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 77450cb127a8..3d2e3c5cd8ec 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,26 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=41.5
-revision=2
+version=42.3
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
- asciidoc perl glib-devel gettext gjs-devel"
+ asciidoc perl glib-devel gettext gjs-devel gtk-update-icon-cache"
makedepends="gnome-control-center-devel at-spi2-atk-devel
evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
- gnome-bluetooth1-devel pipewire-devel gstreamer1-devel"
-depends="elogind gnome-control-center gsettings-desktop-schemas upower"
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
+depends="elogind gnome-control-center gsettings-desktop-schemas upower
+ gstreamer1-pipewire gst-plugins-good1"
checkdepends="xvfb-run mesa-dri $depends"
short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5
+checksum=964f520c28d7f412254298676f9cceed6adf81ff489ff1ded69c42987d4c1888
do_check() {
mkdir /tmp/gnome-shell-xdg
From 9941f65be31a2ed24d5150c10729325688607731 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:19:45 -0700
Subject: [PATCH 585/608] gnome-shell-extensions: update to 42.3.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 3f4be3c068de..414961a95f40 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=41.2
+version=42.3
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -10,6 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
+checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
From eae69761ec4895130968b209d833871871f30c00 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:56:12 -0700
Subject: [PATCH 586/608] gnome-backgrounds: update to 42.0
---
srcpkgs/gnome-backgrounds/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index d0cb63ab2183..46b86e2f6317 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends=gettext
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145
+checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d
From 108ca7cedf0710f3c0fbb540f429761b6f702393 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 14:26:25 -0700
Subject: [PATCH 587/608] mutter: update to 42.3.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6792b61ffa6..ab419c75c49e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2987,10 +2987,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
libcompizconfig.so.0 libcompizconfig-0.8.14_1
libemeraldengine.so.0 emerald-0.8.14_1
libhangul.so.1 libhangul-0.1.0_1
-libmutter-9.so.0 mutter-41.0_1
-libmutter-clutter-9.so.0 mutter-41.0_1
-libmutter-cogl-9.so.0 mutter-41.0_1
-libmutter-cogl-pango-9.so.0 mutter-41.0_1
+libmutter-10.so.0 mutter-42.0_1
+libmutter-clutter-10.so.0 mutter-42.0_1
+libmutter-cogl-10.so.0 mutter-42.0_1
+libmutter-cogl-pango-10.so.0 mutter-42.0_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub.so.0 libgepub-0.4_1
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index e3f7f7bf1ca8..4064972076d9 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=41.5
+version=42.3
revision=1
build_helper="gir"
build_style=meson
@@ -18,11 +18,11 @@ short_desc="Wayland display server, X11 window manager and compositor library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/"
-changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7
-shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
- libmutter-cogl-pango-9.so"
+checksum=9da3a63f90282bb59467e7d3dfdc684e70fa055357f6a2dded1db98cdcce10ba
+shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
+ libmutter-cogl-pango-10.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,9 +34,9 @@ pre_build() {
post_install() {
# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
# meant to be called with 'pkg-config --variable'
- vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
- -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+ -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
}
mutter-devel_package() {
@@ -46,7 +46,7 @@ mutter-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-9/*.gir"
+ vmove "usr/lib/mutter-10/*.gir"
vmove "usr/lib/*.so"
}
}
From 8bf02ac346b0561c3f9239aeeb3a627eb8a14ef9 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:39:20 -0700
Subject: [PATCH 588/608] gdm: update to 42.0
---
srcpkgs/gdm/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index ee14eb631908..3686c70b7404 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=41.3
+version=42.0
revision=1
build_helper="gir"
build_style=meson
@@ -14,7 +14,7 @@ configure_args="
hostmakedepends="dconf gettext itstool pkg-config"
makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
- plymouth-devel"
+ plymouth-devel libgudev-devel"
depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
conf_files="
/etc/gdm/custom.conf
@@ -47,10 +47,11 @@ fi
post_install() {
vinstall $FILESDIR/Xsession 755 etc/gdm
- vsed -i "s/pam_systemd\.so/pam_elogind.so/" $DESTDIR/etc/pam.d/*
- vsed -i '/pam_tally.so/d' \
- $DESTDIR/etc/pam.d/gdm-smartcard \
- $DESTDIR/etc/pam.d/gdm-fingerprint
+ for f in $DESTDIR/etc/pam.d/*; do
+ if grep -q "pam_systemd.so" "$f"; then
+ vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f"
+ fi
+ done
rm -rf ${DESTDIR}/tmp
# runit service
From 22038b9a4473f2a1d0185d51c6d15afa64f90ccc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:30:44 -0700
Subject: [PATCH 589/608] gnome-initial-setup: update to 42.2
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 6e7931930878..9e8a2c3824f9 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=41.4
+version=42.2
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
@@ -10,12 +10,12 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel"
+ pango-devel libhandy1-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
-changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642
+changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
From 8e6a9546cba15325924e83095164cc6ef416133d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:03:11 -0700
Subject: [PATCH 590/608] gnome-remote-desktop: update to 42.3.
---
srcpkgs/gnome-remote-desktop/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index 30e9b3b2c21f..b826155a3ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=41.2
+version=42.3
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true -Dnvenc=false
+configure_args="-Drdp=true -Dvnc=true
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config gettext glib-devel"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
- freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel"
+ freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
+ libgudev-devel nv-codec-headers"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=10151e69b648c2247c5e33d9a2ef419f4e037ee5b2bae49e6ed6aca77eb1ba58
+checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
make_check=no # xvfb failed to start
From 724e81baa76b9e9345ba021a37b49153c994cdac Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 14 Apr 2022 21:41:46 -0700
Subject: [PATCH 591/608] gnome-tweaks: update to 42.beta
---
srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 -------------------
srcpkgs/gnome-tweaks/template | 9 +++---
2 files changed, 5 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
deleted file mode 100644
index 80efde38735e..000000000000
--- a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
-From: Mae Dartmann <hello@maedartmann.name>
-Date: Wed, 16 Feb 2022 06:08:41 +0000
-Subject: [PATCH] meson: fix invalid positional argument
-
----
- data/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index fd6d5da..74f7e82 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,5 +1,5 @@
- appdata_file = 'org.gnome.tweaks.appdata.xml'
--i18n.merge_file(appdata_file,
-+i18n.merge_file(
- input: appdata_file + '.in',
- output: appdata_file,
- po_dir: '../po',
-@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
- )
-
- desktop_file = 'org.gnome.tweaks.desktop'
--i18n.merge_file(desktop_file,
-+i18n.merge_file(
- input: desktop_file + '.in',
- output: desktop_file,
- po_dir: '../po',
---
-GitLab
-
diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index e2ef4e83d274..34f1a56b9084 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,16 +1,17 @@
# Template file for 'gnome-tweaks'
pkgname=gnome-tweaks
-version=40.0
-revision=3
+version=42.beta
+revision=1
build_style=meson
-hostmakedepends="gettext"
+hostmakedepends="pkg-config gettext"
+makedepends="libhandy1-devel"
depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy1"
short_desc="GNOME tool to customize advanced options"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later, CC0-1.0"
homepage="https://wiki.gnome.org/Apps/Tweaks"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
+checksum=83f44cc1dc8adc770cdad717b403cb9a6cc3c0de50e38e6f1e678b43401ad868
replaces="gnome-tweak-tool>=0"
gnome-tweak-tool_package() {
From e0a3a684eba7ba0db64f8eefb65f851fbb6862f4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 23:45:30 -0700
Subject: [PATCH 592/608] gnome-panel: update to 3.44.0
---
srcpkgs/gnome-panel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 14bb5a03db84..2484b7e4525d 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
-version=3.42.0
+version=3.44.0
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomePanel"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea8c0efc2edba20e97ad4695179cd0a2538e64c2904702cc8c594e8e0898703
+checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa
gnome-panel-devel_package() {
depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From bb3b97f8c4f3c7845742c03ec2b6e82c24a04bea Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 23:45:44 -0700
Subject: [PATCH 593/608] gnome-flashback: update to 3.44.0
---
srcpkgs/gnome-flashback/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 8a8561df00b2..9fc5c992a7db 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
-version=3.42.1
-revision=2
+version=3.44.0
+revision=1
build_helper=gir
build_style=gnu-configure
configure_args="--with-compiz-session --enable-compile-warnings=minimum"
@@ -18,7 +18,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c8029220acf268c520dbb0750834b2ef4df868324d0e0fb6a80354c80ba8844e
+checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a
post_extract() {
vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \
From d3ce82c7c588e055f3293f759205f8bdcfe55566 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 17:26:04 -0700
Subject: [PATCH 594/608] New package: gnome-tour-42.0
---
srcpkgs/gnome-tour/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/gnome-tour/template
diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template
new file mode 100644
index 000000000000..adb289c3e0d4
--- /dev/null
+++ b/srcpkgs/gnome-tour/template
@@ -0,0 +1,15 @@
+# Template file for 'gnome-tour'
+pkgname=gnome-tour
+version=42.0
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="pkg-config cargo rust glib-devel gettext desktop-file-utils"
+makedepends="gtk4-devel libadwaita-devel libglib-devel"
+short_desc="GNOME Tour & Greeter"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/gnome-tour/"
+changelog="https://gitlab.gnome.org/GNOME/gnome-tour/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=fcf1ac689057da86596970ec3da8355521c0a72e95063eb059d5fee4dea82f4f
From 36a45cd0ddcc1e8960c3d388804c6afc58d64b3f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Mon, 18 Apr 2022 10:50:01 -0700
Subject: [PATCH 595/608] gnome-online-accounts: update to 3.44.0
---
srcpkgs/gnome-online-accounts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index bc01fc1a3081..47085810e534 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.40.1
+version=3.44.0
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -8,9 +8,9 @@ configure_args="$(vopt_enable gir introspection)
--enable-documentation --enable-backend
--enable-google --enable-kerberos --enable-flickr
--enable-facebook --disable-static --enable-exchange --enable-imap-smtp
- --enable-owncloud --enable-windows-live --enable-pocket
+ --enable-owncloud --enable-windows-live
--enable-lastfm --enable-media-server"
-hostmakedepends="docbook-xsl gettext-devel glib-devel
+hostmakedepends="docbook-xsl gettext glib-devel
libxslt pkg-config $(vopt_if gir vala)"
makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel
libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel"
@@ -19,9 +19,9 @@ short_desc="GNOME service to access online accounts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-38/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=955a03128d0e87855d34d7c534e088f6286ed7ac01baa4ef824ef42a2cb39aad
+checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
build_options="gir"
build_options_default="gir"
From e05fcf808cd54a3d4c428c80d1392869927ae54d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 21 Apr 2022 23:32:55 -0700
Subject: [PATCH 596/608] gnome-nettool: update to 42.0
---
...son-drop-unused-positional-arguments.patch | 36 +++++++++++++++++++
srcpkgs/gnome-nettool/template | 14 +++-----
2 files changed, 41 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch
diff --git a/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch b/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch
new file mode 100644
index 000000000000..332379faea8f
--- /dev/null
+++ b/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch
@@ -0,0 +1,36 @@
+From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Wed, 6 Apr 2022 13:05:25 -0400
+Subject: [PATCH] meson: drop unused positional arguments
+
+This fixes a build error with newer meson
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 585e6d3..ed1e8bb 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in',
+ output: 'gnome-nettool.desktop.in',
+ configuration: desktop_conf)
+
+-i18n.merge_file('desktop',
+- type: 'desktop',
++i18n.merge_file(type: 'desktop',
+ input: desktop_in,
+ output: 'gnome-nettool.desktop',
+ po_dir: po_dir,
+ install: true,
+ install_dir: join_paths(prefix, datadir, 'applications'))
+
+-i18n.merge_file('appdata',
+- type: 'xml',
++i18n.merge_file(type: 'xml',
+ input: 'gnome-nettool.appdata.xml.in',
+ output: 'gnome-nettool.appdata.xml',
+ po_dir: po_dir,
+--
+GitLab
+
diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index 89f5705d629c..f578e59d00ee 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-nettool'
pkgname=gnome-nettool
-version=3.8.1
-revision=6
-build_style=gnu-configure
-hostmakedepends="glib-devel intltool itstool pkg-config"
+version=42.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
@@ -13,8 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
-
-post_patch() {
- vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
+checksum=a54f29eef2038aee69551c8b19ca4f758e5eb9e2090a4bc6b5633dff0188751f
From ceffdfe95f23fdc9ee5814a92a5ad231435d2091 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:27:46 -0700
Subject: [PATCH 597/608] orca: update to 42.2.
---
srcpkgs/orca/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 298009255942..08c21b531629 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,9 +1,9 @@
# Template file for 'orca'
pkgname=orca
-version=41.1
+version=42.2
revision=1
build_style=gnu-configure
-hostmakedepends="intltool itstool pkg-config"
+hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme liblouis
python3-atspi python3-brlapi python3-dbus python3-xdg speech-dispatcher
@@ -12,8 +12,9 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1fd02b99094f09f6e72df779e1a72dce41427ec82e245a4ea83233a97eeda271
+checksum=9971e9fda1aa2bd64a76b33173135c64159a490b2c4bcffbe7b9548fedfc782c
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 53ae525eda0d26f0378ac7489170f828f494edff Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:31:30 -0700
Subject: [PATCH 598/608] gnome-clocks: update to 42.0
---
srcpkgs/gnome-clocks/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index e511f2f27e49..c2f76af5604a 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,18 +1,19 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=41.0
+version=42.0
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="pkg-config intltool itstool glib-devel vala"
+hostmakedepends="pkg-config gettext itstool glib-devel vala
+ gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
- libgweather-devel libhandy1-devel libnotify-devel gsound-devel
- geocode-glib-devel desktop-file-utils hicolor-icon-theme
- geoclue2-devel"
+ gtk4-devel libadwaita-devel libnotify-devel gsound-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
+ hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac
+checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
From 037c9c57b6377a5f38f8a679b3f1152d0e8bde7d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:32:04 -0700
Subject: [PATCH 599/608] gnome-calendar: update to 42.2
---
srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ----------
srcpkgs/gnome-calendar/template | 11 ++++++-----
2 files changed, 6 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch
deleted file mode 100644
index e2df31e0760e..000000000000
--- a/srcpkgs/gnome-calendar/patches/meson-0.61.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,7 +1,6 @@
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
- appdata = i18n.merge_file(
-- 'appdata',
- input: configure_file(
- input: files('org.gnome.Calendar.appdata.xml.in.in'),
- output: 'org.gnome.Calendar.appdata.xml.in',
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index ab83007ec7c5..cd1d201d2dfb 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,19 +1,20 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=41.2
+version=42.2
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
+hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
+ $(vopt_if gir 'gobject-introspection')"
makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
+ gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
libgweather-devel libical-devel libpeas-devel libsoup-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calendar"
-changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a
+checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
build_options="gir"
build_options_default="gir"
From f131b0ec051220bc5eacb8a6c547de5e778eef64 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:34:06 -0700
Subject: [PATCH 600/608] gnome-weather: update to 42.0
---
srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ----------
srcpkgs/gnome-weather/template | 8 ++++----
2 files changed, 4 insertions(+), 14 deletions(-)
delete mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch
deleted file mode 100644
index a305b8c54dc4..000000000000
--- a/srcpkgs/gnome-weather/patches/meson-0.61.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -59,7 +59,6 @@ endif
- appdata_conf = configuration_data()
- appdata_conf.set('app_id', weather_id)
- appdata = i18n.merge_file(
-- 'appdata',
- input: configure_file(
- input: '@0@.appdata.xml.in.in'.format(default_id),
- output: '@0@.appdata.xml.in'.format(default_id),
diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 052cae430e6d..568f10e39391 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-weather'
pkgname=gnome-weather
-version=41.0
+version=42.0
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
-depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1"
+makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel"
+depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
short_desc="Access current weather conditions and forecasts for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Weather"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee
+checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465
lib32disabled=yes
From dcf68c57d2d71ed18e89edd451946b35d2d8439c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:40:21 -0700
Subject: [PATCH 601/608] gnome-user-docs: update to 42.0
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 579bb4f407f0..773c9913d74f 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=41.2
+version=42.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a
+checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
From e33e7bc39dbf253809995f2bf72611964e90fe33 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:01 -0700
Subject: [PATCH 602/608] gnome-terminal: update to 3.44.0
---
.../gnome-terminal/patches/meson-0.61.patch | 47 -------------------
srcpkgs/gnome-terminal/template | 6 +--
2 files changed, 3 insertions(+), 50 deletions(-)
delete mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch
deleted file mode 100644
index 8b6edbb923a2..000000000000
--- a/srcpkgs/gnome-terminal/patches/meson-0.61.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@src.gnome.org>
-Date: Fri, 14 Jan 2022 11:33:32 +0100
-Subject: [PATCH] build: Fix for newer meson
-
----
- data/meson.build | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 79d97e5b..e0bcbb91 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -18,7 +18,6 @@
- metainfodir = gt_datadir / 'metainfo'
-
- i18n.merge_file(
-- gt_dns_name + '.metainfo.xml',
- input: gt_dns_name + '.metainfo.xml.in',
- output: '@BASENAME@',
- po_dir: po_dir,
-@@ -27,7 +26,6 @@ i18n.merge_file(
- )
-
- i18n.merge_file(
-- gt_dns_name + '.Nautilus.metainfo.xml',
- input: gt_dns_name + '.Nautilus.metainfo.xml.in',
- output: '@BASENAME@',
- po_dir: po_dir,
-@@ -40,7 +38,6 @@ i18n.merge_file(
- desktopdatadir = gt_datadir / 'applications'
-
- i18n.merge_file(
-- gt_dns_name + '.desktop',
- input: gt_dns_name + '.desktop.in',
- output: '@BASENAME@',
- type: 'desktop',
-@@ -57,4 +54,4 @@ meson.add_install_script(
-
- # Subdirs
-
--subdir('icons')
-\ No newline at end of file
-+subdir('icons')
---
-GitLab
-
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 4853fb46511a..f12986cc45af 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.42.2
+version=3.44.1
revision=1
build_style=meson
configure_args="-Dnautilus_extension=true -Db_ndebug=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0
+checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -23,7 +23,7 @@ fi
nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
- short_desc="gnome-terminal integration for nautilus"
+ short_desc+=" - nautilus integration"
pkg_install() {
vmove usr/lib/nautilus/extensions-3.0
}
From a92be8fbb71d97407f7f10b477479d899b3128d0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:43:16 -0700
Subject: [PATCH 603/608] gnome-maps: update to 42.3.
---
srcpkgs/gnome-maps/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 414735d1ed3f..2aa746f680de 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
-version=41.4
+version=42.3
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel
- gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel"
-depends="geoclue2 gfbgraph gjs libhandy1"
+ gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel
+ libgweather-devel"
+depends="geoclue2 gfbgraph gjs libhandy1 libgweather"
short_desc="GNOME maps application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
-changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-41/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e340b13f46fe0b7d5b0f8f01413291ddcd870c74a5c38fa24cac1f585e70393e
+checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1
From 4de11cb9bcd9ca4f0160edae03f5854188072a56 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:04:46 -0700
Subject: [PATCH 604/608] gnome-font-viewer: update to 42.0
---
.../patches/meson-0.61.patch | 40 -------------------
srcpkgs/gnome-font-viewer/template | 8 ++--
2 files changed, 4 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
deleted file mode 100644
index 072ce27fd0d2..000000000000
--- a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Thu, 30 Dec 2021 17:14:47 +0800
-Subject: [PATCH] Fix meson build with meson 0.60.0+
-
-`i18n.merge_file` has been ignoring positional arguments for a time
-and explicitly rejects with error since meson 0.60.0
----
- data/meson.build | 2 +-
- src/meson.build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index bfc9caa..8e42134 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,6 +1,6 @@
- appdatadir = join_paths(datadir, 'metainfo')
- appdata_file = 'org.gnome.font-viewer.appdata.xml'
--merged_appdata = i18n.merge_file(appdata_file,
-+merged_appdata = i18n.merge_file(
- input: appdata_file + '.in',
- output: appdata_file,
- po_dir: '../po',
-diff --git a/src/meson.build b/src/meson.build
-index f863d45..826c59b 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
- desktop_conf = configuration_data()
- desktop_conf.set('VERSION', meson.project_version())
- desktop_conf.set('APPLICATION_ID', application_id)
--i18n.merge_file(desktop_file,
-+i18n.merge_file(
- input: configure_file(input: desktop_file + '.in.in',
- output: desktop_file + '.in',
- configuration: desktop_conf),
---
-GitLab
-
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f4d7f69436ee..bdc99f9a8d8c 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=41.0
+version=42.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
-makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel libhandy1-devel"
+makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
+ gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876
+checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
From ca9b75a8ace1513af60aa09d01899561794d60ef Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:33:29 -0700
Subject: [PATCH 605/608] GPaste: update to 42.1
---
common/shlibs | 4 +++-
srcpkgs/GPaste/template | 18 +++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ab419c75c49e..f081d78cde39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1418,7 +1418,9 @@ libCHART-1.6.so.0 fox-1.6.49_1
libchromaprint.so.1 chromaprint-1.5.0_1
libedit.so.0 libedit-20130712.3.1_1
libnet.so.9 libnet-1.2_1
-libgpaste.so.13 libgpaste-3.38.2_1
+libgpaste-2.so.0 libgpaste-42.1_1
+libgpaste-gtk-3.so.0 libgpaste-42.1_1
+libgpaste-gtk4.so.0 libgpaste-42.1_1
libthreadutil.so.6 libupnp-1.6.18_1
libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index d85f71df5abe..17f2e3122ba5 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,32 +1,28 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=3.42.6
+version=42.1
revision=1
-wrksrc="gpaste-${version}"
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gnome_shell gnome-shell)
-Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings
-Dsystemd-user-unit-dir=/usr/lib/systemd"
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
-makedepends="appstream-glib-devel dbus-devel gdk-pixbuf-devel gtk+3-devel
- libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
+makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
+ libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
$(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-distfiles="https://www.imagination-land.org/files/gpaste/gpaste-${version}.tar.xz"
-checksum=1158a66c0dd32289d81eb5a3170c9c7aacd0b90ed7ac2961003d803243c476a1
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
+checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
build_options_default="gnome_shell"
-pre_build() {
- export GIR_EXTRA_LIBS_PATH="${wrksrc}/lib/.libs"
-}
-
post_install() {
vlicense COPYING
}
@@ -46,6 +42,6 @@ GPaste-devel_package() {
libgpaste_package() {
short_desc+=" - gpaste library"
pkg_install() {
- vmove "usr/lib/libgpaste.so.*"
+ vmove "usr/lib/libgpaste-*.so.*"
}
}
From f64bf77ea49d9d74b0aab6391e909b1e183403fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Jul 2022 23:31:44 +0200
Subject: [PATCH 606/608] common/shlibs: add libgnome-bluetooth-ui-3.0.so.13
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index f081d78cde39..3dda6cfafbc1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -688,6 +688,7 @@ libgdkmm-3.0.so.1 gtkmm-2.99.5_1
libgtkmm-4.0.so.0 gtkmm4-4.0.0_1
libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1
libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1
+libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.1_1
libsasl2.so.3 libsasl-2.1.26_1
liblber-2.4.so.2 libldap-2.4.21_1
libldap-2.4.so.2 libldap-2.4.21_1
From b0a4e316ea8a580be3d82308e6d2099834020f87 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Jul 2022 23:32:00 +0200
Subject: [PATCH 607/608] gnome-control-center: use gnome-bluetooth 42
---
srcpkgs/gnome-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 4563cb97e697..84ff92b93ae8 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -7,7 +7,7 @@ build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
- colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-menus-devel
+ colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel
libpwquality-devel mit-krb5-devel libnma-devel polkit-devel
From 9ee190de6cb4594536385702b317d5507e3cf730 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Jul 2022 00:55:02 +0200
Subject: [PATCH 608/608] mutter: fix undefined reference to gettid
Our musl package has a patch that should have made this patch unnecessary,
but it doesn't seem to work properly on armv6l-musl and armv7l-musl.
This should be investigated and properly fixed.
---
srcpkgs/mutter/patches/gettid.patch | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/mutter/patches/gettid.patch
diff --git a/srcpkgs/mutter/patches/gettid.patch b/srcpkgs/mutter/patches/gettid.patch
new file mode 100644
index 000000000000..d8e4e90d0bb4
--- /dev/null
+++ b/srcpkgs/mutter/patches/gettid.patch
@@ -0,0 +1,23 @@
+gettid wasn't implemented in musl until 1.2.2+
+
+diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
+index 2245387..2842593 100644
+--- a/src/backends/native/meta-backend-native.c
++++ b/src/backends/native/meta-backend-native.c
+@@ -39,6 +39,7 @@
+ #include "backends/native/meta-input-thread.h"
+
+ #include <stdlib.h>
++#include <syscall.h>
+
+ #include "backends/meta-cursor-tracker-private.h"
+ #include "backends/meta-idle-manager.h"
+@@ -231,7 +232,7 @@ meta_backend_native_post_init (MetaBackend *backend)
+
+ priority = sched_get_priority_min (SCHED_RR);
+ meta_dbus_realtime_kit1_call_make_thread_realtime_sync (rtkit_proxy,
+- gettid (),
++ (pid_t) syscall (SYS_gettid),
+ priority,
+ NULL,
+ &error);
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (4 preceding siblings ...)
2022-07-06 23:28 ` cultab
@ 2022-07-06 23:29 ` cultab
2022-07-06 23:39 ` cultab
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-07-06 23:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by cultab against master on the void-packages repository
https://github.com/cultab/void-packages master
https://github.com/void-linux/void-packages/pull/37671
New package: Junction-1.5.0
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
# This is a work in progress.
As of now it builds correctly but when run it seems to be missing a dependency.
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.
#### Made in response to issue #37352.
A patch file from https://github.com/void-linux/void-packages/pull/37671.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37671.patch --]
[-- Type: text/x-diff, Size: 1323 bytes --]
From 3f8a73b52688ebca921541f8b45cb629f4c1abe2 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Fri, 24 Jun 2022 21:32:13 +0300
Subject: [PATCH] New package: Junction-1.5.0
---
srcpkgs/Junction/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/Junction/template
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
new file mode 100644
index 000000000000..2b7c41b2da33
--- /dev/null
+++ b/srcpkgs/Junction/template
@@ -0,0 +1,24 @@
+# Template file for 'Junction'
+pkgname=Junction
+version=1.5.0
+revision=1
+#archs="i686 x86_64"
+#wrksrc=
+#create_wrksrc=yes
+build_style=meson
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
+# makedepends=""
+depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
+# checkdepends="appstream-glib"
+short_desc="Application/browser chooser"
+maintainer="cultab <rroarck@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/sonnyp/Junction"
+#changelog=""
+distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
+checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (5 preceding siblings ...)
2022-07-06 23:29 ` cultab
@ 2022-07-06 23:39 ` cultab
2022-07-06 23:42 ` cultab
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-07-06 23:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
There is an updated pull request by cultab against master on the void-packages repository
https://github.com/cultab/void-packages master
https://github.com/void-linux/void-packages/pull/37671
New package: Junction-1.5.0
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
# This is a work in progress.
As of now it builds correctly but when run it seems to be missing a dependency.
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.
#### Made in response to issue #37352.
A patch file from https://github.com/void-linux/void-packages/pull/37671.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37671.patch --]
[-- Type: text/x-diff, Size: 1145 bytes --]
From b989f3fa5906fe7762643cbfcd52e0064395038b Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Fri, 24 Jun 2022 21:32:13 +0300
Subject: [PATCH] New package: Junction-1.5.0
---
srcpkgs/Junction/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/Junction/template
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
new file mode 100644
index 000000000000..92083ebac64a
--- /dev/null
+++ b/srcpkgs/Junction/template
@@ -0,0 +1,16 @@
+# Template file for 'Junction'
+pkgname=Junction
+version=1.5.0
+revision=1
+#archs="i686 x86_64"
+build_style=meson
+hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
+depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
+# checkdepends="appstream-glib"
+short_desc="Application/browser chooser"
+maintainer="cultab <rroarck@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/sonnyp/Junction"
+#changelog=""
+distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
+checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (6 preceding siblings ...)
2022-07-06 23:39 ` cultab
@ 2022-07-06 23:42 ` cultab
2022-07-06 23:42 ` cultab
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-07-06 23:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by cultab on void-packages repository
https://github.com/void-linux/void-packages/pull/37671#issuecomment-1176860681
Comment:
After the big gnome 42 merge, it now works as expected :fireworks:.
Aside from x86_64 I also tested cross-compiling for i686 and armv7l.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (7 preceding siblings ...)
2022-07-06 23:42 ` cultab
@ 2022-07-06 23:42 ` cultab
2022-07-06 23:49 ` cultab
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-07-06 23:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by cultab on void-packages repository
https://github.com/void-linux/void-packages/pull/37671#issuecomment-1176860681
Comment:
After the big gnome 42 merge, it now works as expected :fireworks:!
Aside from x86_64 I also tested cross-compiling for i686 and armv7l.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (8 preceding siblings ...)
2022-07-06 23:42 ` cultab
@ 2022-07-06 23:49 ` cultab
2022-07-07 11:08 ` cultab
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-07-06 23:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
New comment by cultab on void-packages repository
https://github.com/void-linux/void-packages/pull/37671#issuecomment-1176860681
Comment:
After the big gnome merge and libportal's update to 0.6 in https://github.com/void-linux/void-packages/pull/36311, it now works as expected! :fireworks:
Aside from x86_64 I also tested cross-compiling for i686 and armv7l.
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (9 preceding siblings ...)
2022-07-06 23:49 ` cultab
@ 2022-07-07 11:08 ` cultab
2022-09-30 23:42 ` [PR PATCH] [Updated] " cultab
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-07-07 11:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New comment by cultab on void-packages repository
https://github.com/void-linux/void-packages/pull/37671#issuecomment-1176860681
Comment:
After the big gnome merge and libportal's update to 0.6 in https://github.com/void-linux/void-packages/pull/36311, it now works as expected! :fireworks:
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (10 preceding siblings ...)
2022-07-07 11:08 ` cultab
@ 2022-09-30 23:42 ` cultab
2022-09-30 23:49 ` cultab
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-09-30 23:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
There is an updated pull request by cultab against master on the void-packages repository
https://github.com/cultab/void-packages master
https://github.com/void-linux/void-packages/pull/37671
New package: Junction-1.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- Also successfully cross-compiled for i686 and armv7l (both glibc)
~# This is a work in progress.~
~As of now it builds correctly but when run it seems to be missing a dependency.~
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
~From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.~
#### Made in response to issue #37352.
A patch file from https://github.com/void-linux/void-packages/pull/37671.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37671.patch --]
[-- Type: text/x-diff, Size: 1111 bytes --]
From f674f0edec57f490a6f52370d12dcad753c28810 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Fri, 24 Jun 2022 21:32:13 +0300
Subject: [PATCH] New package: Junction-1.5.0
---
srcpkgs/Junction/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/Junction/template
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
new file mode 100644
index 000000000000..84a96a79692e
--- /dev/null
+++ b/srcpkgs/Junction/template
@@ -0,0 +1,15 @@
+# Template file for 'Junction'
+pkgname=Junction
+version=1.5.0
+revision=1
+#archs="i686 x86_64"
+build_style=meson
+hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
+depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
+short_desc="Application/browser chooser"
+maintainer="cultab <rroarck@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/sonnyp/Junction"
+#changelog=""
+distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
+checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (11 preceding siblings ...)
2022-09-30 23:42 ` [PR PATCH] [Updated] " cultab
@ 2022-09-30 23:49 ` cultab
2022-10-01 0:01 ` cultab
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-09-30 23:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
There is an updated pull request by cultab against master on the void-packages repository
https://github.com/cultab/void-packages master
https://github.com/void-linux/void-packages/pull/37671
New package: Junction-1.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- Also successfully cross-compiled for i686 and armv7l (both glibc)
~# This is a work in progress.~
~As of now it builds correctly but when run it seems to be missing a dependency.~
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
~From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.~
#### Made in response to issue #37352.
A patch file from https://github.com/void-linux/void-packages/pull/37671.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37671.patch --]
[-- Type: text/x-diff, Size: 1111 bytes --]
From f674f0edec57f490a6f52370d12dcad753c28810 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Fri, 24 Jun 2022 21:32:13 +0300
Subject: [PATCH] New package: Junction-1.5.0
---
srcpkgs/Junction/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/Junction/template
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
new file mode 100644
index 000000000000..84a96a79692e
--- /dev/null
+++ b/srcpkgs/Junction/template
@@ -0,0 +1,15 @@
+# Template file for 'Junction'
+pkgname=Junction
+version=1.5.0
+revision=1
+#archs="i686 x86_64"
+build_style=meson
+hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
+depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
+short_desc="Application/browser chooser"
+maintainer="cultab <rroarck@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/sonnyp/Junction"
+#changelog=""
+distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
+checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (12 preceding siblings ...)
2022-09-30 23:49 ` cultab
@ 2022-10-01 0:01 ` cultab
2022-10-03 12:25 ` cultab
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-10-01 0:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
There is an updated pull request by cultab against master on the void-packages repository
https://github.com/cultab/void-packages master
https://github.com/void-linux/void-packages/pull/37671
New package: Junction-1.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- Also successfully cross-compiled for i686 and armv7l (both glibc)
~# This is a work in progress.~
~As of now it builds correctly but when run it seems to be missing a dependency.~
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
~From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.~
#### Made in response to issue #37352.
A patch file from https://github.com/void-linux/void-packages/pull/37671.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37671.patch --]
[-- Type: text/x-diff, Size: 1111 bytes --]
From 551c38f03a60e077172cd1c850fd1d188be7a359 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Fri, 24 Jun 2022 21:32:13 +0300
Subject: [PATCH] New package: Junction-1.5.0
---
srcpkgs/Junction/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/Junction/template
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
new file mode 100644
index 000000000000..84a96a79692e
--- /dev/null
+++ b/srcpkgs/Junction/template
@@ -0,0 +1,15 @@
+# Template file for 'Junction'
+pkgname=Junction
+version=1.5.0
+revision=1
+#archs="i686 x86_64"
+build_style=meson
+hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
+depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
+short_desc="Application/browser chooser"
+maintainer="cultab <rroarck@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/sonnyp/Junction"
+#changelog=""
+distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
+checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Updated] New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (13 preceding siblings ...)
2022-10-01 0:01 ` cultab
@ 2022-10-03 12:25 ` cultab
2022-10-03 12:27 ` cultab
2022-10-03 12:27 ` [PR PATCH] [Closed]: " cultab
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-10-03 12:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
There is an updated pull request by cultab against master on the void-packages repository
https://github.com/cultab/void-packages master
https://github.com/void-linux/void-packages/pull/37671
New package: Junction-1.5.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- Also successfully cross-compiled for i686 and armv7l (both glibc)
~# This is a work in progress.~
~As of now it builds correctly but when run it seems to be missing a dependency.~
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
~From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.~
#### Made in response to issue #37352.
A patch file from https://github.com/void-linux/void-packages/pull/37671.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37671.patch --]
[-- Type: text/x-diff, Size: 526414 bytes --]
From 551c38f03a60e077172cd1c850fd1d188be7a359 Mon Sep 17 00:00:00 2001
From: cultab <rroarck@gmail.com>
Date: Fri, 24 Jun 2022 21:32:13 +0300
Subject: [PATCH 001/343] New package: Junction-1.5.0
---
srcpkgs/Junction/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/Junction/template
diff --git a/srcpkgs/Junction/template b/srcpkgs/Junction/template
new file mode 100644
index 000000000000..84a96a79692e
--- /dev/null
+++ b/srcpkgs/Junction/template
@@ -0,0 +1,15 @@
+# Template file for 'Junction'
+pkgname=Junction
+version=1.5.0
+revision=1
+#archs="i686 x86_64"
+build_style=meson
+hostmakedepends="gettext gjs gtk-update-icon-cache desktop-file-utils"
+depends="gjs gtk-update-icon-cache desktop-file-utils libadwaita gtk4 glib libportal"
+short_desc="Application/browser chooser"
+maintainer="cultab <rroarck@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/sonnyp/Junction"
+#changelog=""
+distfiles="https://github.com/sonnyp/Junction/archive/refs/tags/v${version}.tar.gz"
+checksum=b27038adbd8b8a7caf6dfc46a788ebc0904b1adff60fdf4447831a1b2ba75fef
From dbfebf7ffa9cc9bbf5b7c5d85c5163b1f154f5b6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 30 Sep 2022 19:07:17 -0400
Subject: [PATCH 002/343] openjdk17: update to 17.0.5+7.
---
.../files/musl_patches/8289477.patch | 35 -------------------
srcpkgs/openjdk17/template | 4 +--
2 files changed, 2 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/openjdk17/files/musl_patches/8289477.patch
diff --git a/srcpkgs/openjdk17/files/musl_patches/8289477.patch b/srcpkgs/openjdk17/files/musl_patches/8289477.patch
deleted file mode 100644
index 57ac4866b578..000000000000
--- a/srcpkgs/openjdk17/files/musl_patches/8289477.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From da6d1fc0e0aeb1fdb504aced4b0dba0290ec240f Mon Sep 17 00:00:00 2001
-From: Thomas Stuefe <stuefe@openjdk.org>
-Date: Thu, 30 Jun 2022 06:19:25 +0000
-Subject: [PATCH] 8289477: Memory corruption with CPU_ALLOC, CPU_FREE on muslc
-
-Reviewed-by: dholmes, clanger
----
- src/hotspot/os/linux/os_linux.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
-index 726926218907..8ee10e201c69 100644
---- a/src/hotspot/os/linux/os_linux.cpp
-+++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -4591,7 +4591,8 @@ static int _cpu_count(const cpu_set_t* cpus) {
- // dynamic check - see 6515172 for details.
- // If anything goes wrong we fallback to returning the number of online
- // processors - which can be greater than the number available to the process.
--int os::Linux::active_processor_count() {
-+static int get_active_processor_count() {
-+ // Note: keep this function, with its CPU_xx macros, *outside* the os namespace (see JDK-8289477).
- cpu_set_t cpus; // can represent at most 1024 (CPU_SETSIZE) processors
- cpu_set_t* cpus_p = &cpus;
- int cpus_size = sizeof(cpu_set_t);
-@@ -4663,6 +4664,10 @@ int os::Linux::active_processor_count() {
- return cpu_count;
- }
-
-+int os::Linux::active_processor_count() {
-+ return get_active_processor_count();
-+}
-+
- // Determine the active processor count from one of
- // three different sources:
- //
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 06d100ad24b0..e4b6a8a3b5bb 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
# Template file for 'openjdk17'
pkgname=openjdk17
-version=17.0.4+8
+version=17.0.5+7
revision=1
_gtest_ver=1.8.1
_java_ver="${version%%.*}"
@@ -45,7 +45,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="http://openjdk.java.net/"
distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
-checksum="b10b80aa96ac43c75163c1888bb42b66e1eeaecb02412d30de5369df7337ac8f
+checksum="f268e91052adb773ed5ecac70b232e70e830c89dd2d570c8c872bfaf2772867e
9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
provides="java-environment-${version}_1"
patch_args="-Np1 --directory=$build_wrksrc"
From 7cb0a19ee5f88878f4bd2a291a1fb72d0e428d9d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Fri, 30 Sep 2022 17:18:23 -0400
Subject: [PATCH 003/343] python3-certifi: update to 2022.09.24.
---
srcpkgs/python3-certifi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-certifi/template b/srcpkgs/python3-certifi/template
index dadbfc945970..87f19c0ea0d0 100644
--- a/srcpkgs/python3-certifi/template
+++ b/srcpkgs/python3-certifi/template
@@ -1,6 +1,6 @@
# Template file for 'python3-certifi'
pkgname=python3-certifi
-version=2022.06.15
+version=2022.09.24
revision=1
wrksrc="python-certifi-${version}"
build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="MPL-2.0"
homepage="https://certifi.io"
distfiles="https://github.com/certifi/python-certifi/archive/${version}.tar.gz"
-checksum=3ece28ce4177241cd9f752ef5161cd2c67060b80c73c6bcbdab48e504f9df966
+checksum=8c1db7f2a3b272e8a90b2e1910763930fa81e2512fbb96cb7a25787d63765c78
do_check() {
cd build/lib
From f529f8775399e5bb9977a32268fb041b94a1a8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 30 Sep 2022 19:44:08 +0200
Subject: [PATCH 004/343] doctl: update to 1.82.1.
---
srcpkgs/doctl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 8aaa8e7af01c..854f70023e13 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
# Template file for 'doctl'
pkgname=doctl
-version=1.82.0
+version=1.82.1
revision=1
build_style=go
go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/digitalocean/doctl"
distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=d555d5fe417fce0850cff7fdbb87259f8a14dc7fb2ff56746bef8fcdd746d949
+checksum=c104a6ad5efef3a7b71f2e539d0a9ab6a59f607669e520ba48b2afe8f077d12a
From 3109e26599602959db637394b5c46a442dd64808 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Fri, 30 Sep 2022 17:24:35 -0400
Subject: [PATCH 005/343] python3-zeroconf: update to 0.39.1.
---
srcpkgs/python3-zeroconf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index b470258cd747..3c45e53515c1 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,11 +1,11 @@
# Template file for 'python3-zeroconf'
pkgname=python3-zeroconf
-version=0.38.7
+version=0.39.1
revision=1
wrksrc="python-zeroconf-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-ifaddr"
+depends="python3-ifaddr python3-async-timeout"
checkdepends="python3-pytest python3-pytest-cov python3-mypy
python3-pytest-asyncio $depends"
short_desc="Pure Python3 implementation of multicast DNS service discovery"
@@ -13,7 +13,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/jstasiak/python-zeroconf"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a5e2fa56c1c61346a9df37737dc451d3107e8ee646b746495ffe07a4ff3d3324
+checksum=c1e1f1720f48833a9c6410c3f400ef18aaf6957b8a54fb3ef131c4e18c9fd914
do_check() {
# IPv6 doesn't work on github CI
From ab9250d2dd5e842c45780de7d59923a872b0cb4c Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 29 Sep 2022 11:10:33 -0400
Subject: [PATCH 006/343] riff: update to 2.20.0.
---
srcpkgs/riff/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/riff/template b/srcpkgs/riff/template
index 081982f02608..3634dcd30ab0 100644
--- a/srcpkgs/riff/template
+++ b/srcpkgs/riff/template
@@ -1,6 +1,6 @@
# Template file for 'riff'
pkgname=riff
-version=2.19.0
+version=2.20.0
revision=1
build_style=cargo
short_desc="Diff filter highlighting which line parts have changed"
@@ -8,7 +8,7 @@ maintainer="0x5c <dev@0x5c.io>"
license="MIT"
homepage="https://github.com/walles/riff"
distfiles="https://github.com/walles/riff/archive/refs/tags/${version}.tar.gz"
-checksum=a5df63dcf65a3146538e1a3dbd5cdadd9f499122c6920f8e430b55e4946e44a0
+checksum=7b9c7cee9dadea7e0600121a4b052806926bbe83bd16204be3f878ce1fd747fc
post_install() {
vlicense LICENSE
From 629e6cbc41f3505c8378aa95404ffe1e3af8975d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 29 Sep 2022 15:01:01 +0200
Subject: [PATCH 007/343] newsboat: update to 2.29.
---
srcpkgs/newsboat/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 371b6dcc9a7a..6b1d655b585e 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,6 +1,6 @@
# Template file for 'newsboat'
pkgname=newsboat
-version=2.28
+version=2.29
revision=1
build_style=configure
build_helper="rust"
@@ -17,7 +17,8 @@ license="MIT"
homepage="https://newsboat.org/"
changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=2508713ac850f1f2ae156e4b42cbc75a1c9e399d804e007b5773019115d3b0ec
+checksum=18b9801e0c2948f29248bfd8f319a9f9f670993fdbd494c6464aaab9e325fd6b
+python_version=3
# tests fail when run by superuser
# they always fail on musl, see https://github.com/newsboat/newsboat/issues/1216
From 2526115a782b70e43f3539101fd1643da95f16bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 29 Sep 2022 14:56:24 +0200
Subject: [PATCH 008/343] dasel: update to 1.27.1.
---
srcpkgs/dasel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index 74c6b4e0bbc9..db1d6a4bd385 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,6 +1,6 @@
# Template file for 'dasel'
pkgname=dasel
-version=1.26.1
+version=1.27.1
revision=1
build_style=go
build_helper=qemu
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://daseldocs.tomwright.me/"
changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
-checksum=44c90753cf4c1b6e7fb82074c6701fd4b47dc6dc26fe4e5504dcccb4d273b946
+checksum=4dd83d68347b895d62ec2749d782a9dbddf314bafef502eac7c5fdcc4058b85d
post_install() {
vlicense LICENSE
From b4bef4e12c96a75a8d0fa37562699f21e21e5ed1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 30 Sep 2022 00:01:41 -0400
Subject: [PATCH 009/343] rtl8812au-dkms: update to 20210629.
Old upstream stated their version was now obselete, and directed to this
new upstream.
---
srcpkgs/rtl8812au-dkms/template | 14 +++++++-------
srcpkgs/rtl8812au-dkms/update | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/rtl8812au-dkms/update
diff --git a/srcpkgs/rtl8812au-dkms/template b/srcpkgs/rtl8812au-dkms/template
index 0dedc560b81a..1d3c7067db20 100644
--- a/srcpkgs/rtl8812au-dkms/template
+++ b/srcpkgs/rtl8812au-dkms/template
@@ -1,17 +1,17 @@
# Template file for 'rtl8812au-dkms'
pkgname=rtl8812au-dkms
-version=20210427
+version=20210629
revision=1
-_modver=5.9.3.2
-_gitrev=6ef5d8fcdb0b94b7490a9a38353877708fca2cd4
-wrksrc="rtl8812au-${_modver}-${_gitrev}"
+_modver=5.13.6
+_gitrev=a8450b030a187b71d6be147d004715e6858e0ef9
+wrksrc="8812au-${version}-${_gitrev}"
depends="dkms"
short_desc="Realtek 8812AU/8821AU USB WiFi driver (DKMS)"
maintainer="Renato Aguiar <renato@renag.me>"
license="GPL-2.0-only"
-homepage="http://www.dlink.com"
-distfiles="https://github.com/gordboy/rtl8812au-${_modver}/archive/${_gitrev}.tar.gz"
-checksum=72b04bb7e1ef01eae653222d6f75f71163f7442fa142198605ed495f30341bd9
+homepage="https://github.com/morrownr/8812au"
+distfiles="https://github.com/morrownr/8812au-${version}/archive/${_gitrev}.tar.gz"
+checksum=a4ebed285b4315284c2ccdeaec1ba12aa6a66d9772b7416c81f055d3ab6f9bb8
dkms_modules="rtl8812au ${_modver}"
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/rtl8812au-dkms/update b/srcpkgs/rtl8812au-dkms/update
new file mode 100644
index 000000000000..c56515ac35b4
--- /dev/null
+++ b/srcpkgs/rtl8812au-dkms/update
@@ -0,0 +1,2 @@
+site="https://github.com/morrownr/8812au"
+pattern='8812au-\K[\d.]+(?=">)'
From 2e48bc4f58be46560583fa598766ffa21dc03792 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Sep 2022 12:56:34 +0530
Subject: [PATCH 010/343] dconf-editor: update to 43.0.
---
srcpkgs/dconf-editor/patches/meson-0.61.patch | 33 -------------------
srcpkgs/dconf-editor/template | 9 ++---
2 files changed, 5 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/dconf-editor/patches/meson-0.61.patch
diff --git a/srcpkgs/dconf-editor/patches/meson-0.61.patch b/srcpkgs/dconf-editor/patches/meson-0.61.patch
deleted file mode 100644
index b6f06606e882..000000000000
--- a/srcpkgs/dconf-editor/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 22:22:58 +0100
-Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
-
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- editor/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/editor/meson.build b/editor/meson.build
-index 4c89ab99..0eb3bb1a 100644
---- a/editor/meson.build
-+++ b/editor/meson.build
-@@ -1,7 +1,6 @@
- desktop = dconf_editor_namespace + '.desktop'
-
- i18n.merge_file (
-- desktop,
- type: 'desktop',
- input: desktop + '.in',
- output: desktop,
-@@ -26,7 +25,6 @@ configure_file(
- appdata = dconf_editor_namespace + '.appdata.xml'
-
- i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template
index 6170f8e300b7..6af43aabc523 100644
--- a/srcpkgs/dconf-editor/template
+++ b/srcpkgs/dconf-editor/template
@@ -1,13 +1,14 @@
# Template file for 'dconf-editor'
pkgname=dconf-editor
-version=3.38.3
+version=43.0
revision=1
build_style=meson
hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala gettext"
-makedepends="dconf-devel gtk+3-devel"
+makedepends="dconf-devel gtk+3-devel libhandy1-devel"
short_desc="Low-level configuration system - GTK+ editor"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="https://wiki.gnome.org/Projects/dconf"
+homepage="https://wiki.gnome.org/Apps/DconfEditor"
+changelog="https://gitlab.gnome.org/GNOME/dconf-editor/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3
+checksum=935a3c2dd76cc2a93cd5aee9a54d3947fb111eb396f4b63dc5f0ba8f8d099136
From 64557e9e9554e8201aae2cdf44da1d69590611a9 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 30 Sep 2022 12:33:39 +0200
Subject: [PATCH 011/343] chathistorysync: update to 0.2.0.
---
srcpkgs/chathistorysync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index ad18d5534359..95b78e601031 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,6 +1,6 @@
# Template file for 'chathistorysync'
pkgname=chathistorysync
-version=0.1.0
+version=0.2.0
revision=1
wrksrc="${pkgname}-v${version}"
build_style=go
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="AGPL-3.0-or-later"
homepage="https://sr.ht/~emersion/chathistorysync/"
distfiles="https://git.sr.ht/~emersion/chathistorysync/archive/v${version}.tar.gz"
-checksum=8d9a44040645e1ba3d3ea8655311b2ced89b732fd8efb5c1b9a9a91f16feefbc
+checksum=97d428a7ce46caabdfcf13e1863eeaa534b7c8247d8bd9f8cbcc64c20e5cf86a
post_build() {
make chathistorysync.1
From d1c682a5fd5c8d3eefe99732def44d337fceb891 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 30 Sep 2022 08:55:01 -0400
Subject: [PATCH 012/343] dendrite: update to 0.10.1.
---
srcpkgs/dendrite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index b25b846083e0..96fba6ae5b9c 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
# Template file for 'dendrite'
pkgname=dendrite
-version=0.9.9
+version=0.10.1
revision=1
build_style=go
go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://matrix.org/docs/projects/server/dendrite"
changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=bfe48407f602e018f6c8e960579b755ffcc4f453a5a06d506856a1c7c7d70c81
+checksum=077946f3deb6b0aa3a58fc02d413a6950a6b4dd9b90b73c6a41911b229ecb124
system_accounts="_dendrite"
_dendrite_homedir="/var/lib/dendrite"
From 88b530bb5fe392c2ee82af8ffc0febdfd34fca36 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 1 Oct 2022 04:48:15 +0000
Subject: [PATCH 013/343] chromium: fix ppc64le build
---
.../chromium/patches/fix-dawn-platform.patch | 62 +++++++++++++++++++
.../patches/xxx-ppc64le-support.patch | 31 ++++++++++
2 files changed, 93 insertions(+)
create mode 100644 srcpkgs/chromium/patches/fix-dawn-platform.patch
diff --git a/srcpkgs/chromium/patches/fix-dawn-platform.patch b/srcpkgs/chromium/patches/fix-dawn-platform.patch
new file mode 100644
index 000000000000..fbcd2706a948
--- /dev/null
+++ b/srcpkgs/chromium/patches/fix-dawn-platform.patch
@@ -0,0 +1,62 @@
+From f815e833c946a59620a2ca9df37a1da746f61460 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 1 Oct 2022 00:21:09 +0000
+Subject: [PATCH] fix dawn build for ppc64
+
+---
+ third_party/dawn/src/dawn/common/Assert.cpp | 4 ++--
+ third_party/dawn/src/dawn/common/Platform.h | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/third_party/dawn/src/dawn/common/Assert.cpp b/third_party/dawn/src/dawn/common/Assert.cpp
+index ecc92dfc..8ee91a90 100644
+--- a/third_party/dawn/src/dawn/common/Assert.cpp
++++ b/third_party/dawn/src/dawn/common/Assert.cpp
+@@ -31,9 +31,9 @@ void BreakPoint() {
+ __asm__ __volatile__("ebreak");
+ #elif DAWN_PLATFORM_IS(MIPS)
+ __asm__ __volatile__("break");
+-#elif DAWN_PLATFORM_IS(S390) || DAWN_PLATFORM_IS_(S390X)
++#elif DAWN_PLATFORM_IS(S390) || DAWN_PLATFORM_IS(S390X)
+ __asm__ __volatile__(".word 0x0001");
+-#elif DAWN_PLATFORM_IS(PPC) || DAWN_PLATFORM_IS_(PPC64)
++#elif DAWN_PLATFORM_IS(PPC) || DAWN_PLATFORM_IS(PPC64)
+ __asm__ __volatile__("twge 2,2");
+ #else
+ #error "Unsupported platform"
+diff --git a/third_party/dawn/src/dawn/common/Platform.h b/third_party/dawn/src/dawn/common/Platform.h
+index 39d5eb41..2011367d 100644
+--- a/third_party/dawn/src/dawn/common/Platform.h
++++ b/third_party/dawn/src/dawn/common/Platform.h
+@@ -124,15 +124,15 @@
+ #define DAWN_PLATFORM_IS_MIPS64 1
+ #endif
+
+-#elif defiend(__s390__)
++#elif defined(__s390__)
+ #define DAWN_PLATFORM_IS_S390 1
+-#elif defiend(__s390x__)
++#elif defined(__s390x__)
+ #define DAWN_PLATFORM_IS_S390X 1
+
+-#elif defined(__PPC__)
+-#define DAWN_PLATFORM_IS_PPC 1
+ #elif defined(__PPC64__)
+ #define DAWN_PLATFORM_IS_PPC64 1
++#elif defined(__PPC__)
++#define DAWN_PLATFORM_IS_PPC 1
+
+ #else
+ #error "Unsupported platform."
+@@ -149,7 +149,7 @@
+ static_assert(sizeof(sizeof(char)) == 8, "Expect sizeof(size_t) == 8");
+ #elif defined(DAWN_PLATFORM_IS_I386) || defined(DAWN_PLATFORM_IS_ARM32) || \
+ defined(DAWN_PLATFORM_IS_RISCV32) || defined(DAWN_PLATFORM_IS_MIPS32) || \
+- defined(DAWN_PLATFORM_IS_S390) || defined(DAWN_PLATFORM_IS_PPC32) || \
++ defined(DAWN_PLATFORM_IS_S390) || defined(DAWN_PLATFORM_IS_PPC) || \
+ defined(DAWN_PLATFORM_IS_EMSCRIPTEN)
+ #define DAWN_PLATFORM_IS_32_BIT 1
+ static_assert(sizeof(sizeof(char)) == 4, "Expect sizeof(size_t) == 4");
+--
+2.34.1
+
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 3c2df31566ec..475a0067cbfd 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3393,6 +3393,37 @@ index e4ac22644..1c57015db 100644
(defined(__s390__) && !defined(__s390x__))
/* On these architectures, implement mmap() with mmap2(). */
LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4872,11 +4872,11 @@ struct kernel_statx {
+ LSS_SC_BODY(4, int, 8, d, type, protocol, sv);
+ }
+ #endif
+- #if defined(__NR_recvmsg)
++ #if defined(__NR_recvmsg) && !defined(__PPC__)
+ LSS_INLINE _syscall3(ssize_t, recvmsg, int, s, struct kernel_msghdr*, msg,
+ int, flags)
+ #endif
+- #if defined(__NR_sendmsg)
++ #if defined(__NR_sendmsg) && !defined(__PPC__)
+ LSS_INLINE _syscall3(ssize_t, sendmsg, int, s, const struct kernel_msghdr*,
+ msg, int, flags)
+ #endif
+@@ -4885,13 +4885,13 @@ struct kernel_statx {
+ int, flags, const struct kernel_sockaddr*, to,
+ unsigned int, tolen)
+ #endif
+- #if defined(__NR_shutdown)
++ #if defined(__NR_shutdown) && !defined(__PPC__)
+ LSS_INLINE _syscall2(int, shutdown, int, s, int, how)
+ #endif
+- #if defined(__NR_socket)
++ #if defined(__NR_socket) && !defined(__PPC__)
+ LSS_INLINE _syscall3(int, socket, int, domain, int, type, int, protocol)
+ #endif
+- #if defined(__NR_socketpair)
++ #if defined(__NR_socketpair) && !defined(__PPC__)
+ LSS_INLINE _syscall4(int, socketpair, int, d, int, type, int, protocol,
+ int*, sv)
+ #endif
diff --git a/third_party/pdfium/third_party/libpng16/pngpriv.h b/third_party/pdfium/third_party/libpng16/pngpriv.h
index 583c26f..e03d697 100644
--- a/third_party/pdfium/third_party/libpng16/pngpriv.h
From b9be980ce4ca6a49d11c3de17dcd37e4201e3532 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 30 Sep 2022 23:42:43 -0500
Subject: [PATCH 014/343] NetAuth-sftpgo-hook: update to 0.1.1.
---
srcpkgs/NetAuth-sftpgo-hook/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index 51862cc53980..1c5e4264b8aa 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
# Template file for 'NetAuth-sftpgo-hook'
pkgname=NetAuth-sftpgo-hook
-version=0.1.0
-revision=2
+version=0.1.1
+revision=1
wrksrc=sftpgo-hook-$version
build_style=go
go_import_path=github.com/netauth/sftpgo-hook
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://github.com/netauth/sftpgo-hook"
distfiles="https://github.com/netauth/sftpgo-hook/archive/refs/tags/v$version.tar.gz"
-checksum=8ec42f159d6b84fbc19cbc76f695de324384092c80d96e6a876c14da6aca110f
+checksum=21f12b3e6301792aeaa080263ee6c63fb33d51f404dbb9127820b786d4428512
post_install() {
vlicense LICENSE
From dd0a0dd0a2d47138da8173012e03696910bdf42e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 1 Oct 2022 00:04:14 -0500
Subject: [PATCH 015/343] sftpgo: update to 2.3.5.
---
srcpkgs/sftpgo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 4d58d0f4a6a9..d923eb2430af 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
# Template file for 'sftpgo'
pkgname=sftpgo
-version=2.2.2
-revision=2
+version=2.3.5
+revision=1
build_style=go
go_import_path=github.com/drakkan/sftpgo/v2
short_desc="Fully featured and highly configurable SFTP server"
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="AGPL-3.0-only"
homepage="https://github.com/drakkan/sftpgo"
distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d5c68223017071efce597712612ce7ce4334a70f773a8c0b7afa7a69427c79c8
+checksum=b5844ccbea92e458c9b132fcbcaa5976baa9cf2a9d864f9efc06c143886b4b13
make_dirs="/var/lib/sftpgo root root 0750"
post_install() {
From e78726c265645e88d68eb8ccf43370b454201d38 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Sep 2022 05:35:07 -0400
Subject: [PATCH 016/343] rpi-base: re-merge rpi*-base and -kernel packages
---
srcpkgs/rpi-base/template | 48 +++++++++------------------------------
1 file changed, 11 insertions(+), 37 deletions(-)
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
index 8940033c83ab..3b22d684f4b2 100644
--- a/srcpkgs/rpi-base/template
+++ b/srcpkgs/rpi-base/template
@@ -1,10 +1,9 @@
# Template file for 'rpi-base'
pkgname=rpi-base
version=3.0
-revision=2
+revision=3
archs="armv6l* armv7l* aarch64*"
-_base_depends="virtual?ntp-daemon rpi-firmware"
-depends="${_base_depends} rpi-kernel"
+depends="virtual?ntp-daemon rpi-firmware rpi-kernel"
short_desc="Void Linux Raspberry Pi base files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Public Domain"
@@ -26,45 +25,20 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
-# support legacy systems (before rpi-kernel was split to rpi{,2,3})
-# archs != armv6* are emtpy meta packages to pull the new rpi${n}-base package
-case "$XBPS_TARGET_MACHINE" in
- armv6*) : ;;
- *)
- build_style=meta
- short_desc+=" (transitional dummy package)"
-
- do_install() { : ; }
-
- case "$XBPS_TARGET_MACHINE" in
- armv7*) depends="rpi2-base" ;;
- aarch64*) depends="rpi3-base" ;;
- esac
- ;;
-esac
-
rpi2-base_package() {
- depends="${_base_depends} rpi2-kernel"
- short_desc="Void Linux Raspberry Pi 2 base files"
- pkg_install() {
- vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
- }
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="rpi-base"
}
-
rpi3-base_package() {
- depends="${_base_depends} rpi3-kernel"
- short_desc="Void Linux Raspberry Pi 3 base files"
- pkg_install() {
- vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
- }
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="rpi-base"
}
rpi4-base_package() {
- depends="${_base_depends} rpi4-kernel"
- short_desc="Void Linux Raspberry Pi 4 base files"
- conflicts="rpi3-base"
- pkg_install() {
- vinstall "${FILESDIR}/71-raspberrypi.rules" 644 usr/lib/udev/rules.d
- }
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="rpi-base"
}
From ca7e937e2a1de0f1e32481a6f1f7360a32e39ec4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 24 Sep 2022 05:38:28 -0400
Subject: [PATCH 017/343] rpi*-kernel: update to 5.15.68, merge templates
---
srcpkgs/rpi-kernel/template | 169 +++++++++++++-------------
srcpkgs/rpi2-kernel | 1 +
srcpkgs/rpi2-kernel-headers | 2 +-
srcpkgs/rpi2-kernel/template | 228 ----------------------------------
srcpkgs/rpi3-kernel | 1 +
srcpkgs/rpi3-kernel-headers | 2 +-
srcpkgs/rpi3-kernel/template | 228 ----------------------------------
srcpkgs/rpi4-kernel | 1 +
srcpkgs/rpi4-kernel-headers | 2 +-
srcpkgs/rpi4-kernel/template | 229 -----------------------------------
10 files changed, 90 insertions(+), 773 deletions(-)
create mode 120000 srcpkgs/rpi2-kernel
delete mode 100644 srcpkgs/rpi2-kernel/template
create mode 120000 srcpkgs/rpi3-kernel
delete mode 100644 srcpkgs/rpi3-kernel/template
create mode 120000 srcpkgs/rpi4-kernel
delete mode 100644 srcpkgs/rpi4-kernel/template
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 3183183b6a4e..1534ee228918 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -6,28 +6,26 @@
# https://forums.raspberrypi.com/viewtopic.php?t=322879
#
# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+# "Merge remote-tracking branch 'stable/linux-5.x.y' into rpi-5.x.y" commit.
#
# [1] https://github.com/raspberrypi/linux/tags
#
-# WARNING: keep all rpi*-kernel packages in sync
-
-_githash="64ad74084fa44abe8689564071df5729ded4c589"
-_gitshort="${_githash:0:7}"
+# Upstream documentation: https://www.raspberrypi.com/documentation/computers/linux_kernel.html
pkgname=rpi-kernel
-version=5.15.61
+version=5.15.68
revision=1
-archs="armv6l*"
+_githash="ac7d1fdd216a11b75527e5d6b3a00d86ec28edfc"
+archs="armv6l* armv7l* aarch64*"
wrksrc="linux-${_githash}"
hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
makedepends="ncurses-devel"
maintainer="Piraty <piraty1@inbox.ru>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
-short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
+short_desc="Linux kernel for Raspberry Pi (${version%.*} series [git ${_githash:0:7}])"
distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
+checksum=44699750d6e69ef47343af9cf9fbae3431a6da12990151273339324820c3bf0e
python_version=3
_kernver="${version}_${revision}"
@@ -40,56 +38,50 @@ noshlibprovides=yes
triggers="kernel-hooks"
# These files could be modified when an external module is built.
mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
_arch=
+_image_target=
+_image_name=
case "$XBPS_TARGET_MACHINE" in
- arm*) _arch=arm ;;
- aarch64*) _arch=arm64 ;;
+ armv6l*) _arch=arm; _image_target=zImage; _image_name=kernel.img ;;
+ armv7l*) _arch=arm; _image_target=zImage; _image_name=kernel7.img ;;
+ aarch64*) _arch=arm64; _image_target=Image.gz; _image_name=kernel8.img ;;
esac
+
_cross=
if [ "$CROSS_BUILD" ]; then
_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
fi
-pre_configure() {
- # Remove .git directory, otherwise scripts/setkernelversion.sh
- # modifies KERNELRELEASE and appends + to it.
- rm -rf .git
-}
do_configure() {
local target defconfig
- # Use upstream's default configuration, no need to maintain ours.
case "$XBPS_TARGET_MACHINE" in
- armv6l*)
- target=bcmrpi_defconfig
- ;;
+ # for zero, 1
+ armv6l*) target=bcmrpi_defconfig ;;
+ # for 2
+ armv7l*) target=bcm2709_defconfig ;;
+ # for 3, 4, zero 2
+ aarch64*) target=bcm2711_defconfig ;;
esac
defconfig="arch/${_arch}/configs/${target}"
echo "CONFIG_CONNECTOR=y" >> "$defconfig"
echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
- echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
- echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
-
- # IR Remote Support
- echo "CONFIG_RC_CORE=y" >> "$defconfig"
- echo "CONFIG_LIRC=y" >> "$defconfig"
- echo "CONFIG_RC_DECODERS=y" >> "$defconfig"
- echo "CONFIG_RC_DEVICES=y" >> "$defconfig"
- echo "CONFIG_IR_RC6_DECODER=m" >> "$defconfig"
- echo "CONFIG_IR_MCEUSB=m" >> "$defconfig"
# HID Controllers
echo "CONFIG_HID_STEAM=y" >> "$defconfig"
+ # Disable GCC plugins
+ echo "# CONFIG_GCC_PLUGINS is not set" >> "$defconfig"
+
# LXD 4.2+ support
echo "CONFIG_BRIDGE_VLAN_FILTERING=y" >> "$defconfig"
@@ -98,26 +90,17 @@ do_configure() {
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
}
-do_build() {
- local target
-
- case "$XBPS_TARGET_MACHINE" in
- arm*)
- target="zImage modules dtbs"
- ;;
- aarch64*)
- target="Image modules dtbs"
- ;;
- esac
+do_build() {
make ${makejobs} ${_cross} ARCH=${_arch} prepare
- make ${makejobs} ${_cross} ARCH=${_arch} ${target}
+ make ${makejobs} ${_cross} ARCH=${_arch} ${_image_target} modules dtbs
}
+
do_install() {
- local hdrdest
+ local hdrdest="${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}"
# Run depmod after compressing modules.
- sed -i '2iexit 0' scripts/depmod.sh
+ vsed -i -e '2iexit 0' scripts/depmod.sh
# Install kernel, firmware and modules
make ${makejobs} ARCH=${_arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
@@ -125,11 +108,13 @@ do_install() {
# Install device tree blobs
make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
- # Generate kernel.img and install it to destdir.
- vmkdir boot
- cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel.img
+ # move dtbs that ended up in /boot/broadcom
+ if [ -d "${DESTDIR}/boot/broadcom" ]; then
+ mv ${DESTDIR}/boot/broadcom/*dtb ${DESTDIR}/boot
+ fi
- hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
+ # Install kernel image
+ vinstall arch/${_arch}/boot/${_image_target} 644 boot ${_image_name}
# Switch to /usr.
vmkdir usr
@@ -157,7 +142,7 @@ do_install() {
# Remove firmware stuff provided by the "linux-firmware" pkg.
rm -rf ${DESTDIR}/usr/lib/firmware
- for i in acpi asm-generic clocksource config crypto drm generated linux \
+ for i in acpi asm-generic clocksource config crypto drm dt-bindings generated linux \
math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
done
@@ -224,6 +209,13 @@ do_install() {
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
}
+subpackages="rpi-kernel-headers"
+
+case "$XBPS_TARGET_MACHINE" in
+ armv7l*) subpackages+=" rpi2-kernel rpi2-kernel-headers" ;;
+ aarch64*) subpackages+=" rpi3-kernel rpi3-kernel-headers rpi4-kernel rpi4-kernel-headers" ;;
+esac
+
rpi-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
@@ -235,33 +227,40 @@ rpi-kernel-headers_package() {
}
}
+# hard-code the minimum version to prevent possible issues with partial upgrades
+# of legacy (split) systems
+rpi2-kernel_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="rpi-kernel>=5.15.68_1"
+}
-# support legacy systems (before rpi-kernel was split to rpi{,2,3})
-# archs != armv6* are emtpy meta packages to pull the new rpi{$n}-kernel package
-archs+=" armv7l* aarch64*"
-case "$XBPS_TARGET_MACHINE" in
- armv6*) : ;;
- *)
- build_style=meta
- short_desc="Linux kernel for Raspberry Pi (transitional dummy package)"
-
- pre_configure() { : ; }
- do_configure() { : ; }
- do_build() { : ; }
- do_install() { : ; }
-
- case "$XBPS_TARGET_MACHINE" in
- armv7*) depends=rpi2-kernel ;;
- aarch64*) depends=rpi3-kernel ;;
- esac
-
- rpi-kernel-headers_package() {
- build_style=meta
- short_desc="Linux kernel headers for Raspberry Pi (transitional dummy package)"
- case "$XBPS_TARGET_MACHINE" in
- armv7*) depends=rpi2-kernel-headers ;;
- aarch64*) depends=rpi3-kernel-headers ;;
- esac
- }
- ;;
-esac
+rpi2-kernel-headers_package() {
+ build_style=meta
+ short_desc="${short_desc/kernel/kernel headers} (transitional dummy package)"
+ depends="rpi-kernel-headers>=5.15.68_1"
+}
+
+rpi3-kernel_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="rpi-kernel>=5.15.68_1"
+}
+
+rpi3-kernel-headers_package() {
+ build_style=meta
+ short_desc="${short_desc/kernel/kernel headers} (transitional dummy package)"
+ depends="rpi-kernel-headers>=5.15.68_1"
+}
+
+rpi4-kernel_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="rpi-kernel>=5.15.68_1"
+}
+
+rpi4-kernel-headers_package() {
+ build_style=meta
+ short_desc="${short_desc/kernel/kernel headers} (transitional dummy package)"
+ depends="rpi-kernel-headers>=5.15.68_1"
+}
diff --git a/srcpkgs/rpi2-kernel b/srcpkgs/rpi2-kernel
new file mode 120000
index 000000000000..3b4ec073331b
--- /dev/null
+++ b/srcpkgs/rpi2-kernel
@@ -0,0 +1 @@
+rpi-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi2-kernel-headers b/srcpkgs/rpi2-kernel-headers
index fbe6d91aeb7f..3b4ec073331b 120000
--- a/srcpkgs/rpi2-kernel-headers
+++ b/srcpkgs/rpi2-kernel-headers
@@ -1 +1 @@
-rpi2-kernel
\ No newline at end of file
+rpi-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
deleted file mode 100644
index 8963b855a4de..000000000000
--- a/srcpkgs/rpi2-kernel/template
+++ /dev/null
@@ -1,228 +0,0 @@
-# Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
-
-_githash="64ad74084fa44abe8689564071df5729ded4c589"
-_gitshort="${_githash:0:7}"
-
-pkgname=rpi2-kernel
-version=5.10.110
-revision=1
-archs="armv7l*"
-wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
-makedepends="ncurses-devel"
-maintainer="Piraty <piraty1@inbox.ru>"
-homepage="http://www.kernel.org"
-license="GPL-2.0-only"
-short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
-distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
-python_version=3
-
-_kernver="${version}_${revision}"
-
-nodebug=yes
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-
-triggers="kernel-hooks"
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-_arch=
-case "$XBPS_TARGET_MACHINE" in
- arm*) _arch=arm ;;
- aarch64*) _arch=arm64 ;;
-esac
-_cross=
-if [ "$CROSS_BUILD" ]; then
- _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-fi
-
-pre_configure() {
- # Remove .git directory, otherwise scripts/setkernelversion.sh
- # modifies KERNELRELEASE and appends + to it.
- rm -rf .git
-}
-do_configure() {
- local target defconfig
-
- # Use upstream's default configuration, no need to maintain ours.
- case "$XBPS_TARGET_MACHINE" in
- armv7l*)
- target=bcm2709_defconfig
- ;;
- esac
-
- defconfig="arch/${_arch}/configs/${target}"
- echo "CONFIG_CONNECTOR=y" >> "$defconfig"
- echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
- echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
- echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
-
- # IR Remote Support
- echo "CONFIG_RC_CORE=y" >> "$defconfig"
- echo "CONFIG_LIRC=y" >> "$defconfig"
- echo "CONFIG_RC_DECODERS=y" >> "$defconfig"
- echo "CONFIG_RC_DEVICES=y" >> "$defconfig"
- echo "CONFIG_IR_RC6_DECODER=m" >> "$defconfig"
- echo "CONFIG_IR_MCEUSB=m" >> "$defconfig"
-
- # HID Controllers
- echo "CONFIG_HID_STEAM=y" >> "$defconfig"
-
- # LXD 4.2+ support
- echo "CONFIG_BRIDGE_VLAN_FILTERING=y" >> "$defconfig"
-
- # Disable GCC plugins
- echo "# CONFIG_GCC_PLUGINS is not set" >> "$defconfig"
-
- make ${makejobs} ${_cross} ARCH=${_arch} ${target}
-
- # Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
- vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
- local target
-
- case "$XBPS_TARGET_MACHINE" in
- arm*)
- target="zImage modules dtbs"
- ;;
- aarch64*)
- target="Image modules dtbs"
- ;;
- esac
-
- make ${makejobs} ${_cross} ARCH=${_arch} prepare
- make ${makejobs} ${_cross} ARCH=${_arch} ${target}
-}
-do_install() {
- local hdrdest
-
- # Run depmod after compressing modules.
- sed -i '2iexit 0' scripts/depmod.sh
-
- # Install kernel, firmware and modules
- make ${makejobs} ARCH=${_arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
- # Install device tree blobs
- make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
-
- # Generate kernel.img and install it to destdir.
- vmkdir boot
- cp arch/arm/boot/zImage ${DESTDIR}/boot/kernel7.img
-
- hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
-
- # Switch to /usr.
- vmkdir usr
- mv ${DESTDIR}/lib ${DESTDIR}/usr
-
- cd ${DESTDIR}/usr/lib/modules/${_kernver}
- rm -f source build
- ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
-
- cd ${wrksrc}
- # Install required headers to build external modules
- install -Dm644 Makefile ${hdrdest}/Makefile
- install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
- install -Dm644 .config ${hdrdest}/.config
- for file in $(find . -name Kconfig\*); do
- mkdir -p ${hdrdest}/$(dirname $file)
- install -Dm644 $file ${hdrdest}/${file}
- done
- for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
- mkdir -p ${hdrdest}/$(dirname $file)
- install -Dm644 $file ${hdrdest}/${file}
- done
- mkdir -p ${hdrdest}/include
-
- # Remove firmware stuff provided by the "linux-firmware" pkg.
- rm -rf ${DESTDIR}/usr/lib/firmware
-
- for i in acpi asm-generic clocksource config crypto drm generated linux \
- math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
- [ -d include/$i ] && cp -a include/$i ${hdrdest}/include
- done
-
- cd ${wrksrc}
- # Remove helper binaries built for host,
- # if generated files from the scripts/ directory need to be included,
- # they need to be copied to ${hdrdest} before this step
- if [ "$CROSS_BUILD" ]; then
- make ${makejobs} ARCH=${_arch} _mrproper_scripts
- # remove host specific objects as well
- find scripts -name '*.o' -delete
- fi
-
- # Copy files necessary for later builds.
- cp Module.symvers ${hdrdest}
- cp -a scripts ${hdrdest}
- mkdir -p ${hdrdest}/security/selinux
- cp -a security/selinux/include ${hdrdest}/security/selinux
- mkdir -p ${hdrdest}/tools/include
- cp -a tools/include/tools ${hdrdest}/tools/include
- if [ -d "arch/${_arch}/tools" ]; then
- cp -a arch/${_arch}/tools ${hdrdest}/arch/${_arch}
- fi
-
- # copy arch includes for external modules
- mkdir -p ${hdrdest}/arch/${_arch}
- cp -a arch/${_arch}/include ${hdrdest}/arch/${_arch}
-
- mkdir -p ${hdrdest}/arch/${_arch}/kernel
- cp arch/${_arch}/Makefile ${hdrdest}/arch/${_arch}
- cp arch/${_arch}/kernel/asm-offsets.s ${hdrdest}/arch/${_arch}/kernel
- if [ "$_arch" = "arm64" ] ; then
- cp -a arch/${_arch}/kernel/vdso ${hdrdest}/arch/${_arch}/kernel/
- fi
-
- # Add md headers
- mkdir -p ${hdrdest}/drivers/md
- cp drivers/md/*.h ${hdrdest}/drivers/md
-
- # Add inotify.h
- mkdir -p ${hdrdest}/include/linux
- cp include/linux/inotify.h ${hdrdest}/include/linux
-
- # Add wireless headers
- mkdir -p ${hdrdest}/net/mac80211/
- cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
- # Remove unneeded architectures
- # (save the correct one + Kconfig and delete all others)
- mkdir -p arch-backup
- cp -r ${hdrdest}/arch/${_arch} ${hdrdest}/arch/Kconfig arch-backup/
- rm -rf ${hdrdest}/arch
- mv arch-backup ${hdrdest}/arch
- # Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
- mkdir -p ${hdrdest}/arch/x86/ras
- cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
- # Compress all modules with xz to save a few MBs.
- msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
- find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9
-
- # ... and run depmod again.
- depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-
-rpi2-kernel-headers_package() {
- nostrip=yes
- noverifyrdeps=yes
- noshlibprovides=yes
- short_desc="${short_desc/kernel/kernel headers}"
- pkg_install() {
- vmove usr/src
- vmove usr/lib/modules/${_kernver}/build
- }
-}
diff --git a/srcpkgs/rpi3-kernel b/srcpkgs/rpi3-kernel
new file mode 120000
index 000000000000..3b4ec073331b
--- /dev/null
+++ b/srcpkgs/rpi3-kernel
@@ -0,0 +1 @@
+rpi-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi3-kernel-headers b/srcpkgs/rpi3-kernel-headers
index 29e9f333d668..3b4ec073331b 120000
--- a/srcpkgs/rpi3-kernel-headers
+++ b/srcpkgs/rpi3-kernel-headers
@@ -1 +1 @@
-rpi3-kernel
\ No newline at end of file
+rpi-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
deleted file mode 100644
index 20d51a6b8579..000000000000
--- a/srcpkgs/rpi3-kernel/template
+++ /dev/null
@@ -1,228 +0,0 @@
-# Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
-
-_githash="64ad74084fa44abe8689564071df5729ded4c589"
-_gitshort="${_githash:0:7}"
-
-pkgname=rpi3-kernel
-version=5.15.61
-revision=1
-archs="aarch64*"
-wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
-makedepends="ncurses-devel"
-maintainer="Piraty <piraty1@inbox.ru>"
-homepage="http://www.kernel.org"
-license="GPL-2.0-only"
-short_desc="Linux kernel for Raspberry Pi 3 / Zero 2 (${version%.*} series [git ${_gitshort}])"
-distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
-python_version=3
-
-_kernver="${version}_${revision}"
-
-nodebug=yes
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-
-triggers="kernel-hooks"
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-_arch=
-case "$XBPS_TARGET_MACHINE" in
- arm*) _arch=arm ;;
- aarch64*) _arch=arm64 ;;
-esac
-_cross=
-if [ "$CROSS_BUILD" ]; then
- _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-fi
-
-pre_configure() {
- # Remove .git directory, otherwise scripts/setkernelversion.sh
- # modifies KERNELRELEASE and appends + to it.
- rm -rf .git
-}
-do_configure() {
- local target defconfig
-
- # Use upstream's default configuration, no need to maintain ours.
- case "$XBPS_TARGET_MACHINE" in
- aarch64*)
- target=bcmrpi3_defconfig
- ;;
- esac
-
- defconfig="arch/${_arch}/configs/${target}"
- echo "CONFIG_CONNECTOR=y" >> "$defconfig"
- echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
- echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
- echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
-
- # IR Remote Support
- echo "CONFIG_RC_CORE=y" >> "$defconfig"
- echo "CONFIG_LIRC=y" >> "$defconfig"
- echo "CONFIG_RC_DECODERS=y" >> "$defconfig"
- echo "CONFIG_RC_DEVICES=y" >> "$defconfig"
- echo "CONFIG_IR_RC6_DECODER=m" >> "$defconfig"
- echo "CONFIG_IR_MCEUSB=m" >> "$defconfig"
-
- # HID Controllers
- echo "CONFIG_HID_STEAM=y" >> "$defconfig"
-
- # LXD 4.2+ support
- echo "CONFIG_BRIDGE_VLAN_FILTERING=y" >> "$defconfig"
-
- make ${makejobs} ${_cross} ARCH=${_arch} ${target}
-
- # Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
- vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
- local target
-
- case "$XBPS_TARGET_MACHINE" in
- arm*)
- target="zImage modules dtbs"
- ;;
- aarch64*)
- target="Image modules dtbs"
- ;;
- esac
-
- make ${makejobs} ${_cross} ARCH=${_arch} prepare
- make ${makejobs} ${_cross} ARCH=${_arch} ${target}
-}
-do_install() {
- local hdrdest
-
- # Run depmod after compressing modules.
- sed -i '2iexit 0' scripts/depmod.sh
-
- # Install kernel, firmware and modules
- make ${makejobs} ARCH=${_arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
- # Install device tree blobs
- make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
-
- # move dtb that ended up in /boot/broadcom
- mv ${DESTDIR}/boot/broadcom/*dtb ${DESTDIR}/boot
-
- # Generate kernel.img and install it to destdir.
- vmkdir boot
- cp arch/arm64/boot/Image ${DESTDIR}/boot/kernel8.img
-
- hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
-
- # Switch to /usr.
- vmkdir usr
- mv ${DESTDIR}/lib ${DESTDIR}/usr
-
- cd ${DESTDIR}/usr/lib/modules/${_kernver}
- rm -f source build
- ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
-
- cd ${wrksrc}
- # Install required headers to build external modules
- install -Dm644 Makefile ${hdrdest}/Makefile
- install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
- install -Dm644 .config ${hdrdest}/.config
- for file in $(find . -name Kconfig\*); do
- mkdir -p ${hdrdest}/$(dirname $file)
- install -Dm644 $file ${hdrdest}/${file}
- done
- for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
- mkdir -p ${hdrdest}/$(dirname $file)
- install -Dm644 $file ${hdrdest}/${file}
- done
- mkdir -p ${hdrdest}/include
-
- # Remove firmware stuff provided by the "linux-firmware" pkg.
- rm -rf ${DESTDIR}/usr/lib/firmware
-
- for i in acpi asm-generic clocksource config crypto drm generated linux \
- math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
- [ -d include/$i ] && cp -a include/$i ${hdrdest}/include
- done
-
- cd ${wrksrc}
- # Remove helper binaries built for host,
- # if generated files from the scripts/ directory need to be included,
- # they need to be copied to ${hdrdest} before this step
- if [ "$CROSS_BUILD" ]; then
- make ${makejobs} ARCH=${_arch} _mrproper_scripts
- # remove host specific objects as well
- find scripts -name '*.o' -delete
- fi
-
- # Copy files necessary for later builds.
- cp Module.symvers ${hdrdest}
- cp -a scripts ${hdrdest}
- mkdir -p ${hdrdest}/security/selinux
- cp -a security/selinux/include ${hdrdest}/security/selinux
- mkdir -p ${hdrdest}/tools/include
- cp -a tools/include/tools ${hdrdest}/tools/include
- if [ -d "arch/${_arch}/tools" ]; then
- cp -a arch/${_arch}/tools ${hdrdest}/arch/${_arch}
- fi
-
- # copy arch includes for external modules
- mkdir -p ${hdrdest}/arch/${_arch}
- cp -a arch/${_arch}/include ${hdrdest}/arch/${_arch}
-
- mkdir -p ${hdrdest}/arch/${_arch}/kernel
- cp arch/${_arch}/Makefile ${hdrdest}/arch/${_arch}
- cp arch/${_arch}/kernel/asm-offsets.s ${hdrdest}/arch/${_arch}/kernel
- if [ "$_arch" = "arm64" ] ; then
- cp -a arch/${_arch}/kernel/vdso ${hdrdest}/arch/${_arch}/kernel/
- fi
-
- # Add md headers
- mkdir -p ${hdrdest}/drivers/md
- cp drivers/md/*.h ${hdrdest}/drivers/md
-
- # Add inotify.h
- mkdir -p ${hdrdest}/include/linux
- cp include/linux/inotify.h ${hdrdest}/include/linux
-
- # Add wireless headers
- mkdir -p ${hdrdest}/net/mac80211/
- cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
- # Remove unneeded architectures
- # (save the correct one + Kconfig and delete all others)
- mkdir -p arch-backup
- cp -r ${hdrdest}/arch/${_arch} ${hdrdest}/arch/Kconfig arch-backup/
- rm -rf ${hdrdest}/arch
- mv arch-backup ${hdrdest}/arch
- # Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
- mkdir -p ${hdrdest}/arch/x86/ras
- cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
- # Compress all modules with xz to save a few MBs.
- msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
- find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9
-
- # ... and run depmod again.
- depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-
-rpi3-kernel-headers_package() {
- nostrip=yes
- noverifyrdeps=yes
- noshlibprovides=yes
- short_desc="${short_desc/kernel/kernel headers}"
- pkg_install() {
- vmove usr/src
- vmove usr/lib/modules/${_kernver}/build
- }
-}
diff --git a/srcpkgs/rpi4-kernel b/srcpkgs/rpi4-kernel
new file mode 120000
index 000000000000..3b4ec073331b
--- /dev/null
+++ b/srcpkgs/rpi4-kernel
@@ -0,0 +1 @@
+rpi-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi4-kernel-headers b/srcpkgs/rpi4-kernel-headers
index 9c2fad143506..3b4ec073331b 120000
--- a/srcpkgs/rpi4-kernel-headers
+++ b/srcpkgs/rpi4-kernel-headers
@@ -1 +1 @@
-rpi4-kernel
\ No newline at end of file
+rpi-kernel
\ No newline at end of file
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
deleted file mode 100644
index d4fb3c72906e..000000000000
--- a/srcpkgs/rpi4-kernel/template
+++ /dev/null
@@ -1,229 +0,0 @@
-# Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
-
-_githash="64ad74084fa44abe8689564071df5729ded4c589"
-_gitshort="${_githash:0:7}"
-
-pkgname=rpi4-kernel
-version=5.15.61
-revision=1
-archs="aarch64*"
-wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
-makedepends="ncurses-devel"
-maintainer="Piraty <piraty1@inbox.ru>"
-homepage="http://www.kernel.org"
-license="GPL-2.0-only"
-short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
-distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
-python_version=3
-conflicts=rpi3-kernel
-
-_kernver="${version}_${revision}"
-
-nodebug=yes
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-
-triggers="kernel-hooks"
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-_arch=
-case "$XBPS_TARGET_MACHINE" in
- arm*) _arch=arm ;;
- aarch64*) _arch=arm64 ;;
-esac
-_cross=
-if [ "$CROSS_BUILD" ]; then
- _cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-fi
-
-pre_configure() {
- # Remove .git directory, otherwise scripts/setkernelversion.sh
- # modifies KERNELRELEASE and appends + to it.
- rm -rf .git
-}
-do_configure() {
- local target defconfig
-
- # Use upstream's default configuration, no need to maintain ours.
- case "$XBPS_TARGET_MACHINE" in
- aarch64*)
- target=bcm2711_defconfig
- ;;
- esac
-
- defconfig="arch/${_arch}/configs/${target}"
- echo "CONFIG_CONNECTOR=y" >> "$defconfig"
- echo "CONFIG_PROC_EVENTS=y" >> "$defconfig"
- echo "CONFIG_F2FS_FS_SECURITY=y" >> "$defconfig"
- echo "CONFIG_CGROUP_PIDS=y" >> "$defconfig"
-
- # IR Remote Support
- echo "CONFIG_RC_CORE=y" >> "$defconfig"
- echo "CONFIG_LIRC=y" >> "$defconfig"
- echo "CONFIG_RC_DECODERS=y" >> "$defconfig"
- echo "CONFIG_RC_DEVICES=y" >> "$defconfig"
- echo "CONFIG_IR_RC6_DECODER=m" >> "$defconfig"
- echo "CONFIG_IR_MCEUSB=m" >> "$defconfig"
-
- # HID Controllers
- echo "CONFIG_HID_STEAM=y" >> "$defconfig"
-
- # LXD 4.2+ support
- echo "CONFIG_BRIDGE_VLAN_FILTERING=y" >> "$defconfig"
-
- make ${makejobs} ${_cross} ARCH=${_arch} ${target}
-
- # Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
- vsed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
- local target
-
- case "$XBPS_TARGET_MACHINE" in
- arm*)
- target="zImage modules dtbs"
- ;;
- aarch64*)
- target="Image modules dtbs"
- ;;
- esac
-
- make ${makejobs} ${_cross} ARCH=${_arch} prepare
- make ${makejobs} ${_cross} ARCH=${_arch} ${target}
-}
-do_install() {
- local hdrdest
-
- # Run depmod after compressing modules.
- sed -i '2iexit 0' scripts/depmod.sh
-
- # Install kernel, firmware and modules
- make ${makejobs} ARCH=${_arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
- # Install device tree blobs
- make ${makejobs} ARCH=${_arch} INSTALL_DTBS_PATH=${DESTDIR}/boot dtbs_install
-
- # move dtb that ended up in /boot/broadcom
- mv ${DESTDIR}/boot/broadcom/*dtb ${DESTDIR}/boot
-
- # Generate kernel.img and install it to destdir.
- vmkdir boot
- cp arch/arm64/boot/Image ${DESTDIR}/boot/kernel8.img
-
- hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
-
- # Switch to /usr.
- vmkdir usr
- mv ${DESTDIR}/lib ${DESTDIR}/usr
-
- cd ${DESTDIR}/usr/lib/modules/${_kernver}
- rm -f source build
- ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
-
- cd ${wrksrc}
- # Install required headers to build external modules
- install -Dm644 Makefile ${hdrdest}/Makefile
- install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
- install -Dm644 .config ${hdrdest}/.config
- for file in $(find . -name Kconfig\*); do
- mkdir -p ${hdrdest}/$(dirname $file)
- install -Dm644 $file ${hdrdest}/${file}
- done
- for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
- mkdir -p ${hdrdest}/$(dirname $file)
- install -Dm644 $file ${hdrdest}/${file}
- done
- mkdir -p ${hdrdest}/include
-
- # Remove firmware stuff provided by the "linux-firmware" pkg.
- rm -rf ${DESTDIR}/usr/lib/firmware
-
- for i in acpi asm-generic clocksource config crypto drm generated linux \
- math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
- [ -d include/$i ] && cp -a include/$i ${hdrdest}/include
- done
-
- cd ${wrksrc}
- # Remove helper binaries built for host,
- # if generated files from the scripts/ directory need to be included,
- # they need to be copied to ${hdrdest} before this step
- if [ "$CROSS_BUILD" ]; then
- make ${makejobs} ARCH=${_arch} _mrproper_scripts
- # remove host specific objects as well
- find scripts -name '*.o' -delete
- fi
-
- # Copy files necessary for later builds.
- cp Module.symvers ${hdrdest}
- cp -a scripts ${hdrdest}
- mkdir -p ${hdrdest}/security/selinux
- cp -a security/selinux/include ${hdrdest}/security/selinux
- mkdir -p ${hdrdest}/tools/include
- cp -a tools/include/tools ${hdrdest}/tools/include
- if [ -d "arch/${_arch}/tools" ]; then
- cp -a arch/${_arch}/tools ${hdrdest}/arch/${_arch}
- fi
-
- # copy arch includes for external modules
- mkdir -p ${hdrdest}/arch/${_arch}
- cp -a arch/${_arch}/include ${hdrdest}/arch/${_arch}
-
- mkdir -p ${hdrdest}/arch/${_arch}/kernel
- cp arch/${_arch}/Makefile ${hdrdest}/arch/${_arch}
- cp arch/${_arch}/kernel/asm-offsets.s ${hdrdest}/arch/${_arch}/kernel
- if [ "$_arch" = "arm64" ] ; then
- cp -a arch/${_arch}/kernel/vdso ${hdrdest}/arch/${_arch}/kernel/
- fi
-
- # Add md headers
- mkdir -p ${hdrdest}/drivers/md
- cp drivers/md/*.h ${hdrdest}/drivers/md
-
- # Add inotify.h
- mkdir -p ${hdrdest}/include/linux
- cp include/linux/inotify.h ${hdrdest}/include/linux
-
- # Add wireless headers
- mkdir -p ${hdrdest}/net/mac80211/
- cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
- # Remove unneeded architectures
- # (save the correct one + Kconfig and delete all others)
- mkdir -p arch-backup
- cp -r ${hdrdest}/arch/${_arch} ${hdrdest}/arch/Kconfig arch-backup/
- rm -rf ${hdrdest}/arch
- mv arch-backup ${hdrdest}/arch
- # Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
- mkdir -p ${hdrdest}/arch/x86/ras
- cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
- # Compress all modules with xz to save a few MBs.
- msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
- find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9
-
- # ... and run depmod again.
- depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-
-rpi4-kernel-headers_package() {
- nostrip=yes
- noverifyrdeps=yes
- noshlibprovides=yes
- short_desc="${short_desc/kernel/kernel headers}"
- pkg_install() {
- vmove usr/src
- vmove usr/lib/modules/${_kernver}/build
- }
-}
From e91de066f5eced322e3bf16db6ea8fa7a05af12c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 1 Oct 2022 00:51:22 -0500
Subject: [PATCH 018/343] step-certificates: update to 0.22.1.
---
srcpkgs/step-certificates/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 58801ad8873f..c57edc7b3264 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,6 +1,6 @@
# Template file for 'step-certificates'
pkgname=step-certificates
-version=0.19.0
+version=0.22.1
revision=1
wrksrc=certificates-$version
build_style=go
@@ -19,4 +19,4 @@ license="Apache-2.0"
homepage="https://smallstep.com/certificates/"
changelog="https://raw.githubusercontent.com/smallstep/certificates/master/CHANGELOG.md"
distfiles="https://github.com/smallstep/certificates/archive/refs/tags/v$version.tar.gz"
-checksum=edf8aeaabff2cae9fed4e27177d755be522c20a94a3fd7346de1ec42614d1d46
+checksum=3d22555f7fbd4ec71934a39ceb9bdfd0ec9bd0429c1b790278f598b6771bf8e2
From 3f8be8a07fac8836ed5e9f6338013249714658a3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 1 Oct 2022 00:53:00 -0500
Subject: [PATCH 019/343] step-cli: update to 0.22.0.
---
srcpkgs/step-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 0fe5dc2dd34e..62eddfe91ba9 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,6 +1,6 @@
# Template file for 'step-cli'
pkgname=step-cli
-version=0.19.0
+version=0.22.0
revision=1
wrksrc=cli-$version
build_style=go
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://smallstep.com/cli"
changelog="https://raw.githubusercontent.com/smallstep/cli/master/CHANGELOG.md"
distfiles="https://github.com/smallstep/cli/archive/refs/tags/v$version.tar.gz"
-checksum=a58e63acbfd65a5df84f85715253aa88b566a13af26e2fa1353ae5766b3687d5
+checksum=4cf45acc5b22026f7418825ae5d4dbbc8f1879224e1250c9cc23b382a17775d5
From 2c11f1904d880469a316a5f099d560aac18a495b Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 1 Oct 2022 00:55:58 -0500
Subject: [PATCH 020/343] ifupdown: update to 0.8.37.
---
srcpkgs/ifupdown/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ifupdown/template b/srcpkgs/ifupdown/template
index 584d52eea19b..f9355e0a1de9 100644
--- a/srcpkgs/ifupdown/template
+++ b/srcpkgs/ifupdown/template
@@ -1,8 +1,7 @@
# Template file for 'ifupdown'
pkgname=ifupdown
-version=0.8.35
+version=0.8.37
revision=1
-wrksrc=ifupdown
build_style=gnu-makefile
make_use_env=yes
hostmakedepends="dpkg perl"
@@ -11,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://tracker.debian.org/pkg/ifupdown"
distfiles="http://http.debian.net/debian/pool/main/i/ifupdown/ifupdown_${version}.tar.xz"
-checksum=d754426562a63b7d0cf06e8b00abe353fe9fd7ac5aabe3745f6d4e294ca233a8
+checksum=8db81d5a1b94bb4dc9c169a59d837eeb405a48cd3b1905d10c95ba4030222d24
make_dirs="/etc/network/interfaces.d 0755 root root
/etc/network/if-pre-up.d 0755 root root
From ec0a6f912b7a47438d1ffef1b3721b5191a12bed Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 30 Sep 2022 21:10:50 -0400
Subject: [PATCH 021/343] hunspell: update to 1.7.1.
---
srcpkgs/hunspell/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template
index 7f8a27cf54a9..5f433243f4ab 100644
--- a/srcpkgs/hunspell/template
+++ b/srcpkgs/hunspell/template
@@ -1,7 +1,7 @@
# Template file for 'hunspell'
pkgname=hunspell
-version=1.7.0
-revision=3
+version=1.7.1
+revision=1
build_style=gnu-configure
configure_args="--with-ui"
hostmakedepends="automake bison libtool pkg-config gettext-devel-tools"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, MPL-1.1"
homepage="https://hunspell.github.io/"
distfiles="https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"
-checksum=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a
+checksum=6e3557624c608b3e6525b8bd277706db4f5a857c28fdb3cfa8d0d2b67776da8a
pre_configure() {
autoreconf -fi
From 3f096c2dacf054882b667fd1cf0c12c44f40a3c9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 28 Sep 2022 17:29:48 -0400
Subject: [PATCH 022/343] noto-fonts-cjk: update to 20220127, adopt.
---
srcpkgs/noto-fonts-cjk/template | 27 +++++++++++++++++----------
srcpkgs/noto-fonts-cjk/update | 3 +++
2 files changed, 20 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/noto-fonts-cjk/update
diff --git a/srcpkgs/noto-fonts-cjk/template b/srcpkgs/noto-fonts-cjk/template
index 22494e46b3e4..70d8e74a6ec3 100644
--- a/srcpkgs/noto-fonts-cjk/template
+++ b/srcpkgs/noto-fonts-cjk/template
@@ -1,21 +1,28 @@
# Template file for 'noto-fonts-cjk'
pkgname=noto-fonts-cjk
-version=20190416
-revision=2
-_githash=be6c059ac1587e556e2412b27f5155c8eb3ddbe6
-wrksrc="noto-cjk-${_githash}"
+# set to the date of the latest release packaged
+version=20220127
+revision=1
+# the sans and serif variants are released on separate tags
+_sans_version=2.004
+_serif_version=2.001
+create_wrksrc=yes
depends="font-util"
short_desc="Google Noto CJK Fonts"
-maintainer="Peter Bui <pnutzh4x0r@gmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="OFL-1.1"
homepage="https://www.google.com/get/noto/help/cjk/"
-#changelog="https://raw.githubusercontent.com/googlefonts/noto-cjk/master/NEWS"
-#changelog_prior="https://raw.githubusercontent.com/googlefonts/noto-cjk/master/HISTORY"
-distfiles="https://codeload.github.com/googlefonts/noto-cjk/tar.gz/${_githash}>${pkgname}-${version}.tar.gz"
-checksum=2ad7fe638b1e99255c3d873dc7e0b8434a896f571abdec1a0698cfab3ef618fe
+changelog="https://raw.githubusercontent.com/googlefonts/noto-cjk/main/Sans/NEWS.md
+ https://raw.githubusercontent.com/googlefonts/noto-cjk/main/Serif/NEWS.md"
+distfiles="https://github.com/googlefonts/noto-cjk/releases/download/Sans${_sans_version}/03_NotoSansCJK-OTC.zip
+ https://github.com/googlefonts/noto-cjk/releases/download/Serif${_serif_version}/04_NotoSerifCJKOTC.zip"
+checksum="528f4e1b25ff3badb0321b38d015d954c4c0de926c7830ef50e4a1948f6a3eed
+ 2f0630f88752d50b11a427bdd71f20f7178219e647c56cbaf36c032dbe1ed9d0"
font_dirs="/usr/share/fonts/noto"
do_install() {
- install -Dm644 Noto*.ttc -t ${DESTDIR}/usr/share/fonts/noto
+ vmkdir usr/share/fonts/noto
+ vcopy "*.ttc" usr/share/fonts/noto
+ vcopy "OTC/*.ttc" usr/share/fonts/noto
vlicense LICENSE
}
diff --git a/srcpkgs/noto-fonts-cjk/update b/srcpkgs/noto-fonts-cjk/update
new file mode 100644
index 000000000000..2586e1641459
--- /dev/null
+++ b/srcpkgs/noto-fonts-cjk/update
@@ -0,0 +1,3 @@
+# not perfect, but good enough
+version="${_sans_version}"
+pattern='/archive/refs/tags/Sans\K[\d.]+(?=\.tar\.gz")'
From 34a8da51be3bd07b760fe12b0673bb91bd983574 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 28 Sep 2022 19:12:47 -0400
Subject: [PATCH 023/343] noto-fonts-ttf: update to 20220810, adopt.
---
srcpkgs/noto-fonts-ttf/template | 37 +++++++++++++++++----------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/noto-fonts-ttf/template b/srcpkgs/noto-fonts-ttf/template
index 7367e0a46526..13b12d3c23d5 100644
--- a/srcpkgs/noto-fonts-ttf/template
+++ b/srcpkgs/noto-fonts-ttf/template
@@ -1,21 +1,25 @@
# Template file for 'noto-fonts-ttf'
pkgname=noto-fonts-ttf
-version=20190926
-revision=2
-_githash=0fa1dfabd6e3746bb7463399e2813f60d3f1b256
+version=20220810
+revision=1
+_githash=2725c70baa8b0176c7577093ba1fc6179aa79478
wrksrc="noto-fonts-${_githash}"
depends="font-util"
short_desc="Google Noto TTF Fonts"
-maintainer="Peter Bui <pbui@github.bx612.space>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="OFL-1.1"
homepage="https://www.google.com/get/noto/"
-distfiles="https://codeload.github.com/googlefonts/noto-fonts/tar.gz/${_githash}>${pkgname}-${version}.tar.gz"
-checksum=6ca2938b99e4316c6eabdab498f577efb979c4f2aeaf5a3a357ab4e3dcc2c2a5
+# XXX: change to https://github.com/notofonts/notofonts.github.io/tree/main/fonts when migration is complete
+# also see https://github.com/notofonts/noto-fonts/issues/2388
+distfiles="https://github.com/notofonts/noto-fonts/archive/${_githash}.tar.gz"
+checksum=c1238ca0fc1e954ee2be444cafd53c033b13fa93f8a1e88f7137e9e028e6891e
font_dirs="/usr/share/fonts/noto"
do_install() {
- install -Dm644 hinted/Noto*/* -t ${DESTDIR}/usr/share/fonts/noto
- install -Dm644 unhinted/Noto*/* -t ${DESTDIR}/usr/share/fonts/noto
+ # remove duplicates
+ rm hinted/ttf/NotoSansTifinagh/NotoSansTifinagh[AGHRST]*.ttf
+ vmkdir usr/share/fonts/noto
+ vcopy "hinted/ttf/Noto*/*" usr/share/fonts/noto
vlicense LICENSE
}
@@ -23,18 +27,15 @@ noto-fonts-ttf-extra_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - additional variants"
pkg_install() {
- vmove usr/share/fonts/noto/Noto*-ExtraCondensed*.ttf
- vmove usr/share/fonts/noto/Noto*-Condensed*.ttf
- vmove usr/share/fonts/noto/Noto*-SemiCondensed*.ttf
+ vmove "usr/share/fonts/noto/Noto*-*Condensed*.ttf"
- vmove usr/share/fonts/noto/Noto*-Thin*.ttf
- vmove usr/share/fonts/noto/Noto*-ExtraLight*.ttf
- vmove usr/share/fonts/noto/Noto*-Light*.ttf
+ vmove "usr/share/fonts/noto/Noto*-*Thin*.ttf"
+ vmove "usr/share/fonts/noto/Noto*-*Light*.ttf"
# keep *-Regular*
- vmove usr/share/fonts/noto/Noto*-Medium*.ttf
- vmove usr/share/fonts/noto/Noto*-SemiBold*.ttf
+ vmove "usr/share/fonts/noto/Noto*-*Medium*.ttf"
+ vmove "usr/share/fonts/noto/Noto*-*SemiBold*.ttf"
# keep *-Bold*
- vmove usr/share/fonts/noto/Noto*-ExtraBold*.ttf
- vmove usr/share/fonts/noto/Noto*-Black*.ttf
+ vmove "usr/share/fonts/noto/Noto*-*ExtraBold*.ttf"
+ vmove "usr/share/fonts/noto/Noto*-*Black*.ttf"
}
}
From d2f33c057f4b2ffc170d494cffa95f53fd242dfe Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 28 Sep 2022 19:26:31 -0400
Subject: [PATCH 024/343] google-fonts-ttf: remove duplicate noto fonts.
---
srcpkgs/google-fonts-ttf/files/dup.lst | 2 --
srcpkgs/google-fonts-ttf/template | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-fonts-ttf/files/dup.lst b/srcpkgs/google-fonts-ttf/files/dup.lst
index 6dbf0b0ea32b..ed88c5aff435 100644
--- a/srcpkgs/google-fonts-ttf/files/dup.lst
+++ b/srcpkgs/google-fonts-ttf/files/dup.lst
@@ -21,8 +21,6 @@ ofl/ibmplexsansthai
ofl/ibmplexsansthailooped
ofl/ibmplexserif
ofl/manjari
-ofl/notocoloremoji
-ofl/notocoloremojicompattest
ofl/opensans
ofl/sourcesans3
ofl/vollkorn
diff --git a/srcpkgs/google-fonts-ttf/template b/srcpkgs/google-fonts-ttf/template
index 190cccbc6160..d175da1e8f96 100644
--- a/srcpkgs/google-fonts-ttf/template
+++ b/srcpkgs/google-fonts-ttf/template
@@ -1,7 +1,7 @@
# Template file for 'google-fonts-ttf'
pkgname=google-fonts-ttf
version=20220819
-revision=2
+revision=3
_githash=4d93a40d26493aa652ce200dab43ed80e2194213
wrksrc="fonts-${_githash}"
# Those fonts were provided by google-fonts-ttf
@@ -24,6 +24,8 @@ post_extract() {
xargs rm -r <"$FILESDIR/dup.lst"
# ttf-ubuntu-font-family
rm -r ufl
+ # noto-fonts-ttf
+ rm -r ofl/noto*
}
From a235d00373293f1033514bb0b5ae81d1f24a8725 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 28 Sep 2022 21:18:54 -0400
Subject: [PATCH 025/343] noto-fonts-emoji: adopt.
---
srcpkgs/noto-fonts-emoji/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/noto-fonts-emoji/template b/srcpkgs/noto-fonts-emoji/template
index 1a7845a24856..0cb071ce267c 100644
--- a/srcpkgs/noto-fonts-emoji/template
+++ b/srcpkgs/noto-fonts-emoji/template
@@ -7,7 +7,7 @@ revision=1
wrksrc=noto-emoji-${version}
depends="font-util"
short_desc="Google Noto Emoji Fonts"
-maintainer="Peter Bui <pnutzh4x0r@gmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="OFL-1.1"
homepage="https://www.google.com/get/noto/"
distfiles="https://github.com/googlefonts/noto-emoji/archive/v${version}.tar.gz"
From a83a8fc7b4601ea5f8b96a0e6eeef28409e07075 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 30 Sep 2022 22:26:15 -0400
Subject: [PATCH 026/343] openmsx: update to 18.0.
---
srcpkgs/openmsx/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index 8475c00fd311..0e07b2b58595 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -1,19 +1,24 @@
# Template file for 'openmsx'
pkgname=openmsx
-version=0.15.0
-revision=3
-hostmakedepends="pkg-config python"
-makedepends="SDL-devel glew-devel libao-devel libtheora-devel libvorbis-devel
- libpng-devel libxml2-devel SDL_ttf-devel tcl-devel"
+version=18.0
+revision=1
+hostmakedepends="pkg-config python3"
+makedepends="SDL2-devel glew-devel libao-devel libtheora-devel libvorbis-devel
+ libpng-devel libxml2-devel SDL2_ttf-devel tcl-devel"
short_desc="MSX emulator that aims for perfection"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://openmsx.org"
+changelog="https://raw.githubusercontent.com/openMSX/openMSX/master/doc/release-history.txt"
distfiles="https://github.com/openMSX/openMSX/releases/download/RELEASE_${version//\./_}/openmsx-${version}.tar.gz"
-checksum=93f209d8fed2e04e62526469bb6bb431b82ea4d07ecdc45dab2b8cc4ca21d62a
+checksum=23db7756e6c6b5cfd157bb4720a0d96aa2bb75e88d1fdf5a0f76210eef4aff60
nocross="can't use CXX prefixed with triplet"
CXXFLAGS="-Wno-narrowing -O3"
+case "$XBPS_TARGET_MACHINE" in
+ i686*) broken="can't find C++ compiler despite being given it"
+esac
+
do_build() {
vsed -e 's@\(SYMLINK_FOR_BINARY:=\)true@\1false@' -i build/custom.mk
vsed -e 's@\(INSTALL_BASE:=\)/opt/openMSX@\1/usr/share/openmsx@' -i build/custom.mk
From a4e5bbd8c9d86f1994003d1621e11364da10058f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sun, 24 Jul 2022 22:09:09 -0400
Subject: [PATCH 027/343] python3-shapely: update to 1.8.4.
---
srcpkgs/python3-shapely/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 7ca8f0ddd041..84d90a5aab8a 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,6 +1,6 @@
# Template file for 'python3-shapely'
pkgname=python3-shapely
-version=1.8.1
+version=1.8.4
revision=1
wrksrc="shapely-${version}"
build_style=python3-module
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/shapely/shapely"
distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz"
-checksum=daf4d5ceae7d1e4053d96af760377b843787cae0b42e6d9d19eb832204c7c8a4
+checksum=e27c49ab0019b9e47bf4f35545b2868af34731e22be755f56f22b5278d3e4efd
pre_configure() {
if [ "$CROSS_BUILD" ]; then
From a33aaa064979b40b07bd9b3dd3f9541b4f0e33bb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 1 Oct 2022 08:28:33 +0300
Subject: [PATCH 028/343] rssguard: update to 4.2.5.
---
srcpkgs/rssguard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 2a2325f6cd60..563460a2c5d3 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
# Template file for 'rssguard'
pkgname=rssguard
-version=4.2.4
+version=4.2.5
revision=1
build_style=cmake
configure_args="-DUSE_WEBENGINE=false"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="GPL-3.0-only"
homepage="https://github.com/martinrotter/rssguard"
distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=523e61b4e0a05ea587d8b66c030cd452a51f8030d54b9dd2f4127527eb25a2d9
+checksum=a4d6bd479b24a045d3e7f461e4b722dafb2a364b77990c96b5c8df3e29c4fb3b
post_install() {
# Install rssguard icon manually
From f5cfd35d4d63e0f35b769f5ce923a5047610b567 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 30 Sep 2022 21:17:43 -0400
Subject: [PATCH 029/343] Pyrex: remove package.
python 2, last released in 2010, no mailing list activity since 2018.
---
srcpkgs/Pyrex/template | 13 -------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 13 deletions(-)
delete mode 100644 srcpkgs/Pyrex/template
diff --git a/srcpkgs/Pyrex/template b/srcpkgs/Pyrex/template
deleted file mode 100644
index c39b0d18e31a..000000000000
--- a/srcpkgs/Pyrex/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'Pyrex'
-pkgname=Pyrex
-version=0.9.9
-revision=5
-build_style=python2-module
-hostmakedepends="python"
-makedepends="python-devel"
-short_desc="Language for writing Python extension modules"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex"
-distfiles="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/${pkgname}-${version}.tar.gz"
-checksum=5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9c9b0611a47e..ceb26f802e7c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -13,6 +13,7 @@ replaces="
MoinMoin<=1.9.11_1
MultiMC<=0.6.13_1
Platinum9-theme<=0.0.0.20170720_3
+ Pyrex<=0.9.9_5
SMC<=1.9_9
Venom<=0.5.5_1
XorCurses<=0.2.2_1
From c5d4f72dd157b60d81b1e57607937d2b8a8356ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 1 Oct 2022 09:14:51 +0200
Subject: [PATCH 030/343] doctl: update to 1.82.2.
---
srcpkgs/doctl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 854f70023e13..a9a18e63e3b1 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
# Template file for 'doctl'
pkgname=doctl
-version=1.82.1
+version=1.82.2
revision=1
build_style=go
go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/digitalocean/doctl"
distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=c104a6ad5efef3a7b71f2e539d0a9ab6a59f607669e520ba48b2afe8f077d12a
+checksum=45f94cf7f530f85a7510e735ba3cec4e934575d654c12de5da6a5d10a959ab97
From 6b4138c919318b547395be1c489d62e51ad41732 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 30 Sep 2022 21:26:29 -0400
Subject: [PATCH 031/343] GCP-Guest-Environment: move to python3
supports both python 2 and 3, but was using 2 still
---
srcpkgs/GCP-Guest-Environment/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GCP-Guest-Environment/template b/srcpkgs/GCP-Guest-Environment/template
index c2733015eb0b..1a237402da69 100644
--- a/srcpkgs/GCP-Guest-Environment/template
+++ b/srcpkgs/GCP-Guest-Environment/template
@@ -1,12 +1,13 @@
# Template file for 'GCP-Guest-Environment'
pkgname=GCP-Guest-Environment
version=20191210
-revision=2
+revision=3
wrksrc="compute-image-packages-${version}"
build_wrksrc="packages/python-google-compute-engine"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="${hostmakedepends} python-boto socklog-void"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-distro"
+depends="${hostmakedepends} socklog-void"
+checkdepends="${depends} python3-pytest python3-pytest-cov"
short_desc="Packages for Google Compute Engine Linux images"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
@@ -14,6 +15,10 @@ homepage="https://github.com/GoogleCloudPlatform/compute-image-packages"
distfiles="https://github.com/GoogleCloudPlatform/compute-image-packages/archive/v${version}.tar.gz"
checksum=19a2ca537f876e4a19341646f2865c6429b8ea041a3a6651ff8c1ed966f72fe1
+do_check() {
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k 'not CallDhclientIpv6'
+}
+
post_install() {
for _i in Guest-Initialization accounts clock-skew ip-forwarding ; do
vsv GCP-$_i;
From 1b4a3fb5920b4993c96b6bc05bc1deac5c26b832 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 30 Sep 2022 21:34:05 -0400
Subject: [PATCH 032/343] python{,3}-boto: remove package.
with the update of GCP-Guest-Environment to python3, no longer needed.
---
srcpkgs/python-boto/template | 71 -------------------------------
srcpkgs/python3-boto | 1 -
srcpkgs/removed-packages/template | 2 +
3 files changed, 2 insertions(+), 72 deletions(-)
delete mode 100644 srcpkgs/python-boto/template
delete mode 120000 srcpkgs/python3-boto
diff --git a/srcpkgs/python-boto/template b/srcpkgs/python-boto/template
deleted file mode 100644
index 354b4d3af547..000000000000
--- a/srcpkgs/python-boto/template
+++ /dev/null
@@ -1,71 +0,0 @@
-# Template file for 'python-boto'
-pkgname=python-boto
-version=2.49.0
-revision=5
-wrksrc="boto-${version}"
-build_style=python-module
-pycompile_module="boto"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python interface to Amazon Web Services (Python2)"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="MIT"
-homepage="http://docs.pythonboto.org/"
-changelog="https://raw.githubusercontent.com/boto/boto/develop/docs/source/releasenotes/v${version}.rst"
-distfiles="https://github.com/boto/boto/archive/${version}.tar.gz"
-checksum=3dbefd4f4542f85a323d4f54601f31ed4d362fc87945245f32e4a85029513314
-alternatives="
- boto:asadmin:/usr/bin/asadmin2
- boto:bundle_image:/usr/bin/bundle_image2
- boto:cfadmin:/usr/bin/cfadmin2
- boto:cq:/usr/bin/cq2
- boto:cwutil:/usr/bin/cwutil2
- boto:dynamodb_dump:/usr/bin/dynamodb_dump2
- boto:dynamodb_load:/usr/bin/dynamodb_load2
- boto:elbadmin:/usr/bin/elbadmin2
- boto:fetch_file:/usr/bin/fetch_file2
- boto:glacier:/usr/bin/glacier2
- boto:instance_events:/usr/bin/instance_events2
- boto:kill_instance:/usr/bin/kill_instance2
- boto:launch_instance:/usr/bin/launch_instance2
- boto:list_instances:/usr/bin/list_instances2
- boto:mturk:/usr/bin/mturk2
- boto:pyami_sendmail:/usr/bin/pyami_sendmail2
- boto:s3put:/usr/bin/s3put2
- boto:sdbadmin:/usr/bin/sdbadmin2
- boto:taskadmin:/usr/bin/taskadmin2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-boto_package() {
- depends="python3"
- pycompile_module="boto"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="
- boto:asadmin:/usr/bin/asadmin3
- boto:bundle_image:/usr/bin/bundle_image3
- boto:cfadmin:/usr/bin/cfadmin3
- boto:cq:/usr/bin/cq3
- boto:cwutil:/usr/bin/cwutil3
- boto:dynamodb_dump:/usr/bin/dynamodb_dump3
- boto:dynamodb_load:/usr/bin/dynamodb_load3
- boto:elbadmin:/usr/bin/elbadmin3
- boto:fetch_file:/usr/bin/fetch_file3
- boto:glacier:/usr/bin/glacier3
- boto:instance_events:/usr/bin/instance_events3
- boto:kill_instance:/usr/bin/kill_instance3
- boto:launch_instance:/usr/bin/launch_instance3
- boto:list_instances:/usr/bin/list_instances3
- boto:mturk:/usr/bin/mturk3
- boto:pyami_sendmail:/usr/bin/pyami_sendmail3
- boto:s3put:/usr/bin/s3put3
- boto:sdbadmin:/usr/bin/sdbadmin3
- boto:taskadmin:/usr/bin/taskadmin3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-boto b/srcpkgs/python3-boto
deleted file mode 120000
index 43ba1796b6d4..000000000000
--- a/srcpkgs/python3-boto
+++ /dev/null
@@ -1 +0,0 @@
-python-boto
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ceb26f802e7c..574d278136fb 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -332,6 +332,7 @@ replaces="
python-Pygments<=2.5.2_4
python-SecretStorage<=2.3.1_4
python-audit<=2.8.5_2
+ python-boto<=2.49.0_5
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
python-crypto<=3.9.7_3
@@ -381,6 +382,7 @@ replaces="
python3-aiohttp-cors2<=0.7.0_3
python3-aiohttp2<=2.3.10_4
python3-bluez<=0.23_2
+ python3-boto<=2.49.0_5
python3-docker-pycreds<=0.4.0_4
python3-grako<=3.99.9_7
python3-idna-ssl<=1.1.0_3
From 81ef5cc30545ae7d6aed452c2f64b3acf80765aa Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Oct 2022 08:49:20 +0200
Subject: [PATCH 033/343] colobot-data: add update file
---
srcpkgs/colobot-data/update | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 srcpkgs/colobot-data/update
diff --git a/srcpkgs/colobot-data/update b/srcpkgs/colobot-data/update
new file mode 100644
index 000000000000..4a1c1ec66245
--- /dev/null
+++ b/srcpkgs/colobot-data/update
@@ -0,0 +1,2 @@
+site="https://github.com/colobot/colobot-data/tags"
+pattern="/colobot/colobot-data/archive/refs/tags/colobot-gold-\K[\d.]+(?=-alpha\.tar\.gz)"
From de53f54052e92b407bfa9c559faa3187aac373c9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Oct 2022 08:50:15 +0200
Subject: [PATCH 034/343] colobot: add update file
---
srcpkgs/colobot/update | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 srcpkgs/colobot/update
diff --git a/srcpkgs/colobot/update b/srcpkgs/colobot/update
new file mode 100644
index 000000000000..224869daa234
--- /dev/null
+++ b/srcpkgs/colobot/update
@@ -0,0 +1,2 @@
+site="https://github.com/colobot/colobot/tags"
+pattern="/colobot/colobot/archive/refs/tags/colobot-gold-\K[\d.]+(?=-alpha\.tar\.gz)"
From fdc14f8e99a4e17390e2999b2fa12ecaca31c6dd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 1 Oct 2022 08:12:32 +0300
Subject: [PATCH 035/343] jupp: update to 3.1jupp41.
---
srcpkgs/jupp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jupp/template b/srcpkgs/jupp/template
index 4860f04092de..2618b4c4a548 100644
--- a/srcpkgs/jupp/template
+++ b/srcpkgs/jupp/template
@@ -1,6 +1,6 @@
# Template file for 'jupp'
pkgname=jupp
-version=3.1jupp40
+version=3.1jupp41
revision=1
wrksrc=jupp
build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-1.0-or-later"
homepage="https://www.mirbsd.org/jupp.htm"
changelog="https://www.mirbsd.org/jupp.htm#clog"
distfiles="https://www.mirbsd.org/MirOS/dist/${pkgname}/joe-${version}.tgz"
-checksum=4bed439cde7f2be294e96e49ef3e913ea90fbe5e914db888403e3a27e8035b1a
+checksum=7bb8ea8af519befefff93ec3c9e32108d7f2b83216c9bc7b01aef5098861c82f
conflicts="joe>=0"
pre_configure() {
From bcea4389a75f3e7a1647a855ea8aa59ec3f23775 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 1 Oct 2022 08:09:08 +0300
Subject: [PATCH 036/343] CopyQ: update to 6.3.2.
---
srcpkgs/CopyQ/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index 028e3de7cf19..cc16f0151a5e 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
# Template file for 'CopyQ'
pkgname=CopyQ
-version=6.3.1
+version=6.3.2
revision=1
build_style=cmake
hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
homepage="https://hluk.github.io/CopyQ/"
changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=784fd7a7d5ceb2ac59eaec18c89e40ae154e5a5c2778a4edb9938e45c7744cfe
+checksum=ce122ed7f8e3e230b1c6dcce8f1ec6d717eef8c59829390cae1750c35b342c4a
From da23a213c86dc9484a4ff9b50be52ce979c82181 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Fri, 30 Sep 2022 12:11:19 -0500
Subject: [PATCH 037/343] idesk: update to 0.7.8.
Switching upstream to maintained fork at
https://github.com/neagix/idesk
Also include upstream patch to use pkg-config instead of imlib2-config,
which has been removed from imlib2
---
srcpkgs/idesk/patches/pkg-config.patch | 31 ++++++++++++++++++++++++++
srcpkgs/idesk/template | 25 +++++++++------------
2 files changed, 41 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/idesk/patches/pkg-config.patch
diff --git a/srcpkgs/idesk/patches/pkg-config.patch b/srcpkgs/idesk/patches/pkg-config.patch
new file mode 100644
index 000000000000..718bef968f26
--- /dev/null
+++ b/srcpkgs/idesk/patches/pkg-config.patch
@@ -0,0 +1,31 @@
+Taken from https://github.com/neagix/idesk/commit/7ed7fae76d2896e02c115448b569d964dab895ee
+use pkg-config to find imlib2
+
+diff --git a/configure.in b/configure.in
+index 805585d..b7a1032 100644
+--- a/configure.in
++++ b/configure.in
+@@ -94,19 +94,10 @@ LIBS="$LIBS $Xext_lib"
+
+ dnl Imlib2 detection
+
+-AC_PATH_GENERIC(imlib2, , [
+- AC_SUBST(IMLIB_LIBS)
+- AC_SUBST(IMLIB_CXXFLAGS) ],
+- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?
+- You need Imlib2 to build Idesk. Verify that you have Imlib2-dev))
+-
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CXXFLAGS)
+-
+-CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS"
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0])
++
++CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS"
+ LIBS="$LIBS $IMLIB_LIBS"
+
+
diff --git a/srcpkgs/idesk/template b/srcpkgs/idesk/template
index 19d6d4979b36..c94dfb538469 100644
--- a/srcpkgs/idesk/template
+++ b/srcpkgs/idesk/template
@@ -1,27 +1,22 @@
# Template file for 'idesk'
pkgname=idesk
-version=0.7.5
-revision=2
+version=0.7.8
+revision=1
build_style=gnu-configure
-hostmakedepends="pkg-config"
+configure_args="--enable-svg"
+hostmakedepends="pkg-config automake"
makedepends="giflib-devel imlib2-devel libjpeg-turbo-devel
- libpng-devel libXft-devel libXpm-devel tiff-devel"
+ libpng-devel libXft-devel libXpm-devel tiff-devel librsvg-devel gdk-pixbuf-devel"
short_desc="Gives users of minimal wm's icons on their desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
-homepage="http://idesk.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/idesk/idesk-${version}.tar.bz2"
-checksum=d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
+homepage="https://github.com/neagix/idesk"
+changelog="https://raw.githubusercontent.com/neagix/idesk/master/ChangeLog"
+distfiles="https://github.com/neagix/idesk/archive/refs/tags/v${version}.tar.gz"
+checksum=cb5ccc4e598d4d6de41a55512f0bff5afae16da499009b109322e43286c1c7bd
pre_configure() {
- sed -i -e '1,1i#include <unistd.h>' \
- -e '1,1i#include <sys/stat.h>' \
- -e '1,1i#include <sys/types.h>' \
- src/DesktopConfig.cpp
-
- sed -i 's#usr/local#usr#' examples/default.lnk
- sed -i 's#IMLIB2_LIBS=.*#IMLIB2_LIBS=-lImlib2#g' configure
- sed -i 's#IMLIB_LIBS=.*#IMLIB_LIBS="-L/usr/lib -Wl,-O1,--sort-common,--as-needed,-z,relro -ljpeg -ltiff -lgif -lpng -lz -lm -lXext -lXext -lX11 -lImlib2"#g' configure
+ autoreconf -fi
}
post_install() {
From bb75b3d8ab5a84345cbe0b81db02c3a3e5eadf77 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 1 Oct 2022 07:46:48 +0200
Subject: [PATCH 038/343] python3-pytest-mock: update to 3.9.0
---
srcpkgs/python3-pytest-mock/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index 3cbfc61e835a..e4925919bf2d 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-mock'
pkgname=python3-pytest-mock
-version=3.7.0
+version=3.9.0
revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="Thin-wrapper around mock for easier use with py.test (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-mock/"
+changelog="https://raw.githubusercontent.com/pytest-dev/pytest-mock/main/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=5112bd92cc9f186ee96e1a92efc84969ea494939c3aead39c50f421c4cc69534
+checksum=c899a0dcc8a5f22930acd020b500abd5f956911f326864a3b979e4866e14da82
# pytest-mock requires pytest-mock to be installed so it'll always fail during
# packaging
From 62c006aff1ddd73706e31df5e920c26c12e8f277 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 11:49:23 +0200
Subject: [PATCH 039/343] python3-gobject: update to 3.42.2.
---
..._insert_with_valuesv_with_newer_gtk4.patch | 84 -------------------
srcpkgs/python3-gobject/template | 9 +-
2 files changed, 3 insertions(+), 90 deletions(-)
delete mode 100644 srcpkgs/python3-gobject/patches/restore_gtk_liststore_insert_with_valuesv_with_newer_gtk4.patch
diff --git a/srcpkgs/python3-gobject/patches/restore_gtk_liststore_insert_with_valuesv_with_newer_gtk4.patch b/srcpkgs/python3-gobject/patches/restore_gtk_liststore_insert_with_valuesv_with_newer_gtk4.patch
deleted file mode 100644
index 1d7f06e2f09f..000000000000
--- a/srcpkgs/python3-gobject/patches/restore_gtk_liststore_insert_with_valuesv_with_newer_gtk4.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From db472c14416da879fdd1ba685928be9b7c919e57 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 19 Sep 2021 16:52:15 +0200
-Subject: [PATCH] gtk overrides: restore Gtk.ListStore.insert_with_valuesv with
- newer gtk4
-
-It got renamed in gtk 4.1.0, see https://gitlab.gnome.org/GNOME/gtk/-/commit/a1216599ff6b39bca3e936fbf
-To avoid an API break and make porting easier provide both versions for
-all users.
-
-Fixes #467
----
- gi/overrides/Gtk.py | 9 ++++++++-
- tests/test_docstring.py | 5 +++--
- tests/test_overrides_gtk.py | 14 ++++++++++++++
- 3 files changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py
-index 7739751e..f53ec6bd 100644
---- ./gi/overrides/Gtk.py
-+++ ./gi/overrides/Gtk.py
-@@ -995,10 +995,17 @@ class ListStore(Gtk.ListStore, TreeModel, TreeSortable):
- Gtk.ListStore.__init__(self)
- self.set_column_types(column_types)
-
-+ # insert_with_valuesv got renamed to insert_with_values with 4.1.0
-+ # https://gitlab.gnome.org/GNOME/gtk/-/commit/a1216599ff6b39bca3e9
-+ if not hasattr(Gtk.ListStore, "insert_with_valuesv"):
-+ insert_with_valuesv = Gtk.ListStore.insert_with_values
-+ elif not hasattr(Gtk.ListStore, "insert_with_values"):
-+ insert_with_values = Gtk.ListStore.insert_with_valuesv
-+
- def _do_insert(self, position, row):
- if row is not None:
- row, columns = self._convert_row(row)
-- treeiter = self.insert_with_valuesv(position, columns, row)
-+ treeiter = self.insert_with_values(position, columns, row)
- else:
- treeiter = Gtk.ListStore.insert(self, position)
-
-diff --git a/tests/test_docstring.py b/tests/test_docstring.py
-index 29b7e5ef..49d030f5 100644
---- ./tests/test_docstring.py
-+++ ./tests/test_docstring.py
-@@ -93,8 +93,9 @@ class Test(unittest.TestCase):
- @unittest.skipUnless(Gtk, 'no Gtk')
- def test_shared_array_length_with_prior_out_arg(self):
- # Test the 'iter' out argument does not effect length argument skipping.
-- self.assertEqual(Gtk.ListStore.insert_with_valuesv.__doc__,
-- 'insert_with_valuesv(self, position:int, columns:list, values:list) -> iter:Gtk.TreeIter')
-+ self.assertRegex(
-+ Gtk.ListStore.insert_with_valuesv.__doc__,
-+ 'insert_with_values.*\\(self, position:int, columns:list, values:list\\) -> iter:Gtk.TreeIter')
-
- def test_sub_class_doc(self):
- class A(GObject.Object):
-diff --git a/tests/test_overrides_gtk.py b/tests/test_overrides_gtk.py
-index 72fd2c8e..6bd2345a 100644
---- ./tests/test_overrides_gtk.py
-+++ ./tests/test_overrides_gtk.py
-@@ -1377,6 +1377,20 @@ class TestCustomSorter():
- assert result.props.name == member
-
-
-+@unittest.skipUnless(Gtk, 'Gtk not available')
-+class TestListStore(unittest.TestCase):
-+
-+ def test_insert_with_values(self):
-+ model = Gtk.ListStore(int)
-+ assert hasattr(model, 'insert_with_values')
-+ iter_ = model.insert_with_values(0, (0,), [42])
-+ assert isinstance(iter_, Gtk.TreeIter)
-+ assert hasattr(model, 'insert_with_valuesv')
-+ iter_ = model.insert_with_valuesv(0, (0,), [43])
-+ assert isinstance(iter_, Gtk.TreeIter)
-+ assert len(model) == 2
-+
-+
- @ignore_gi_deprecation_warnings
- @unittest.skipUnless(Gtk, 'Gtk not available')
- class TestTreeModel(unittest.TestCase):
---
-GitLab
-
diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index d14b48f66e6b..b6122dd52c10 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
# Template file for 'python3-gobject'
pkgname=python3-gobject
-version=3.42.0
+version=3.42.2
revision=1
wrksrc="pygobject-${version}"
build_style=meson
@@ -15,11 +15,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://pygobject.readthedocs.io/"
distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=9b12616e32cfc792f9dc841d9c472a41a35b85ba67d3a6eb427e307a6fe4367b
-
-do_check() {
- xvfb-run ninja -C build test
-}
+checksum=ade8695e2a7073849dd0316d31d8728e15e1e0bc71d9ff6d1c09e86be52bc957
+make_check_pre="xvfb-run"
python3-gobject-devel_package() {
depends="libgirepository-devel python3-cairo-devel
From 3ba5825c2a1d8696c93c444c4f0c3612cc9f8e5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:09:25 +0200
Subject: [PATCH 040/343] gnome-maps: remove unused gfbgraph dependency
unused since 41.0
---
srcpkgs/gnome-maps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 2aa746f680de..dd5a5024aaf7 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
version=42.3
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel
gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel
libgweather-devel"
-depends="geoclue2 gfbgraph gjs libhandy1 libgweather"
+depends="geoclue2 gjs libhandy1 libgweather"
short_desc="GNOME maps application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From ee2250a24273c1ea6f0518816b3aab33858d43bf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:51:41 +0200
Subject: [PATCH 041/343] perl: update to 5.36.0.
---
common/shlibs | 2 +-
srcpkgs/perl/files/multiplicity.patch | 39 ++++++++++
srcpkgs/perl/template | 103 +++++++++++++-------------
3 files changed, 93 insertions(+), 51 deletions(-)
create mode 100644 srcpkgs/perl/files/multiplicity.patch
diff --git a/common/shlibs b/common/shlibs
index 669c4eb19fec..33311eb0fed8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -62,7 +62,7 @@ liblto_plugin.so.0 gcc-4.7.3_1
libgcc_s.so.1 libgcc-4.4.0_1
libgo.so.16 libgo-10.2.0_1
libgccjit.so.0 libgccjit-10.2.1pre1_1
-libperl.so.5.34 perl-5.34.0_1
+libperl.so.5.36 perl-5.36.0_1
libgmp.so.10 gmp-5.0.1_1
libgmpxx.so.4 gmpxx-6.0.0_2
libmpfi.so.0 mpfi-1.5.3_1
diff --git a/srcpkgs/perl/files/multiplicity.patch b/srcpkgs/perl/files/multiplicity.patch
new file mode 100644
index 000000000000..976f9d388047
--- /dev/null
+++ b/srcpkgs/perl/files/multiplicity.patch
@@ -0,0 +1,39 @@
+From a31a5cddd6c52fd21976b9cbff303b966c4a3122 Mon Sep 17 00:00:00 2001
+From: Alex Suykov <alex.suykov@gmail.com>
+Date: Tue, 7 Jun 2022 17:50:03 +0300
+Subject: [PATCH] enable multiplicity whenever ithreads are enabled
+
+---
+ cnf/configure_misc.sh | 1 -
+ cnf/configure_thrd.sh | 3 +++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cnf/configure_misc.sh b/cnf/configure_misc.sh
+index 77d73b4..33b1834 100644
+--- a/cnf/configure_misc.sh
++++ b/cnf/configure_misc.sh
+@@ -62,7 +62,6 @@ define usekernprocpathname 'undef'
+ define uselongdouble 'undef'
+ define usemallocwrap 'define'
+ define usemorebits 'undef'
+-define usemultiplicity 'undef'
+ define usemymalloc 'n'
+ define usenamedanoncv 'undef'
+ define usenm 'false'
+diff --git a/cnf/configure_thrd.sh b/cnf/configure_thrd.sh
+index 6e63b68..8874a1d 100644
+--- a/cnf/configure_thrd.sh
++++ b/cnf/configure_thrd.sh
+@@ -14,9 +14,12 @@ if [ "$usethreads" = 'define' ]; then
+ define use5005threads 'undef'
+ result 'yes, ithreads'
+ fi
++
++ define usemultiplicity "$useithreads"
+ else
+ define useithreads 'undef'
+ define use5005threads 'undef'
++ define usemultiplicity 'undef'
+ result 'no'
+ msg "Disabling thread-related stuff"
+ fi
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 54ce2298d139..216f30ba4a81 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,8 +1,8 @@
# Template file for 'perl'
pkgname=perl
-version=5.34.1
+version=5.36.0
revision=1
-_perl_cross_version=1.3.7
+_perl_cross_version=1.4
build_style=gnu-configure
hostmakedepends="less"
makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
@@ -14,128 +14,128 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://www.perl.org"
distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="357951a491b0ba1ce3611263922feec78ccd581dddc24a446b033e25acf242a1
- 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335"
+checksum="e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a
+ be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91"
# Before updating this package to a new major version, run ${FILESDIR}/provides.pl
# against ${wrksrc} to find the list of built in packages.
-provides="perl-Archive-Tar-2.38_1
- perl-Attribute-Handlers-1.01_1
+provides="perl-Archive-Tar-2.40_1
+ perl-Attribute-Handlers-1.02_1
perl-AutoLoader-5.74_1
- perl-CPAN-2.28_1
+ perl-CPAN-2.33_1
perl-CPAN-Meta-2.150010_1
perl-CPAN-Meta-Requirements-2.140_1
perl-CPAN-Meta-YAML-0.018_1
perl-Carp-1.52_1
- perl-Compress-Raw-Bzip2-2.101_1
- perl-Compress-Raw-Zlib-2.101_1
+ perl-Compress-Raw-Bzip2-2.103_1
+ perl-Compress-Raw-Zlib-2.105_1
perl-Config-Perl-V-0.33_1
- perl-DB_File-1.855_1
- perl-Data-Dumper-2.179_1
- perl-Devel-PPPort-3.62_1
+ perl-DB_File-1.857_1
+ perl-Data-Dumper-2.184_1
+ perl-Devel-PPPort-3.68_1
perl-Devel-SelfStubber-1.06_1
- perl-Digest-1.19_1
+ perl-Digest-1.20_1
perl-Digest-MD5-2.58_1
perl-Digest-SHA-6.02_1
perl-Dumpvalue-1.21_1
- perl-Encode-3.08.01_1
+ perl-Encode-3.17_1
perl-Env-1.05_1
- perl-Exporter-5.76_1
+ perl-Exporter-5.77_1
perl-ExtUtils-CBuilder-0.280236_1
perl-ExtUtils-Constant-0.25_1
perl-ExtUtils-Install-2.20_1
- perl-ExtUtils-MakeMaker-7.62_1
+ perl-ExtUtils-MakeMaker-7.64_1
perl-ExtUtils-Manifest-1.73_1
perl-ExtUtils-PL2Bat-0.004_1
- perl-ExtUtils-ParseXS-3.43_1
- perl-File-Fetch-1.00_1
+ perl-ExtUtils-ParseXS-3.45_1
+ perl-File-Fetch-1.04_1
perl-File-Path-2.18_1
perl-File-Temp-0.2311_1
perl-Filter-Simple-0.96_1
perl-Filter-Util-Call-1.60_1
- perl-FindBin-1.52_1
+ perl-FindBin-1.53_1
perl-Getopt-Long-2.52_1
- perl-HTTP-Tiny-0.076_1
+ perl-HTTP-Tiny-0.080_1
perl-I18N-Collate-1.02_1
perl-I18N-LangTags-0.45_1
- perl-IO-1.46_1
- perl-IO-Compress-2.102_1
+ perl-IO-1.50_1
+ perl-IO-Compress-2.106_1
perl-IO-Socket-IP-0.41_1
perl-IO-Zlib-1.11_1
perl-IPC-Cmd-1.04_1
perl-IPC-SysV-2.09_1
- perl-JSON-PP-4.06_1
- perl-Locale-Maketext-1.29_1
+ perl-JSON-PP-4.07_1
+ perl-Locale-Maketext-1.31_1
perl-Locale-Maketext-Simple-0.21.01_1
perl-MIME-Base64-3.16_1
- perl-Math-BigInt-1.999818_1
- perl-Math-BigInt-FastCalc-0.5009_1
- perl-Math-BigRat-0.2614_1
+ perl-Math-BigInt-1.999830_1
+ perl-Math-BigInt-FastCalc-0.5012_1
+ perl-Math-BigRat-0.2621_1
perl-Math-Complex-1.59.02_1
perl-Memoize-1.03.01_1
- perl-Module-CoreList-5.20220313_1
+ perl-Module-CoreList-5.20220520_1
perl-Module-Load-0.36_1
perl-Module-Load-Conditional-0.74_1
perl-Module-Loaded-0.08_1
perl-Module-Metadata-1.000037_1
- perl-NEXT-0.68_1
+ perl-NEXT-0.69_1
perl-Net-Ping-2.74_1
perl-Params-Check-0.38_1
- perl-PathTools-3.80_1
+ perl-PathTools-3.84_1
perl-Perl-OSType-1.010_1
perl-PerlIO-via-QuotedPrint-0.09_1
perl-Pod-Checker-1.74_1
perl-Pod-Escapes-1.07_1
perl-Pod-Perldoc-3.2801_1
- perl-Pod-Simple-3.42_1
+ perl-Pod-Simple-3.43_1
perl-Pod-Usage-2.01_1
perl-Safe-2.43_1
- perl-Scalar-List-Utils-1.55_1
+ perl-Scalar-List-Utils-1.62_1
perl-Search-Dict-1.07_1
perl-SelfLoader-1.26_1
- perl-Socket-2.031_1
- perl-Storable-3.23_1
+ perl-Socket-2.033_1
+ perl-Storable-3.26_1
perl-Sys-Syslog-0.36_1
perl-Term-ANSIColor-5.01_1
perl-Term-Cap-1.17_1
perl-Term-Complete-1.403_1
perl-Term-ReadLine-1.17_1
perl-Test-1.31_1
- perl-Test-Harness-3.43_1
- perl-Test-Simple-1.302183_1
+ perl-Test-Harness-3.44_1
+ perl-Test-Simple-1.302190_1
perl-Text-Abbrev-1.02_1
perl-Text-Balanced-2.04_1
- perl-Text-ParseWords-3.30_1
- perl-Text-Tabs-2013.0523_1
+ perl-Text-ParseWords-3.31_1
+ perl-Text-Tabs-2021.0814_1
perl-Thread-Queue-3.14_1
perl-Thread-Semaphore-2.13_1
perl-Tie-File-1.06_1
perl-Tie-RefHash-1.40_1
- perl-Time-HiRes-1.9767_1
+ perl-Time-HiRes-1.9770_1
perl-Time-Local-1.30_1
perl-Time-Piece-1.3401_1
- perl-Unicode-Collate-1.29_1
- perl-Unicode-Normalize-1.28_1
- perl-Win32-0.57_1
+ perl-Unicode-Collate-1.31_1
+ perl-Unicode-Normalize-1.31_1
+ perl-Win32-0.59_1
perl-Win32API-File-0.1203.01_1
- perl-XSLoader-0.30_1
+ perl-XSLoader-0.31_1
perl-autodie-2.34_1
perl-autouse-1.11_1
perl-base-2.27_1
- perl-bignum-0.51_1
+ perl-bignum-0.65_1
perl-constant-1.33_1
perl-encoding-warnings-0.13_1
- perl-experimental-0.024_1
- perl-if-0.0609_1
+ perl-experimental-0.028_1
+ perl-if-0.0610_1
perl-lib-0.65_1
perl-libnet-3.13_1
perl-parent-0.238_1
- perl-perlfaq-5.20210411_1
+ perl-perlfaq-5.20210520_1
perl-podlators-5.008_1
- perl-threads-2.26_1
- perl-threads-shared-1.62_1
- perl-version-0.9928_1"
+ perl-threads-2.27_1
+ perl-threads-shared-1.64_1
+ perl-version-0.9929_1"
for f in ${provides}; do
replaces+=" $($XBPS_UHELPER_CMD getpkgname ${f})>=0"
@@ -143,6 +143,9 @@ done
post_extract() {
cp -a ../perl-cross-${_perl_cross_version}/* .
+ patch -p1 < ${FILESDIR}/multiplicity.patch
+
+ [ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH patchlevel.h
}
do_configure() {
From db3df84617c8ff108b85dba610e028f3c4cb86ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:03:27 +0200
Subject: [PATCH 042/343] collectd: rebuild for perl-5.36.0.
---
srcpkgs/collectd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 90bcacca20ac..2364b11ffeaa 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
# Template file for 'collectd'
pkgname=collectd
version=5.12.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
From 671b68eb5c4cfbc9a7024a46aabf47e3c95e1bae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:04:19 +0200
Subject: [PATCH 043/343] gnumeric: rebuild for perl-5.36.0.
---
srcpkgs/gnumeric/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a0eeb3d4ceb..3d58e7066857 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
# Template file for 'gnumeric'
pkgname=gnumeric
version=1.12.53
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config"
makedepends="goffice-devel librsvg-devel libxslt-devel libxml2-devel"
From 83cc638687aa8be9b270321cac15285fd778df62 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:04:21 +0200
Subject: [PATCH 044/343] hexchat: rebuild for perl-5.36.0.
---
srcpkgs/hexchat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 21ad0ae28e39..ef3b8c475004 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,7 +1,7 @@
# Template file for 'hexchat'
pkgname=hexchat
version=2.16.1
-revision=1
+revision=2
build_style=meson
configure_args="-Ddbus=enabled -Dtls=enabled
-Dwith-perl=/usr/bin/perl -Dwith-python=python3
From 0a98d5abc9b9859d6a0ee347929112dd3e4f92ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:04:54 +0200
Subject: [PATCH 045/343] highlight: rebuild for perl-5.36.0.
---
srcpkgs/highlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/highlight/template b/srcpkgs/highlight/template
index 0db032ef9d66..bb0856ef0507 100644
--- a/srcpkgs/highlight/template
+++ b/srcpkgs/highlight/template
@@ -1,7 +1,7 @@
# Template file for 'highlight'
pkgname=highlight
version=4.1
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="pkg-config swig perl"
makedepends="boost-devel lua54-devel perl"
From 82ef9c3176bc2b8f1ae98a37932d0c7f43f524b4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:06:43 +0200
Subject: [PATCH 046/343] hivex: rebuild for perl-5.36.0.
---
srcpkgs/hivex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index f6f12d1b70f3..dd984aa8a6ba 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
# Template file for 'hivex'
pkgname=hivex
version=1.3.21
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-ocaml" # currently ocaml is broken
hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
From ebbb61e59729f4c52756f1d5ffa4bfc5b11a51c3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:07:16 +0200
Subject: [PATCH 047/343] irssi: rebuild for perl-5.36.0.
---
srcpkgs/irssi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index b7a8ad2e5efa..0f0b3188c19f 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,7 +1,7 @@
# Template file for 'irssi'
pkgname=irssi
version=1.4.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --with-proxy --enable-true-color
--with-otr --with-perl=module"
From c09ddcb6fa4a780ff8df0174f0c32d7f3be82c82 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:07:40 +0200
Subject: [PATCH 048/343] kvirc: rebuild for perl-5.36.0.
---
srcpkgs/kvirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 29cdda4153ff..bb19b773097f 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,7 +1,7 @@
# Template file for 'kvirc'
pkgname=kvirc
version=5.0.0
-revision=9
+revision=10
wrksrc="KVIrc-$version"
build_style=cmake
configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
From d9503ca0f844a982621b189a6b3dadd574efb8cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:09:36 +0200
Subject: [PATCH 049/343] apparmor: rebuild for perl-5.36.0.
---
srcpkgs/apparmor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 64140c0dbc5c..96a2faa314e0 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
# Template file for 'apparmor'
pkgname=apparmor
version=3.0.3
-revision=2
+revision=3
wrksrc="${pkgname}-v${version}"
build_wrksrc=libraries/libapparmor
build_style=gnu-configure
From 73d469ebd7119b3d252ae781bca84097e017e210 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:10:12 +0200
Subject: [PATCH 050/343] libguestfs: rebuild for perl-5.36.0.
---
srcpkgs/libguestfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 6b70a5819198..05ed38deda91 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.48.4
-revision=1
+revision=2
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
From 7d004063ff348a1aac91f03e65c4c2d4cacff66b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:10:14 +0200
Subject: [PATCH 051/343] ImageMagick: rebuild for perl-5.36.0.
---
srcpkgs/ImageMagick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index cdb7e56579db..3d475bd6a8e1 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
version=7.1.0.48
-revision=1
+revision=2
_upstream_version="${version/.${version##*.}/-${version##*.}}"
wrksrc=${pkgname}-${_upstream_version}
build_style=gnu-configure
From cb5561ff0d39535c0225f499c89e6992c646d5f5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:11:43 +0200
Subject: [PATCH 052/343] liboping: rebuild for perl-5.36.0.
---
srcpkgs/liboping/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/liboping/template b/srcpkgs/liboping/template
index 1a7b16e1d0ec..b91334fc9532 100644
--- a/srcpkgs/liboping/template
+++ b/srcpkgs/liboping/template
@@ -1,7 +1,7 @@
# Template file for 'liboping'
pkgname=liboping
version=1.10.0
-revision=10
+revision=11
build_style=gnu-configure
hostmakedepends="perl"
makedepends="ncurses-devel"
@@ -38,7 +38,7 @@ liboping-devel_package() {
}
liboping-perl_package() {
short_desc+=" - perl bindings"
- shlib_requires="libperl.so.5.34"
+ shlib_requires="libperl.so.5.36"
depends="perl"
pkg_install() {
vmove usr/share/man/man3/Net::Oping.3p
From 952a1236f0b30f20d52d902230b9ee45e893ac10 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:11:51 +0200
Subject: [PATCH 053/343] linux-tools: rebuild for perl-5.36.0.
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index f722ee213bc5..b55269b55522 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=6
+revision=7
wrksrc="linux-${version}"
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
From 25a0baed296d26767eb638fa04bdda6209124a74 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:16 +0200
Subject: [PATCH 054/343] perl-Alien-wxWidgets: rebuild for perl-5.36.0.
---
srcpkgs/perl-Alien-wxWidgets/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Alien-wxWidgets/template b/srcpkgs/perl-Alien-wxWidgets/template
index 1c190f40dd56..9a27996abef1 100644
--- a/srcpkgs/perl-Alien-wxWidgets/template
+++ b/srcpkgs/perl-Alien-wxWidgets/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Alien-wxWidgets'
pkgname=perl-Alien-wxWidgets
version=0.69
-revision=2
+revision=3
wrksrc="Alien-wxWidgets-${version}"
build_style=perl-ModuleBuild
hostmakedepends="perl perl-Module-Build perl-Module-Pluggable perl-LWP-Protocol-https"
From 9455a9ad87dbbe538a38f775f458ad26d64d36fc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:18 +0200
Subject: [PATCH 055/343] perl-AnyEvent: rebuild for perl-5.36.0.
---
srcpkgs/perl-AnyEvent/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-AnyEvent/template b/srcpkgs/perl-AnyEvent/template
index 44639296641e..43d7b1fd5429 100644
--- a/srcpkgs/perl-AnyEvent/template
+++ b/srcpkgs/perl-AnyEvent/template
@@ -1,7 +1,7 @@
# Template file for 'perl-AnyEvent'
pkgname=perl-AnyEvent
version=7.17
-revision=2
+revision=3
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 05a0efb3108841b52738769d8f1965640dc7214a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:23 +0200
Subject: [PATCH 056/343] perl-Barcode-ZBar: rebuild for perl-5.36.0.
---
srcpkgs/perl-Barcode-ZBar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Barcode-ZBar/template b/srcpkgs/perl-Barcode-ZBar/template
index 860a10155a65..ded1b2a9ed6b 100644
--- a/srcpkgs/perl-Barcode-ZBar/template
+++ b/srcpkgs/perl-Barcode-ZBar/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Barcode-ZBar'
pkgname=perl-Barcode-ZBar
version=0.23.1
-revision=3
+revision=4
wrksrc="zbar-$version"
build_wrksrc=perl
build_style=perl-module
From 5022eac78363b0113ce1adde38dfb65dfdf139ab Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:28 +0200
Subject: [PATCH 057/343] perl-Bit-Vector: rebuild for perl-5.36.0.
---
srcpkgs/perl-Bit-Vector/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Bit-Vector/template b/srcpkgs/perl-Bit-Vector/template
index c587df17623a..eb04e9c90c76 100644
--- a/srcpkgs/perl-Bit-Vector/template
+++ b/srcpkgs/perl-Bit-Vector/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Bit-Vector'
pkgname=perl-Bit-Vector
version=7.4
-revision=8
+revision=9
wrksrc="Bit-Vector-${version}"
build_style=perl-module
hostmakedepends="perl"
From 20f182320a716a157e9912a68327f6f06861b286 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:35 +0200
Subject: [PATCH 058/343] perl-Cairo: rebuild for perl-5.36.0.
---
srcpkgs/perl-Cairo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Cairo/template b/srcpkgs/perl-Cairo/template
index f98b3f0baa7e..247058971b0b 100644
--- a/srcpkgs/perl-Cairo/template
+++ b/srcpkgs/perl-Cairo/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Cairo'
pkgname=perl-Cairo
version=1.107
-revision=3
+revision=4
wrksrc="Cairo-$version"
build_style=perl-module
hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
From bea999cb435036e8e169e74e910c9de0e77a1c56 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:41 +0200
Subject: [PATCH 059/343] perl-Cairo-GObject: rebuild for perl-5.36.0.
---
srcpkgs/perl-Cairo-GObject/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Cairo-GObject/template b/srcpkgs/perl-Cairo-GObject/template
index 6965a9ef34c0..7b6fc161a0dd 100644
--- a/srcpkgs/perl-Cairo-GObject/template
+++ b/srcpkgs/perl-Cairo-GObject/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Cairo-GObject'
pkgname=perl-Cairo-GObject
version=1.005
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Cairo"
From df6068a0c28b6a600a54af105340b2b7f23a9567 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:43 +0200
Subject: [PATCH 060/343] perl-Class-MethodMaker: rebuild for perl-5.36.0.
---
srcpkgs/perl-Class-MethodMaker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Class-MethodMaker/template b/srcpkgs/perl-Class-MethodMaker/template
index 71d9e06d8ba9..92e663f7364c 100644
--- a/srcpkgs/perl-Class-MethodMaker/template
+++ b/srcpkgs/perl-Class-MethodMaker/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Class-MethodMaker'
pkgname=perl-Class-MethodMaker
version=2.24
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 33ada63c3ea9f20de2eaa38d01ba45ba25837f01 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:51 +0200
Subject: [PATCH 061/343] perl-Class-XSAccessor: rebuild for perl-5.36.0.
---
srcpkgs/perl-Class-XSAccessor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Class-XSAccessor/template b/srcpkgs/perl-Class-XSAccessor/template
index ddb8623321f8..9aa7873a8b35 100644
--- a/srcpkgs/perl-Class-XSAccessor/template
+++ b/srcpkgs/perl-Class-XSAccessor/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Class-XSAccessor'
pkgname=perl-Class-XSAccessor
version=1.19
-revision=8
+revision=9
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 2a0585e56dac7b056383115707a1672db207dc9c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:56 +0200
Subject: [PATCH 062/343] perl-Clone: rebuild for perl-5.36.0.
---
srcpkgs/perl-Clone/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Clone/template b/srcpkgs/perl-Clone/template
index 25867eb76437..ac8b12948277 100644
--- a/srcpkgs/perl-Clone/template
+++ b/srcpkgs/perl-Clone/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Clone'
pkgname=perl-Clone
version=0.45
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 3e61abd1ca1707af45cb9b4bf48d2be1487a6bad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:13:57 +0200
Subject: [PATCH 063/343] perl-Crypt-Blowfish: rebuild for perl-5.36.0.
---
srcpkgs/perl-Crypt-Blowfish/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Crypt-Blowfish/template b/srcpkgs/perl-Crypt-Blowfish/template
index ea5985484315..280bd3aee0d8 100644
--- a/srcpkgs/perl-Crypt-Blowfish/template
+++ b/srcpkgs/perl-Crypt-Blowfish/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Crypt-Blowfish'
pkgname=perl-Crypt-Blowfish
version=2.14
-revision=12
+revision=13
wrksrc="Crypt-Blowfish-${version}"
build_style=perl-module
hostmakedepends="perl"
From fdd845c2635f31fcfcd1dd6c3c151d05a39a9364 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:00 +0200
Subject: [PATCH 064/343] perl-Crypt-CAST5: rebuild for perl-5.36.0.
---
srcpkgs/perl-Crypt-CAST5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Crypt-CAST5/template b/srcpkgs/perl-Crypt-CAST5/template
index fd5b8d556af9..6493c3d1229f 100644
--- a/srcpkgs/perl-Crypt-CAST5/template
+++ b/srcpkgs/perl-Crypt-CAST5/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Crypt-CAST5'
pkgname=perl-Crypt-CAST5
version=0.05
-revision=7
+revision=8
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 07afbbf674cec0ce34e81cb028bae45035fabc44 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:04 +0200
Subject: [PATCH 065/343] perl-Crypt-DES: rebuild for perl-5.36.0.
---
srcpkgs/perl-Crypt-DES/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Crypt-DES/template b/srcpkgs/perl-Crypt-DES/template
index 4c176c9fb240..f3e5b485f7a7 100644
--- a/srcpkgs/perl-Crypt-DES/template
+++ b/srcpkgs/perl-Crypt-DES/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Crypt-DES'
pkgname=perl-Crypt-DES
version=2.07
-revision=7
+revision=8
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From e2d1b15b725fd7b8fdbcb153300610594a514a3a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:07 +0200
Subject: [PATCH 066/343] perl-Crypt-IDEA: rebuild for perl-5.36.0.
---
srcpkgs/perl-Crypt-IDEA/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Crypt-IDEA/template b/srcpkgs/perl-Crypt-IDEA/template
index 998de9887554..945287e3579a 100644
--- a/srcpkgs/perl-Crypt-IDEA/template
+++ b/srcpkgs/perl-Crypt-IDEA/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Crypt-IDEA'
pkgname=perl-Crypt-IDEA
version=1.10
-revision=7
+revision=8
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 054bc602799eeb1116eb625b208198197c178075 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:10 +0200
Subject: [PATCH 067/343] perl-Crypt-OpenSSL-Bignum: rebuild for perl-5.36.0.
---
srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 25b438d2dd7a..be97010485dd 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Crypt-OpenSSL-Bignum'
pkgname=perl-Crypt-OpenSSL-Bignum
version=0.09
-revision=13
+revision=14
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 260dfdbc377db07f1faac33f8a7718ae18e7ed11 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:13 +0200
Subject: [PATCH 068/343] perl-Crypt-OpenSSL-RSA: rebuild for perl-5.36.0.
---
srcpkgs/perl-Crypt-OpenSSL-RSA/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 3a239a93a6c9..a766d459201f 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Crypt-OpenSSL-RSA'
pkgname=perl-Crypt-OpenSSL-RSA
version=0.33
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
From 982680bda6b34a01af9be44a81e1d5284179c009 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:15 +0200
Subject: [PATCH 069/343] perl-Crypt-OpenSSL-Random: rebuild for perl-5.36.0.
---
srcpkgs/perl-Crypt-OpenSSL-Random/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index f0ae1ef17781..2fa425c73bed 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Crypt-OpenSSL-Random'
pkgname=perl-Crypt-OpenSSL-Random
version=0.15
-revision=11
+revision=12
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
From bd80bb8423dfb2a836221b689b5986784502d054 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:19 +0200
Subject: [PATCH 070/343] perl-Crypt-Rijndael: rebuild for perl-5.36.0.
---
srcpkgs/perl-Crypt-Rijndael/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Crypt-Rijndael/template b/srcpkgs/perl-Crypt-Rijndael/template
index e7d94b4f6b72..5f245f3642ed 100644
--- a/srcpkgs/perl-Crypt-Rijndael/template
+++ b/srcpkgs/perl-Crypt-Rijndael/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Crypt-Rijndael'
pkgname=perl-Crypt-Rijndael
version=1.16
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 5312f9d46e776a2b8f50ed9d952d26b394960b86 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:22 +0200
Subject: [PATCH 071/343] perl-CryptX: rebuild for perl-5.36.0.
---
srcpkgs/perl-CryptX/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template
index 83e16e8ea0bf..78161d3863db 100644
--- a/srcpkgs/perl-CryptX/template
+++ b/srcpkgs/perl-CryptX/template
@@ -1,7 +1,7 @@
# Template file for 'perl-CryptX'
pkgname=perl-CryptX
version=0.077
-revision=1
+revision=2
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 9afbb250119d7c33695aebf0d98de5d4ad2ccdb6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:14:45 +0200
Subject: [PATCH 072/343] perl-Curses: rebuild for perl-5.36.0.
---
srcpkgs/perl-Curses/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Curses/template b/srcpkgs/perl-Curses/template
index 2e7afa1ea2a8..2435e5510fda 100644
--- a/srcpkgs/perl-Curses/template
+++ b/srcpkgs/perl-Curses/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Curses'
pkgname=perl-Curses
version=1.36
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 03fdd21b74187e8b4af668e2c35bc79fe326d139 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:15:03 +0200
Subject: [PATCH 073/343] perl-DBD-Pg: rebuild for perl-5.36.0.
---
srcpkgs/perl-DBD-Pg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-DBD-Pg/template b/srcpkgs/perl-DBD-Pg/template
index f4adc30bdda0..4e1549e5f0f4 100644
--- a/srcpkgs/perl-DBD-Pg/template
+++ b/srcpkgs/perl-DBD-Pg/template
@@ -1,7 +1,7 @@
# Template file for 'perl-DBD-Pg'
pkgname=perl-DBD-Pg
version=3.10.4
-revision=3
+revision=4
wrksrc="DBD-Pg-${version}"
build_style=perl-module
hostmakedepends="perl perl-DBI"
From bd469b838fb61640ba750a55b673de30bcc21b41 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:15:05 +0200
Subject: [PATCH 074/343] perl-DBD-SQLite: rebuild for perl-5.36.0.
---
srcpkgs/perl-DBD-SQLite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-DBD-SQLite/template b/srcpkgs/perl-DBD-SQLite/template
index 40e5311f2b9f..24f9e982218e 100644
--- a/srcpkgs/perl-DBD-SQLite/template
+++ b/srcpkgs/perl-DBD-SQLite/template
@@ -1,7 +1,7 @@
# Template file for 'perl-DBD-SQLite'
pkgname=perl-DBD-SQLite
version=1.66
-revision=3
+revision=4
wrksrc="DBD-SQLite-${version}"
build_style=perl-module
configure_args="SQLITE_LOCATION=${XBPS_CROSS_BASE}/usr"
From 56bfef88ab550672aedab6f3d9fd2558205e9b31 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:15:07 +0200
Subject: [PATCH 075/343] perl-DBD-mysql: rebuild for perl-5.36.0.
---
srcpkgs/perl-DBD-mysql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index 23185db47df4..16eb4c4b80d8 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
# Template file for 'perl-DBD-mysql'
pkgname=perl-DBD-mysql
version=4.050
-revision=9
+revision=10
wrksrc="DBD-mysql-${version}"
build_style=perl-module
hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
From 3e3af09e4e584844338937fba39bb2ba3f3d1a2d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:15:09 +0200
Subject: [PATCH 076/343] perl-DBI: rebuild for perl-5.36.0.
---
srcpkgs/perl-DBI/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-DBI/template b/srcpkgs/perl-DBI/template
index e09d92a66481..d4e6e0fcfcb1 100644
--- a/srcpkgs/perl-DBI/template
+++ b/srcpkgs/perl-DBI/template
@@ -1,7 +1,7 @@
# Template file for 'perl-DBI'
pkgname=perl-DBI
version=1.643
-revision=3
+revision=4
wrksrc="DBI-${version}"
build_style=perl-module
hostmakedepends="perl"
From 7de4aa5963abf1f83627051ebcf7318610bced5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:16:05 +0200
Subject: [PATCH 077/343] perl-Data-MessagePack: rebuild for perl-5.36.0.
---
srcpkgs/perl-Data-MessagePack/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Data-MessagePack/template b/srcpkgs/perl-Data-MessagePack/template
index 134adac8ebcd..facca7c6e123 100644
--- a/srcpkgs/perl-Data-MessagePack/template
+++ b/srcpkgs/perl-Data-MessagePack/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Data-MessagePack'
pkgname=perl-Data-MessagePack
version=1.00
-revision=7
+revision=8
wrksrc="${pkgname/perl-//}-${version}"
build_style=perl-module
hostmakedepends="perl"
From d5abb69ed30560549584bd4f0084385f8a054bd3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:16:07 +0200
Subject: [PATCH 078/343] perl-Data-UUID: rebuild for perl-5.36.0.
---
srcpkgs/perl-Data-UUID/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Data-UUID/template b/srcpkgs/perl-Data-UUID/template
index 99598b0b52fa..68855d5e9195 100644
--- a/srcpkgs/perl-Data-UUID/template
+++ b/srcpkgs/perl-Data-UUID/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Data-UUID'
pkgname=perl-Data-UUID
version=1.226
-revision=3
+revision=4
wrksrc="Data-UUID-${version}"
build_style=perl-module
hostmakedepends="perl"
From aae4d326f0553ff6aac35a4adcc9ce2e4fad8e8d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:16:10 +0200
Subject: [PATCH 079/343] perl-Date-Simple: rebuild for perl-5.36.0.
---
srcpkgs/perl-Date-Simple/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Date-Simple/template b/srcpkgs/perl-Date-Simple/template
index ae68e13bb3d0..d7c77a00ad11 100644
--- a/srcpkgs/perl-Date-Simple/template
+++ b/srcpkgs/perl-Date-Simple/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Date-Simple'
pkgname=perl-Date-Simple
version=3.03
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 356c0d1b5234bf26aaf6d9ce03e922b0c6885604 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:16:14 +0200
Subject: [PATCH 080/343] perl-DateTime: rebuild for perl-5.36.0.
---
srcpkgs/perl-DateTime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-DateTime/template b/srcpkgs/perl-DateTime/template
index 788c6a0f3414..9441c9cfa13b 100644
--- a/srcpkgs/perl-DateTime/template
+++ b/srcpkgs/perl-DateTime/template
@@ -1,7 +1,7 @@
# Template file for 'perl-DateTime'
pkgname=perl-DateTime
version=1.54
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From edd4cac94f6739b9451c572e728bea31cfbce591 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:16:16 +0200
Subject: [PATCH 081/343] perl-Devel-Caller: rebuild for perl-5.36.0.
---
srcpkgs/perl-Devel-Caller/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Devel-Caller/template b/srcpkgs/perl-Devel-Caller/template
index df09cdd32a81..c9eec81ed005 100644
--- a/srcpkgs/perl-Devel-Caller/template
+++ b/srcpkgs/perl-Devel-Caller/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Devel-Caller'
pkgname=perl-Devel-Caller
version=2.06
-revision=12
+revision=13
wrksrc="${pkgname#*-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 968fbf724660075710747a11cca778cce486730b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:16:17 +0200
Subject: [PATCH 082/343] perl-Devel-LexAlias: rebuild for perl-5.36.0.
---
srcpkgs/perl-Devel-LexAlias/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Devel-LexAlias/template b/srcpkgs/perl-Devel-LexAlias/template
index c2a51b26e78f..2df17b52dc09 100644
--- a/srcpkgs/perl-Devel-LexAlias/template
+++ b/srcpkgs/perl-Devel-LexAlias/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Devel-LexAlias'
pkgname=perl-Devel-LexAlias
version=0.05
-revision=7
+revision=8
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From a0902b3b928febec1d210f1912483ce097e02704 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:16:19 +0200
Subject: [PATCH 083/343] perl-Devel-NYTProf: rebuild for perl-5.36.0.
---
srcpkgs/perl-Devel-NYTProf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Devel-NYTProf/template b/srcpkgs/perl-Devel-NYTProf/template
index 1c2d25a31764..f72ab11f70c7 100644
--- a/srcpkgs/perl-Devel-NYTProf/template
+++ b/srcpkgs/perl-Devel-NYTProf/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Devel-NYTProf'
pkgname=perl-Devel-NYTProf
version=6.10
-revision=1
+revision=2
wrksrc="${pkgname#*-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From e009016c1122c09778dc1a5daa8cd57c2e659fe7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:17:49 +0200
Subject: [PATCH 084/343] perl-Digest-SHA1: rebuild for perl-5.36.0.
---
srcpkgs/perl-Digest-SHA1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Digest-SHA1/template b/srcpkgs/perl-Digest-SHA1/template
index 0351cb408a93..0bb8181cc4ca 100644
--- a/srcpkgs/perl-Digest-SHA1/template
+++ b/srcpkgs/perl-Digest-SHA1/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Digest-SHA1'
pkgname=perl-Digest-SHA1
version=2.13
-revision=9
+revision=10
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 739bcbe2d36ff182be59cc2d77670edffeba628e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:17:52 +0200
Subject: [PATCH 085/343] perl-Email-Address-XS: rebuild for perl-5.36.0.
---
srcpkgs/perl-Email-Address-XS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Email-Address-XS/template b/srcpkgs/perl-Email-Address-XS/template
index bd8e4c36b689..2d26270ec434 100644
--- a/srcpkgs/perl-Email-Address-XS/template
+++ b/srcpkgs/perl-Email-Address-XS/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Email-Address-XS'
pkgname=perl-Email-Address-XS
version=1.04
-revision=7
+revision=8
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 2ab951a6a41664822a2f4efc9e86c73d46ab9e3b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:17:55 +0200
Subject: [PATCH 086/343] perl-Encode-EUCJPASCII: rebuild for perl-5.36.0.
---
srcpkgs/perl-Encode-EUCJPASCII/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Encode-EUCJPASCII/template b/srcpkgs/perl-Encode-EUCJPASCII/template
index aaa694dc8c80..3a2cb7c46463 100644
--- a/srcpkgs/perl-Encode-EUCJPASCII/template
+++ b/srcpkgs/perl-Encode-EUCJPASCII/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Encode-EUCJPASCII'
pkgname=perl-Encode-EUCJPASCII
version=0.03
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 9025813a79ef14dbfa9a0e729712a96a3eaebfb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:17:58 +0200
Subject: [PATCH 087/343] perl-Encode-HanExtra: rebuild for perl-5.36.0.
---
srcpkgs/perl-Encode-HanExtra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Encode-HanExtra/template b/srcpkgs/perl-Encode-HanExtra/template
index 9854095efe1f..3dd92cc024ab 100644
--- a/srcpkgs/perl-Encode-HanExtra/template
+++ b/srcpkgs/perl-Encode-HanExtra/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Encode-HanExtra'
pkgname=perl-Encode-HanExtra
version=0.23
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From ecd374da028bc7697729930708f66b447524df35 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:04 +0200
Subject: [PATCH 088/343] perl-Encode-JIS2K: rebuild for perl-5.36.0.
---
srcpkgs/perl-Encode-JIS2K/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Encode-JIS2K/template b/srcpkgs/perl-Encode-JIS2K/template
index f6011fa2a04b..f585252e01e2 100644
--- a/srcpkgs/perl-Encode-JIS2K/template
+++ b/srcpkgs/perl-Encode-JIS2K/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Encode-JIS2K'
pkgname=perl-Encode-JIS2K
version=0.03
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 5e98a9ca6d8ed838bd1d0bb581939e4b517e066b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:07 +0200
Subject: [PATCH 089/343] perl-FCGI: rebuild for perl-5.36.0.
---
srcpkgs/perl-FCGI/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-FCGI/template b/srcpkgs/perl-FCGI/template
index 01a5aad9da70..a111f2887273 100644
--- a/srcpkgs/perl-FCGI/template
+++ b/srcpkgs/perl-FCGI/template
@@ -1,7 +1,7 @@
# Template file for 'perl-FCGI'
pkgname=perl-FCGI
version=0.82
-revision=1
+revision=2
wrksrc="FCGI-${version}"
build_style=perl-module
makedepends="fcgi-devel"
From f34bb74064917b04fef847d46431d3437492a8f7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:12 +0200
Subject: [PATCH 090/343] perl-Filesys-Df: rebuild for perl-5.36.0.
---
srcpkgs/perl-Filesys-Df/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Filesys-Df/template b/srcpkgs/perl-Filesys-Df/template
index 4149dc2b0aff..84fd81b58e57 100644
--- a/srcpkgs/perl-Filesys-Df/template
+++ b/srcpkgs/perl-Filesys-Df/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Filesys-Df'
pkgname=perl-Filesys-Df
version=0.92
-revision=9
+revision=10
wrksrc="Filesys-Df-${version}"
build_style=perl-module
hostmakedepends="perl"
From 75820ea0e2e9a052c5a6d07f8da2336c0d990405 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:15 +0200
Subject: [PATCH 091/343] perl-Fuse: rebuild for perl-5.36.0.
---
srcpkgs/perl-Fuse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Fuse/template b/srcpkgs/perl-Fuse/template
index b643d1941a39..530f6b0d9599 100644
--- a/srcpkgs/perl-Fuse/template
+++ b/srcpkgs/perl-Fuse/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Fuse'
pkgname=perl-Fuse
version=0.16
-revision=15
+revision=16
wrksrc="Fuse-$version"
build_style=perl-module
hostmakedepends="pkg-config perl"
From 0476c7afd7c4011451c29890a237c9408d64df64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:24 +0200
Subject: [PATCH 092/343] perl-GD: rebuild for perl-5.36.0.
---
srcpkgs/perl-GD/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-GD/template b/srcpkgs/perl-GD/template
index 0435909e928c..091a2dd8c00f 100644
--- a/srcpkgs/perl-GD/template
+++ b/srcpkgs/perl-GD/template
@@ -1,7 +1,7 @@
# Template file for 'perl-GD'
pkgname=perl-GD
version=2.73
-revision=1
+revision=2
wrksrc="GD-${version}"
build_style=perl-module
hostmakedepends="perl-ExtUtils-PkgConfig"
From 86cf838fe95204ff90f528fa5d404a343258b018 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:30 +0200
Subject: [PATCH 093/343] perl-Glib: rebuild for perl-5.36.0.
---
srcpkgs/perl-Glib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Glib/template b/srcpkgs/perl-Glib/template
index bcbf19de95b0..e08deb3c785e 100644
--- a/srcpkgs/perl-Glib/template
+++ b/srcpkgs/perl-Glib/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Glib'
pkgname=perl-Glib
version=1.3293
-revision=2
+revision=3
wrksrc="Glib-${version}"
build_style=perl-module
hostmakedepends="libglib-devel perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
From 10210a56dea4f87ed30786b105ed2e9e0dbb758e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:42 +0200
Subject: [PATCH 094/343] perl-Glib-Object-Introspection: rebuild for
perl-5.36.0.
---
srcpkgs/perl-Glib-Object-Introspection/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Glib-Object-Introspection/template b/srcpkgs/perl-Glib-Object-Introspection/template
index 6d3f23140845..3716b90cfa76 100644
--- a/srcpkgs/perl-Glib-Object-Introspection/template
+++ b/srcpkgs/perl-Glib-Object-Introspection/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Glib-Object-Introspection'
pkgname=perl-Glib-Object-Introspection
version=0.049
-revision=2
+revision=3
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl-ExtUtils-PkgConfig perl-ExtUtils-Depends perl-Glib"
From 74c8596e270e865d639bbdbb1e3237fc7cb4ccb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:49 +0200
Subject: [PATCH 095/343] perl-Gtk2: rebuild for perl-5.36.0.
---
srcpkgs/perl-Gtk2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Gtk2/template b/srcpkgs/perl-Gtk2/template
index b75d675933cf..e2b897e478cd 100644
--- a/srcpkgs/perl-Gtk2/template
+++ b/srcpkgs/perl-Gtk2/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Gtk2'
pkgname=perl-Gtk2
version=1.24993
-revision=3
+revision=4
wrksrc="Gtk2-$version"
build_style=perl-module
hostmakedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Pango"
From 8ba7e6afa4d36a49800fdf593a71bf63fe0440cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:51 +0200
Subject: [PATCH 096/343] perl-HTML-Parser: rebuild for perl-5.36.0.
---
srcpkgs/perl-HTML-Parser/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-HTML-Parser/template b/srcpkgs/perl-HTML-Parser/template
index dde853ce6572..e371e7a63cd7 100644
--- a/srcpkgs/perl-HTML-Parser/template
+++ b/srcpkgs/perl-HTML-Parser/template
@@ -1,7 +1,7 @@
# Template file for 'perl-HTML-Parser'
pkgname=perl-HTML-Parser
version=3.76
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 94d06d94f1fb7df7c7425687ed504684df9cdad1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:18:57 +0200
Subject: [PATCH 097/343] perl-IO-Tty: rebuild for perl-5.36.0.
---
srcpkgs/perl-IO-Tty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-IO-Tty/template b/srcpkgs/perl-IO-Tty/template
index 929a02220c16..ec28fb781df4 100644
--- a/srcpkgs/perl-IO-Tty/template
+++ b/srcpkgs/perl-IO-Tty/template
@@ -1,7 +1,7 @@
# Template file for 'perl-IO-Tty'
pkgname=perl-IO-Tty
version=1.16
-revision=2
+revision=3
wrksrc="IO-Tty-$version"
build_style=perl-module
hostmakedepends="perl"
From c30094f5c6aca86d92a1fe634a7089dbb92d8e88 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:09 +0200
Subject: [PATCH 098/343] perl-Image-Sane: rebuild for perl-5.36.0.
---
srcpkgs/perl-Image-Sane/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Image-Sane/template b/srcpkgs/perl-Image-Sane/template
index 784478f037dc..c21b92b729a0 100644
--- a/srcpkgs/perl-Image-Sane/template
+++ b/srcpkgs/perl-Image-Sane/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Image-Sane'
pkgname=perl-Image-Sane
version=5
-revision=3
+revision=4
wrksrc=Image-Sane-${version}
build_style=perl-module
hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
From d692aa5bf1ac63209a3e1977cb342872ab4777f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:13 +0200
Subject: [PATCH 099/343] perl-JSON-XS: rebuild for perl-5.36.0.
---
srcpkgs/perl-JSON-XS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-JSON-XS/template b/srcpkgs/perl-JSON-XS/template
index 60c85d7b66f5..e5ca69357ce3 100644
--- a/srcpkgs/perl-JSON-XS/template
+++ b/srcpkgs/perl-JSON-XS/template
@@ -1,7 +1,7 @@
# Template file for 'perl-JSON-XS'
pkgname=perl-JSON-XS
version=4.03
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-Canary-Stability"
From 2381cdfc1aedc5de09f1a8ecb8066737c387b9e6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:19 +0200
Subject: [PATCH 100/343] perl-Keyword-Simple: rebuild for perl-5.36.0.
---
srcpkgs/perl-Keyword-Simple/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Keyword-Simple/template b/srcpkgs/perl-Keyword-Simple/template
index 3b08881185e6..f93cc89e2758 100644
--- a/srcpkgs/perl-Keyword-Simple/template
+++ b/srcpkgs/perl-Keyword-Simple/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Keyword-Simple'
pkgname=perl-Keyword-Simple
version=0.04
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 2ae2bd0fb83ed51cb61d6bb892d13c458c249e17 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:22 +0200
Subject: [PATCH 101/343] perl-Lchown: rebuild for perl-5.36.0.
---
srcpkgs/perl-Lchown/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Lchown/template b/srcpkgs/perl-Lchown/template
index 4ca94b13c5b9..5686c61f4571 100644
--- a/srcpkgs/perl-Lchown/template
+++ b/srcpkgs/perl-Lchown/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Lchown'
pkgname=perl-Lchown
version=1.01
-revision=17
+revision=18
wrksrc="Lchown-${version}"
build_style=perl-ModuleBuild
hostmakedepends="perl perl-Module-Build"
@@ -13,7 +13,7 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Lchown"
distfiles="${CPAN_SITE}/Devel/NCLEATON/Lchown-${version}.tar.gz"
checksum=9c0a13e279ad92208fb8fac73001635b0689251dd41b597522e1b3501ba0f76f
-shlib_requires=libperl.so.5.34
+shlib_requires=libperl.so.5.36
post_install() {
rm -rf ${DESTDIR}/usr/share/doc/perl
From 2c5c53fae8a007e3933b9c3f852bb709de155368 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:26 +0200
Subject: [PATCH 102/343] perl-Linux-Inotify2: rebuild for perl-5.36.0.
---
srcpkgs/perl-Linux-Inotify2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Linux-Inotify2/template b/srcpkgs/perl-Linux-Inotify2/template
index fa3cceafe22f..e9f9bd8b9f2d 100644
--- a/srcpkgs/perl-Linux-Inotify2/template
+++ b/srcpkgs/perl-Linux-Inotify2/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Linux-Inotify2'
pkgname=perl-Linux-Inotify2
version=2.3
-revision=1
+revision=2
wrksrc="${pkgname#*-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 0eccf30b1ecb5001b24a495ff704db31083c73e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:29 +0200
Subject: [PATCH 103/343] perl-List-MoreUtils-XS: rebuild for perl-5.36.0.
---
srcpkgs/perl-List-MoreUtils-XS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-List-MoreUtils-XS/template b/srcpkgs/perl-List-MoreUtils-XS/template
index 34c07f065e86..8abf33edb0aa 100644
--- a/srcpkgs/perl-List-MoreUtils-XS/template
+++ b/srcpkgs/perl-List-MoreUtils-XS/template
@@ -1,7 +1,7 @@
# Template file for 'perl-List-MoreUtils-XS'
pkgname=perl-List-MoreUtils-XS
version=0.430
-revision=3
+revision=4
wrksrc="List-MoreUtils-XS-${version}"
build_style=perl-module
hostmakedepends="perl"
From 8bdb3b950b0d7a5aaaa5d7330404473932f026a5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:38 +0200
Subject: [PATCH 104/343] perl-List-SomeUtils-XS: rebuild for perl-5.36.0.
---
srcpkgs/perl-List-SomeUtils-XS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-List-SomeUtils-XS/template b/srcpkgs/perl-List-SomeUtils-XS/template
index c65e537f7105..7ec687c9f067 100644
--- a/srcpkgs/perl-List-SomeUtils-XS/template
+++ b/srcpkgs/perl-List-SomeUtils-XS/template
@@ -1,7 +1,7 @@
# Template file for 'perl-List-SomeUtils-XS'
pkgname=perl-List-SomeUtils-XS
version=0.58
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl-Test-LeakTrace perl-Test-Warnings"
From 6694cbc1b9f0141f77fcc5c18d14006d00b345a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:40 +0200
Subject: [PATCH 105/343] perl-Locale-gettext: rebuild for perl-5.36.0.
---
srcpkgs/perl-Locale-gettext/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Locale-gettext/template b/srcpkgs/perl-Locale-gettext/template
index d8fcfd8a66a5..d16a7fdfd502 100644
--- a/srcpkgs/perl-Locale-gettext/template
+++ b/srcpkgs/perl-Locale-gettext/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Locale-gettext'
pkgname=perl-Locale-gettext
version=1.07
-revision=11
+revision=12
wrksrc="Locale-gettext-$version"
build_style=perl-module
hostmakedepends="perl"
From 305e0c8cde31b3d32d43afc68bfdd7755c5e6d9e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:43 +0200
Subject: [PATCH 106/343] perl-Math-BigInt-GMP: rebuild for perl-5.36.0.
---
srcpkgs/perl-Math-BigInt-GMP/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Math-BigInt-GMP/template b/srcpkgs/perl-Math-BigInt-GMP/template
index 6dc90fbcb45e..1d8d8521a670 100644
--- a/srcpkgs/perl-Math-BigInt-GMP/template
+++ b/srcpkgs/perl-Math-BigInt-GMP/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Math-BigInt-GMP'
pkgname=perl-Math-BigInt-GMP
version=1.6007
-revision=3
+revision=4
wrksrc="Math-BigInt-GMP-${version}"
build_style=perl-module
hostmakedepends="perl"
From c847d217f6492d10cf36043c2a1a0129e370df65 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:49 +0200
Subject: [PATCH 107/343] perl-Math-FFT: rebuild for perl-5.36.0.
---
srcpkgs/perl-Math-FFT/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Math-FFT/template b/srcpkgs/perl-Math-FFT/template
index d0dcd5efaefd..f72a8fd098fc 100644
--- a/srcpkgs/perl-Math-FFT/template
+++ b/srcpkgs/perl-Math-FFT/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Math-FFT'
pkgname=perl-Math-FFT
version=1.36
-revision=2
+revision=3
wrksrc="Math-FFT-${version}"
build_style=perl-module
hostmakedepends="perl"
From 404c0755824e77c272581929b4736331a6e805fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:52 +0200
Subject: [PATCH 108/343] perl-Math-Int128: rebuild for perl-5.36.0.
---
srcpkgs/perl-Math-Int128/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Math-Int128/template b/srcpkgs/perl-Math-Int128/template
index eb4fb2e68fdc..81dd62fc2d92 100644
--- a/srcpkgs/perl-Math-Int128/template
+++ b/srcpkgs/perl-Math-Int128/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Math-Int128'
pkgname=perl-Math-Int128
version=0.22
-revision=1
+revision=2
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 6ec6cf999fb7ad5f0e323589b66ebb4a8916b1aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:54 +0200
Subject: [PATCH 109/343] perl-Math-Int64: rebuild for perl-5.36.0.
---
srcpkgs/perl-Math-Int64/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Math-Int64/template b/srcpkgs/perl-Math-Int64/template
index f5554054e6f5..fcac0d460d80 100644
--- a/srcpkgs/perl-Math-Int64/template
+++ b/srcpkgs/perl-Math-Int64/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Math-Int64'
pkgname=perl-Math-Int64
version=0.54
-revision=1
+revision=2
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 97b5bbb2efc6f3b7febe889f315a990ccb706741 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:19:59 +0200
Subject: [PATCH 110/343] perl-Math-Prime-Util: rebuild for perl-5.36.0.
---
srcpkgs/perl-Math-Prime-Util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Math-Prime-Util/template b/srcpkgs/perl-Math-Prime-Util/template
index ee8f2027d720..6a461f0c4d39 100644
--- a/srcpkgs/perl-Math-Prime-Util/template
+++ b/srcpkgs/perl-Math-Prime-Util/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Math-Prime-Util'
pkgname=perl-Math-Prime-Util
version=0.73
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-Math-Prime-Util-GMP"
From 324689f24be81e9bb1b3c2feac56ccfe4012045e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:20:01 +0200
Subject: [PATCH 111/343] perl-Math-Prime-Util-GMP: rebuild for perl-5.36.0.
---
srcpkgs/perl-Math-Prime-Util-GMP/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Math-Prime-Util-GMP/template b/srcpkgs/perl-Math-Prime-Util-GMP/template
index d3c75ed1b720..7e6955badc5a 100644
--- a/srcpkgs/perl-Math-Prime-Util-GMP/template
+++ b/srcpkgs/perl-Math-Prime-Util-GMP/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Math-Prime-Util-GMP'
pkgname=perl-Math-Prime-Util-GMP
version=0.52
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 21298a2f856fc9e40a15ba7647caad71e9a3bd9a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:20:09 +0200
Subject: [PATCH 112/343] perl-MusicBrainz-DiscID: rebuild for perl-5.36.0.
---
srcpkgs/perl-MusicBrainz-DiscID/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-MusicBrainz-DiscID/template b/srcpkgs/perl-MusicBrainz-DiscID/template
index e74a80e496c1..a04628a14013 100644
--- a/srcpkgs/perl-MusicBrainz-DiscID/template
+++ b/srcpkgs/perl-MusicBrainz-DiscID/template
@@ -1,7 +1,7 @@
# Template file for 'perl-MusicBrainz-DiscID'
pkgname=perl-MusicBrainz-DiscID
version=0.06
-revision=3
+revision=4
wrksrc="${pkgname//perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl which pkg-config"
From b7f75502f183dacedcd3b7571b6d8f3357f01944 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:20:12 +0200
Subject: [PATCH 113/343] perl-Net-DBus: rebuild for perl-5.36.0.
---
srcpkgs/perl-Net-DBus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Net-DBus/template b/srcpkgs/perl-Net-DBus/template
index 03b5ffcb7b80..25de89038adc 100644
--- a/srcpkgs/perl-Net-DBus/template
+++ b/srcpkgs/perl-Net-DBus/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Net-DBus'
pkgname=perl-Net-DBus
version=1.2.0
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl pkg-config"
From 1c954a88cffd16c841c32d923a73d672a38c1030 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:20:14 +0200
Subject: [PATCH 114/343] perl-Net-SSH2: rebuild for perl-5.36.0.
---
srcpkgs/perl-Net-SSH2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index d7d880205846..b37868bbe163 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Net-SSH2'
pkgname=perl-Net-SSH2
version=0.73
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"
From 75d92732b1150e54c99c099df40702c0199baf4a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:20:19 +0200
Subject: [PATCH 115/343] perl-Net-SSLeay: rebuild for perl-5.36.0.
---
srcpkgs/perl-Net-SSLeay/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index b5471368a8c0..d6795f000f87 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Net-SSLeay'
pkgname=perl-Net-SSLeay
version=1.92
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl openssl openssl-devel"
From acfc1ac30b541f22cfca409a0fe26ebab3371ece Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:20:35 +0200
Subject: [PATCH 116/343] perl-NetAddr-IP: rebuild for perl-5.36.0.
---
srcpkgs/perl-NetAddr-IP/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-NetAddr-IP/template b/srcpkgs/perl-NetAddr-IP/template
index 12a7e00cec08..f9cc3aa90aed 100644
--- a/srcpkgs/perl-NetAddr-IP/template
+++ b/srcpkgs/perl-NetAddr-IP/template
@@ -1,7 +1,7 @@
# Template file for 'perl-NetAddr-IP'
pkgname=perl-NetAddr-IP
version=4.079
-revision=10
+revision=11
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From eaafea4c93a61ee92444e65be1dc0f4a7477c2ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:20:56 +0200
Subject: [PATCH 117/343] perl-OpenGL: rebuild for perl-5.36.0.
---
srcpkgs/perl-OpenGL/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-OpenGL/template b/srcpkgs/perl-OpenGL/template
index 35e40302ed86..4bfffeb96a1c 100644
--- a/srcpkgs/perl-OpenGL/template
+++ b/srcpkgs/perl-OpenGL/template
@@ -1,7 +1,7 @@
# Template file for 'perl-OpenGL'
pkgname=perl-OpenGL
version=0.70
-revision=4
+revision=5
wrksrc="OpenGL-${version}"
build_style=perl-module
hostmakedepends="perl libfreeglut-devel libXmu-devel"
From dc51982c6ff2b9e966a204438a4e81327eb5bc96 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:08 +0200
Subject: [PATCH 118/343] perl-Package-Stash-XS: rebuild for perl-5.36.0.
---
srcpkgs/perl-Package-Stash-XS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Package-Stash-XS/template b/srcpkgs/perl-Package-Stash-XS/template
index 68e5f945fa30..860ab3011ed0 100644
--- a/srcpkgs/perl-Package-Stash-XS/template
+++ b/srcpkgs/perl-Package-Stash-XS/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Package-Stash-XS'
pkgname=perl-Package-Stash-XS
version=0.29
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 23f43eb3a1ffd625df9f570eb2358dd83af31276 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:12 +0200
Subject: [PATCH 119/343] perl-PadWalker: rebuild for perl-5.36.0.
---
srcpkgs/perl-PadWalker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-PadWalker/template b/srcpkgs/perl-PadWalker/template
index 6d6aaf9c3b29..75e7cdb135a9 100644
--- a/srcpkgs/perl-PadWalker/template
+++ b/srcpkgs/perl-PadWalker/template
@@ -1,7 +1,7 @@
# Template file for 'perl-PadWalker'
pkgname=perl-PadWalker
version=2.3
-revision=7
+revision=8
wrksrc="${pkgname#*-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From b321eeaa989dfb856315889213af05c0c52b1b50 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:15 +0200
Subject: [PATCH 120/343] perl-Pango: rebuild for perl-5.36.0.
---
srcpkgs/perl-Pango/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Pango/template b/srcpkgs/perl-Pango/template
index 362e7bf62fea..2e31fab51461 100644
--- a/srcpkgs/perl-Pango/template
+++ b/srcpkgs/perl-Pango/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Pango'
pkgname=perl-Pango
version=1.227
-revision=9
+revision=10
wrksrc="Pango-$version"
build_style=perl-module
hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Cairo"
From 42674243da07857d9f783fa3ed5d8d1016a59ede Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:22 +0200
Subject: [PATCH 121/343] perl-Params-Classify: rebuild for perl-5.36.0.
---
srcpkgs/perl-Params-Classify/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Params-Classify/template b/srcpkgs/perl-Params-Classify/template
index 5e65dc87153d..929b788c3652 100644
--- a/srcpkgs/perl-Params-Classify/template
+++ b/srcpkgs/perl-Params-Classify/template
@@ -1,16 +1,16 @@
# Template file for 'perl-Params-Classify'
pkgname=perl-Params-Classify
version=0.015
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-ModuleBuild
hostmakedepends="perl perl-Module-Build"
makedepends="${hostmakedepends}"
-checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
depends="perl"
+checkdepends="perl-Test-Pod perl-Test-Pod-Coverage"
short_desc="Argument type classification"
maintainer="John Regan <john@jrjrtech.com>"
-homepage="https://metacpan.org/release/Params-Classify"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Params-Classify"
distfiles="${CPAN_SITE}/Params/${pkgname/perl-/}-${version}.tar.gz"
checksum=398ec15cd899fcd8bef3db9ea1748bf631f15f6c32be203e475b67df510a5914
From 92ed98ceba170aa4e759b7a47e1d42115c8b3a67 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:26 +0200
Subject: [PATCH 122/343] perl-Params-Util: rebuild for perl-5.36.0.
---
srcpkgs/perl-Params-Util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Params-Util/template b/srcpkgs/perl-Params-Util/template
index 4d1e19c4b77c..fcc78c04ee24 100644
--- a/srcpkgs/perl-Params-Util/template
+++ b/srcpkgs/perl-Params-Util/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Params-Util'
pkgname=perl-Params-Util
version=1.102
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 27fa25fbb3b1ac29ae2a7305f21bfcc373bb25d5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:31 +0200
Subject: [PATCH 123/343] perl-Params-Validate: rebuild for perl-5.36.0.
---
srcpkgs/perl-Params-Validate/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Params-Validate/template b/srcpkgs/perl-Params-Validate/template
index 04da33b3c850..076852a006ab 100644
--- a/srcpkgs/perl-Params-Validate/template
+++ b/srcpkgs/perl-Params-Validate/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Params-Validate'
pkgname=perl-Params-Validate
version=1.30
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-ModuleBuild
hostmakedepends="perl perl-Module-Build"
@@ -14,4 +14,4 @@ license="Artistic-2.0"
homepage="https://metacpan.org/release/Params-Validate"
distfiles="${CPAN_SITE}/Params/${pkgname/perl-/}-${version}.tar.gz"
checksum=9a3a35583d3125d07e8c802c1f92f5be7d526e76dd496e944da270b1e273d812
-shlib_requires="libperl.so.5.34"
+shlib_requires="libperl.so.5.36"
From 6d2b135bbd710577b0c5b687ec875b7db20f0991 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:37 +0200
Subject: [PATCH 124/343] perl-PerlIO-utf8-strict: rebuild for perl-5.36.0.
---
srcpkgs/perl-PerlIO-utf8-strict/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-PerlIO-utf8-strict/template b/srcpkgs/perl-PerlIO-utf8-strict/template
index bccfbc9fb68d..e322cd8d4bda 100644
--- a/srcpkgs/perl-PerlIO-utf8-strict/template
+++ b/srcpkgs/perl-PerlIO-utf8-strict/template
@@ -1,7 +1,7 @@
# Template file for 'perl-PerlIO-utf8-strict'
pkgname=perl-PerlIO-utf8-strict
version=0.008
-revision=1
+revision=2
wrksrc="PerlIO-utf8_strict-${version}"
build_style=perl-module
hostmakedepends="perl"
From b64a07b3f5dee3a507c5a4ade229f56d4926b5bc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:41 +0200
Subject: [PATCH 125/343] perl-Proc-ProcessTable: rebuild for perl-5.36.0.
---
srcpkgs/perl-Proc-ProcessTable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Proc-ProcessTable/template b/srcpkgs/perl-Proc-ProcessTable/template
index 418648f7d097..17830788117f 100644
--- a/srcpkgs/perl-Proc-ProcessTable/template
+++ b/srcpkgs/perl-Proc-ProcessTable/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Proc-ProcessTable'
pkgname=perl-Proc-ProcessTable
version=0.59
-revision=6
+revision=7
wrksrc="Proc-ProcessTable-${version}"
build_style=perl-module
hostmakedepends="perl"
From 9840228a04dda2700b06bbf6493e1bfaa5755619 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:50 +0200
Subject: [PATCH 126/343] perl-Ref-Util-XS: rebuild for perl-5.36.0.
---
srcpkgs/perl-Ref-Util-XS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Ref-Util-XS/template b/srcpkgs/perl-Ref-Util-XS/template
index c42321878fd6..2b685476d2bc 100644
--- a/srcpkgs/perl-Ref-Util-XS/template
+++ b/srcpkgs/perl-Ref-Util-XS/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Ref-Util-XS'
pkgname=perl-Ref-Util-XS
version=0.117
-revision=4
+revision=5
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 57013b600a1853daa9b4eaf656036ecb0f4a7a1a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:21:54 +0200
Subject: [PATCH 127/343] perl-Search-Xapian: rebuild for perl-5.36.0.
---
srcpkgs/perl-Search-Xapian/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Search-Xapian/template b/srcpkgs/perl-Search-Xapian/template
index 6343c03906d1..53ab542ae25c 100644
--- a/srcpkgs/perl-Search-Xapian/template
+++ b/srcpkgs/perl-Search-Xapian/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Search-Xapian'
pkgname=perl-Search-Xapian
version=1.2.25.5
-revision=1
+revision=2
wrksrc="Search-Xapian-$version"
build_style=perl-module
hostmakedepends="perl"
From fb306a94b693e2d2938dad5347e7f3d07521aa4e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:05 +0200
Subject: [PATCH 128/343] perl-Socket-MsgHdr: rebuild for perl-5.36.0.
---
srcpkgs/perl-Socket-MsgHdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Socket-MsgHdr/template b/srcpkgs/perl-Socket-MsgHdr/template
index 0722de7da639..175572a09ba2 100644
--- a/srcpkgs/perl-Socket-MsgHdr/template
+++ b/srcpkgs/perl-Socket-MsgHdr/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Socket-MsgHdr'
pkgname=perl-Socket-MsgHdr
version=0.05
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 5ef2ddb1ef7f923a04a1eb5d30a37572970ff5a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:08 +0200
Subject: [PATCH 129/343] perl-Socket6: rebuild for perl-5.36.0.
---
srcpkgs/perl-Socket6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Socket6/template b/srcpkgs/perl-Socket6/template
index c9f3a37e41da..bed57acf29e1 100644
--- a/srcpkgs/perl-Socket6/template
+++ b/srcpkgs/perl-Socket6/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Socket6'
pkgname=perl-Socket6
version=0.29
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 3499bcd0ce6d3f1d36ca5f7f9bb08f6e96d4ee63 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:12 +0200
Subject: [PATCH 130/343] perl-Sort-Key: rebuild for perl-5.36.0.
---
srcpkgs/perl-Sort-Key/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Sort-Key/template b/srcpkgs/perl-Sort-Key/template
index da86724b8fc2..99f8aa678327 100644
--- a/srcpkgs/perl-Sort-Key/template
+++ b/srcpkgs/perl-Sort-Key/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Sort-Key'
pkgname=perl-Sort-Key
version=1.33
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 597647d036ec2de7172739aedc832b9100bd8194 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:16 +0200
Subject: [PATCH 131/343] perl-Sub-Identify: rebuild for perl-5.36.0.
---
srcpkgs/perl-Sub-Identify/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Sub-Identify/template b/srcpkgs/perl-Sub-Identify/template
index 05e71ee6454e..982f0d03b5ef 100644
--- a/srcpkgs/perl-Sub-Identify/template
+++ b/srcpkgs/perl-Sub-Identify/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Sub-Identify'
pkgname=perl-Sub-Identify
version=0.14
-revision=7
+revision=8
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 0ca88fde6fd6b4e388bbcc9e1e2784b0974f29b7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:20 +0200
Subject: [PATCH 132/343] perl-Sub-Name: rebuild for perl-5.36.0.
---
srcpkgs/perl-Sub-Name/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Sub-Name/template b/srcpkgs/perl-Sub-Name/template
index d06c30ba5c7a..8fb584c5da61 100644
--- a/srcpkgs/perl-Sub-Name/template
+++ b/srcpkgs/perl-Sub-Name/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Sub-Name'
pkgname=perl-Sub-Name
version=0.26
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 327a882f0f578fc0b2c7382d3111c046786de895 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:23 +0200
Subject: [PATCH 133/343] perl-Taint-Runtime: rebuild for perl-5.36.0.
---
srcpkgs/perl-Taint-Runtime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Taint-Runtime/template b/srcpkgs/perl-Taint-Runtime/template
index f0d4fa961ad7..36830084db26 100644
--- a/srcpkgs/perl-Taint-Runtime/template
+++ b/srcpkgs/perl-Taint-Runtime/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Taint-Runtime'
pkgname=perl-Taint-Runtime
version=0.03
-revision=8
+revision=9
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From e73deb06af178bf6391125be40daa7339f3cec6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:26 +0200
Subject: [PATCH 134/343] perl-Template-Toolkit: rebuild for perl-5.36.0.
---
srcpkgs/perl-Template-Toolkit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Template-Toolkit/template b/srcpkgs/perl-Template-Toolkit/template
index 6c5175e48ae0..010fd8cdb839 100644
--- a/srcpkgs/perl-Template-Toolkit/template
+++ b/srcpkgs/perl-Template-Toolkit/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Template-Toolkit'
pkgname=perl-Template-Toolkit
version=3.101
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 317c4e6a923245caf76b2a425bc0822a7640f14e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:48 +0200
Subject: [PATCH 135/343] perl-Term-ReadKey: rebuild for perl-5.36.0.
---
srcpkgs/perl-Term-ReadKey/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Term-ReadKey/template b/srcpkgs/perl-Term-ReadKey/template
index 9e9b3f6015e5..c1b2bb88266a 100644
--- a/srcpkgs/perl-Term-ReadKey/template
+++ b/srcpkgs/perl-Term-ReadKey/template
@@ -2,7 +2,7 @@
pkgname=perl-Term-ReadKey
reverts="2.37_1"
version=2.33
-revision=11
+revision=12
wrksrc="TermReadKey-$version"
build_style=perl-module
hostmakedepends="perl"
From 862ae468f6515fcdbd1e9a3957253308b0c74aa4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:51 +0200
Subject: [PATCH 136/343] perl-Term-ReadLine-Gnu: rebuild for perl-5.36.0.
---
srcpkgs/perl-Term-ReadLine-Gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Term-ReadLine-Gnu/template b/srcpkgs/perl-Term-ReadLine-Gnu/template
index 7c69cd645b87..9768a05f87fd 100644
--- a/srcpkgs/perl-Term-ReadLine-Gnu/template
+++ b/srcpkgs/perl-Term-ReadLine-Gnu/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Term-ReadLine-Gnu'
pkgname=perl-Term-ReadLine-Gnu
version=1.42
-revision=2
+revision=3
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl ncurses-devel readline-devel"
From 28e175393b406647c62a949aad9db5931ad48fc9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:22:56 +0200
Subject: [PATCH 137/343] perl-Test-LeakTrace: rebuild for perl-5.36.0.
---
srcpkgs/perl-Test-LeakTrace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Test-LeakTrace/template b/srcpkgs/perl-Test-LeakTrace/template
index 0985868df6d9..a33950a0e1b3 100644
--- a/srcpkgs/perl-Test-LeakTrace/template
+++ b/srcpkgs/perl-Test-LeakTrace/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Test-LeakTrace'
pkgname=perl-Test-LeakTrace
version=0.17
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 2f327e8ace5dd745b7b2261c05f776a6aabc71a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:23:00 +0200
Subject: [PATCH 138/343] perl-Text-BibTeX: rebuild for perl-5.36.0.
---
srcpkgs/perl-Text-BibTeX/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Text-BibTeX/template b/srcpkgs/perl-Text-BibTeX/template
index 43c9dca34e46..5fdfb5cae3de 100644
--- a/srcpkgs/perl-Text-BibTeX/template
+++ b/srcpkgs/perl-Text-BibTeX/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Text-BibTeX'
pkgname=perl-Text-BibTeX
version=0.88
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-ModuleBuild
hostmakedepends="perl-ExtUtils-LibBuilder perl-Config-AutoConf"
@@ -13,7 +13,7 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Text-BibTeX/"
distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
checksum=b014586e68bdbcafb0a2cfa0401eb0a04ea5de8c4d5bc36dd0f7faeab6acf42c
-shlib_requires="libperl.so.5.34"
+shlib_requires="libperl.so.5.36"
if [ "$CROSS_BUILD" ]; then
export PERL5LIB=${XBPS_STATEDIR}/perlprefix-${XBPS_TARGET_MACHINE}
From 075e4f319ab2ec782d4ed0da293aba50dd5b88f0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:23:08 +0200
Subject: [PATCH 139/343] perl-Text-Bidi: rebuild for perl-5.36.0.
---
srcpkgs/perl-Text-Bidi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Text-Bidi/template b/srcpkgs/perl-Text-Bidi/template
index e43d27f10288..c8a75c2db7e6 100644
--- a/srcpkgs/perl-Text-Bidi/template
+++ b/srcpkgs/perl-Text-Bidi/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Text-Bidi'
pkgname=perl-Text-Bidi
version=2.15
-revision=4
+revision=5
wrksrc="${pkgname#*-}-${version}"
build_style=perl-module
hostmakedepends="perl swig"
From a8555970915aea8d97f1f5bcb59d5a9ab536ff51 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:25:22 +0200
Subject: [PATCH 140/343] perl-Text-CSV_XS: rebuild for perl-5.36.0.
---
srcpkgs/perl-Text-CSV_XS/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Text-CSV_XS/template b/srcpkgs/perl-Text-CSV_XS/template
index 108458f22a53..af8b3803ff0f 100644
--- a/srcpkgs/perl-Text-CSV_XS/template
+++ b/srcpkgs/perl-Text-CSV_XS/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Text-CSV_XS'
pkgname=perl-Text-CSV_XS
version=1.46
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From f11797538c02aa1c58920193ac41801527e10928 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:25:38 +0200
Subject: [PATCH 141/343] perl-Text-CharWidth: rebuild for perl-5.36.0.
---
srcpkgs/perl-Text-CharWidth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Text-CharWidth/template b/srcpkgs/perl-Text-CharWidth/template
index 842bdd26ea3c..3147adbdf760 100644
--- a/srcpkgs/perl-Text-CharWidth/template
+++ b/srcpkgs/perl-Text-CharWidth/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Text-CharWidth'
pkgname=perl-Text-CharWidth
version=0.04
-revision=7
+revision=8
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 93a33261a0d21bc8ba5f0db8736929893fa38f6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:25:41 +0200
Subject: [PATCH 142/343] perl-Tk: rebuild for perl-5.36.0.
---
srcpkgs/perl-Tk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Tk/template b/srcpkgs/perl-Tk/template
index 440cde7b54fa..e5d1a37fef2e 100644
--- a/srcpkgs/perl-Tk/template
+++ b/srcpkgs/perl-Tk/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Tk'
pkgname=perl-Tk
version=804.036
-revision=1
+revision=2
wrksrc="${pkgname#*-}-${version}"
build_style=perl-module
configure_args="X11INC=${XBPS_CROSS_BASE}/usr/include
From a190f7e63793cfbec091a421bdd50cb79ef2bb94 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:26:18 +0200
Subject: [PATCH 143/343] perl-Unicode-LineBreak: rebuild for perl-5.36.0.
---
srcpkgs/perl-Unicode-LineBreak/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Unicode-LineBreak/template b/srcpkgs/perl-Unicode-LineBreak/template
index a5b0f7b402ae..eb5c5a35cbd4 100644
--- a/srcpkgs/perl-Unicode-LineBreak/template
+++ b/srcpkgs/perl-Unicode-LineBreak/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Unicode-LineBreak'
pkgname=perl-Unicode-LineBreak
version=2019.001
-revision=4
+revision=5
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl pkg-config"
From e8c147d92bc3752f2eb4b320022c612b648f628e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:26:25 +0200
Subject: [PATCH 144/343] perl-Unicode-String: rebuild for perl-5.36.0.
---
srcpkgs/perl-Unicode-String/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Unicode-String/template b/srcpkgs/perl-Unicode-String/template
index badfe375b571..ce838cea775e 100644
--- a/srcpkgs/perl-Unicode-String/template
+++ b/srcpkgs/perl-Unicode-String/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Unicode-String'
pkgname=perl-Unicode-String
version=2.10
-revision=8
+revision=9
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 253759c2083f0fe82a0311dc8fed0d40fc2440f9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:26:29 +0200
Subject: [PATCH 145/343] perl-Unix-Mknod: rebuild for perl-5.36.0.
---
srcpkgs/perl-Unix-Mknod/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Unix-Mknod/template b/srcpkgs/perl-Unix-Mknod/template
index fd1e5dea9eb5..32263129ede3 100644
--- a/srcpkgs/perl-Unix-Mknod/template
+++ b/srcpkgs/perl-Unix-Mknod/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Unix-Mknod'
pkgname=perl-Unix-Mknod
version=0.04
-revision=7
+revision=8
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 104574668f5bb594969611aa134353f36d560398 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:26:31 +0200
Subject: [PATCH 146/343] perl-Variable-Magic: rebuild for perl-5.36.0.
---
srcpkgs/perl-Variable-Magic/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Variable-Magic/template b/srcpkgs/perl-Variable-Magic/template
index 196f737a5e6a..aaa7ec7d5702 100644
--- a/srcpkgs/perl-Variable-Magic/template
+++ b/srcpkgs/perl-Variable-Magic/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Variable-Magic'
pkgname=perl-Variable-Magic
version=0.62
-revision=7
+revision=8
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 9851b19396e83298230a8bf6d7f6f55ca443fbf4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:26:36 +0200
Subject: [PATCH 147/343] perl-WWW-Curl: rebuild for perl-5.36.0.
---
srcpkgs/perl-WWW-Curl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-WWW-Curl/template b/srcpkgs/perl-WWW-Curl/template
index 6a0213afd4d9..dec1c6e7b227 100644
--- a/srcpkgs/perl-WWW-Curl/template
+++ b/srcpkgs/perl-WWW-Curl/template
@@ -1,7 +1,7 @@
# Template file for 'perl-WWW-Curl'
pkgname=perl-WWW-Curl
version=4.17
-revision=12
+revision=13
wrksrc="WWW-Curl-${version}"
build_style=perl-module
hostmakedepends="perl"
From f08dfe999c5313b7ec95fa34f4481dfc551af2f5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:26:48 +0200
Subject: [PATCH 148/343] perl-WWW-Form-UrlEncoded: rebuild for perl-5.36.0.
---
srcpkgs/perl-WWW-Form-UrlEncoded/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-WWW-Form-UrlEncoded/template b/srcpkgs/perl-WWW-Form-UrlEncoded/template
index 3cd0eb23166f..1f3251d5bc6d 100644
--- a/srcpkgs/perl-WWW-Form-UrlEncoded/template
+++ b/srcpkgs/perl-WWW-Form-UrlEncoded/template
@@ -1,7 +1,7 @@
# Template file for 'perl-WWW-Form-UrlEncoded'
pkgname=perl-WWW-Form-UrlEncoded
version=0.26
-revision=2
+revision=3
wrksrc="WWW-Form-UrlEncoded-${version}"
build_style=perl-ModuleBuild
hostmakedepends="perl perl-Module-Build"
@@ -9,7 +9,7 @@ makedepends="perl perl-JSON"
depends="perl"
short_desc="Parser and builder for application/x-www-form-urlencoded"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="https://metacpan.org/release/WWW-Form-UrlEncoded"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/WWW-Form-UrlEncoded"
distfiles="${CPAN_SITE}/WWW/WWW-Form-UrlEncoded-${version}.tar.gz"
checksum=c0480b5f1f15b71163ec327b8e7842298f0cb3ace97e63d7034af1e94a2d90f4
From a20101f4c60253f9c0f6ef31720889bda114f0cb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:26:51 +0200
Subject: [PATCH 149/343] perl-XML-LibXML: rebuild for perl-5.36.0.
---
srcpkgs/perl-XML-LibXML/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index e7adb670bfa2..74496531b105 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
# Template file for 'perl-XML-LibXML'
pkgname=perl-XML-LibXML
version=2.0134
-revision=9
+revision=10
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From b843e5e4cf2e8d578e73c0e60b18f1f537e1bb6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:06 +0200
Subject: [PATCH 150/343] perl-XML-LibXSLT: rebuild for perl-5.36.0.
---
srcpkgs/perl-XML-LibXSLT/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-XML-LibXSLT/template b/srcpkgs/perl-XML-LibXSLT/template
index c58fd7eefee3..260b22be71cb 100644
--- a/srcpkgs/perl-XML-LibXSLT/template
+++ b/srcpkgs/perl-XML-LibXSLT/template
@@ -1,7 +1,7 @@
# Template file for 'perl-XML-LibXSLT'
pkgname=perl-XML-LibXSLT
version=1.99
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl pkg-config"
From 7dc43f74a90d3580144cbc943975ac6ea47ec39f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:12 +0200
Subject: [PATCH 151/343] perl-XML-Parser: rebuild for perl-5.36.0.
---
srcpkgs/perl-XML-Parser/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template
index 13c442c92359..2b0fbc0ed45e 100644
--- a/srcpkgs/perl-XML-Parser/template
+++ b/srcpkgs/perl-XML-Parser/template
@@ -1,7 +1,7 @@
# Template file for 'perl-XML-Parser'
pkgname=perl-XML-Parser
version=2.46
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 8a1b7434b009aa3cda2d4b4a16fc46d09d96730c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:17 +0200
Subject: [PATCH 152/343] perl-XString: rebuild for perl-5.36.0.
---
srcpkgs/perl-XString/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-XString/template b/srcpkgs/perl-XString/template
index 3e3b43b7fee2..9541b69fc9a0 100644
--- a/srcpkgs/perl-XString/template
+++ b/srcpkgs/perl-XString/template
@@ -1,7 +1,7 @@
# Template file for 'perl-XString'
pkgname=perl-XString
version=0.005
-revision=3
+revision=4
wrksrc="${pkgname#perl-}-${version}"
build_style=perl-module
hostmakedepends="perl"
From a246d84ab06e0e3d5a07b95890491d465584c087 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:20 +0200
Subject: [PATCH 153/343] perl-YAML-LibYAML: rebuild for perl-5.36.0.
---
srcpkgs/perl-YAML-LibYAML/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-YAML-LibYAML/template b/srcpkgs/perl-YAML-LibYAML/template
index f132df9108d3..0bb009674416 100644
--- a/srcpkgs/perl-YAML-LibYAML/template
+++ b/srcpkgs/perl-YAML-LibYAML/template
@@ -1,7 +1,7 @@
# Template file for 'perl-YAML-LibYAML'
pkgname=perl-YAML-LibYAML
version=0.83
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 3e6fd28b530c0a7add60aca2d58251fdc7dcc9ec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:26 +0200
Subject: [PATCH 154/343] perl-autovivification: rebuild for perl-5.36.0.
---
srcpkgs/perl-autovivification/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-autovivification/template b/srcpkgs/perl-autovivification/template
index a03a1c7a5fe9..757032237dff 100644
--- a/srcpkgs/perl-autovivification/template
+++ b/srcpkgs/perl-autovivification/template
@@ -1,7 +1,7 @@
# Template file for 'perl-autovivification'
pkgname=perl-autovivification
version=0.18
-revision=3
+revision=4
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 194bb53c42676cb48f17c236149d99672287b5d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:32 +0200
Subject: [PATCH 155/343] perl-b-cow: rebuild for perl-5.36.0.
---
srcpkgs/perl-b-cow/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-b-cow/template b/srcpkgs/perl-b-cow/template
index fc98026fd6e6..f1a7b8866864 100644
--- a/srcpkgs/perl-b-cow/template
+++ b/srcpkgs/perl-b-cow/template
@@ -1,7 +1,7 @@
# Template file for 'perl-b-cow'
pkgname=perl-b-cow
version=0.004
-revision=1
+revision=2
wrksrc="B-COW-${version}"
build_style=perl-module
hostmakedepends="perl"
From d520962908966d2a1f34ce04af6ff3aac52b133e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:35 +0200
Subject: [PATCH 156/343] perl-common-sense: rebuild for perl-5.36.0.
---
srcpkgs/perl-common-sense/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-common-sense/template b/srcpkgs/perl-common-sense/template
index 70d7f75c307b..87a7b3501f3d 100644
--- a/srcpkgs/perl-common-sense/template
+++ b/srcpkgs/perl-common-sense/template
@@ -1,7 +1,7 @@
# Template file for 'perl-common-sense'
pkgname=perl-common-sense
version=3.75
-revision=2
+revision=3
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From 083d4e466eb4f1399d11fec152fa1a9ab01659b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:37 +0200
Subject: [PATCH 157/343] perl-pcsc: rebuild for perl-5.36.0.
---
srcpkgs/perl-pcsc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-pcsc/template b/srcpkgs/perl-pcsc/template
index c71599cdb10a..9e87b3bc3a16 100644
--- a/srcpkgs/perl-pcsc/template
+++ b/srcpkgs/perl-pcsc/template
@@ -1,7 +1,7 @@
# Template file for 'perl-pcsc'
pkgname=perl-pcsc
version=1.4.14
-revision=9
+revision=10
_origname="pcsc-perl"
wrksrc="${_origname}-${version}"
build_style=perl-module
From fdff7d9166c71a9cf3e0466056a93ee45338c956 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:27:41 +0200
Subject: [PATCH 158/343] postgresql13: rebuild for perl-5.36.0.
---
srcpkgs/postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 08e67ba226bd..c208866183f3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql13'
pkgname=postgresql13
version=13.7
-revision=1
+revision=2
wrksrc="postgresql-${version}"
build_style=gnu-configure
make_build_target=world
From 3b2a67df626f65dabde8b984472692d2f6ff7d69 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:29:41 +0200
Subject: [PATCH 159/343] postgresql14: rebuild for perl-5.36.0.
---
srcpkgs/postgresql14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgresql14/template b/srcpkgs/postgresql14/template
index 2aa65e684a1d..f1b1dbcbb112 100644
--- a/srcpkgs/postgresql14/template
+++ b/srcpkgs/postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql14'
pkgname=postgresql14
version=14.4
-revision=1
+revision=2
wrksrc="postgresql-${version}"
build_style=gnu-configure
make_build_target=world
From ff87615af5103499d326f61d651c3e22e1d4ac14 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:30:50 +0200
Subject: [PATCH 160/343] rrdtool: rebuild for perl-5.36.0.
---
srcpkgs/rrdtool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index 9fd659a5b5f1..fc9631937b87 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
# Template file for 'rrdtool'
pkgname=rrdtool
version=1.7.2
-revision=11
+revision=12
build_style=gnu-configure
# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
# until this is fixed upstream, manually define am_cv_python_version to circumvent
@@ -39,7 +39,7 @@ python3-rrdtool_package() {
perl-rrdtool_package() {
short_desc+=" - perl bindings"
- shlib_requires="libperl.so.5.34"
+ shlib_requires="libperl.so.5.36"
pkg_install() {
vmove usr/lib/perl5
vmove usr/share/perl5
From 55e7b77d2710673791b1fcc39e7ecee4922f7ebf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:31:19 +0200
Subject: [PATCH 161/343] rxvt-unicode: rebuild for perl-5.36.0.
---
srcpkgs/rxvt-unicode/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 1ad3c47e2448..11bc4a51a1db 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -1,7 +1,7 @@
# Template file for 'rxvt-unicode'
pkgname=rxvt-unicode
version=9.30
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--with-terminfo=/usr/share/terminfo --enable-256-color
From 07403f4765649781917b112ba241a7bfa14258d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:31:34 +0200
Subject: [PATCH 162/343] subversion: rebuild for perl-5.36.0.
---
srcpkgs/subversion/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 8ad178264942..18c35e3a2132 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -4,7 +4,7 @@
#
pkgname=subversion
version=1.14.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-javahl --disable-static --config-cache
--with-gnome-keyring --with-editor=vi --disable-mod-activation
@@ -53,7 +53,9 @@ pre_configure() {
cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Config"*.p? $PERL5LIB
cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Errno.pm" $PERL5LIB
vsed -e "s;archlibexp => '\(.*\)';archlibexp => '${XBPS_CROSS_BASE}\1';" \
- -i $PERL5LIB/Config.pm $PERL5LIB/Config_heavy.pl
+ -i $PERL5LIB/Config.pm
+ vsed -e "s;archlibexp='\(.*\)';archlibexp='${XBPS_CROSS_BASE}\1';" \
+ -i $PERL5LIB/Config_heavy.pl
else
configure_args+=" --with-apxs"
fi
From 134262ea690de81c26ec91c3f849121edb54cb26 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:45:14 +0200
Subject: [PATCH 163/343] ucspi-ssl: rebuild for perl-5.36.0.
---
srcpkgs/ucspi-ssl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 3b692dc45a95..cea967d9e75c 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,7 +2,7 @@
pkgname=ucspi-ssl
reverts="0.99e_3 0.99e_2 0.99e_1"
version=0.11.6a
-revision=4
+revision=5
create_wrksrc=yes
build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
build_style=gnu-makefile
From 076a511827e2752c1b31c1eb5fa59830d491110a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:45:22 +0200
Subject: [PATCH 164/343] vim: rebuild for perl-5.36.0.
---
srcpkgs/vim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index cc0a9c23e5a8..403a663efe00 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
# Template file for 'vim'
pkgname=vim
version=9.0.0447
-revision=1
+revision=2
hostmakedepends="gettext glib-devel pkg-config"
makedepends="acl-devel ncurses-devel
$(vopt_if x11 libXt-devel)
From c13c418dddff8c2445c126d9331514095835e5f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:47:28 +0200
Subject: [PATCH 165/343] weechat: rebuild for perl-5.36.0.
---
srcpkgs/weechat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 092615031a9e..c531a68bb143 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
# Template file for 'weechat'
pkgname=weechat
version=3.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
-DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
From 883637fe2670589b1d02941c86b76093daf88987 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Sep 2022 15:47:43 +0200
Subject: [PATCH 166/343] znc: rebuild for perl-5.36.0.
---
srcpkgs/znc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index c1156243f9bf..9c186214c7c7 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
# Template file for 'znc'
pkgname=znc
version=1.8.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args="
--enable-python
From 9bc13c42df6a240d2423830c464644f2148efd27 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Oct 2022 16:52:54 +0200
Subject: [PATCH 167/343] perl-Math-BigInt-GMP: update to 1.6011.
Adopted.
---
srcpkgs/perl-Math-BigInt-GMP/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/perl-Math-BigInt-GMP/template b/srcpkgs/perl-Math-BigInt-GMP/template
index 1d8d8521a670..42bf9b71848c 100644
--- a/srcpkgs/perl-Math-BigInt-GMP/template
+++ b/srcpkgs/perl-Math-BigInt-GMP/template
@@ -1,18 +1,18 @@
# Template file for 'perl-Math-BigInt-GMP'
pkgname=perl-Math-BigInt-GMP
-version=1.6007
-revision=4
+version=1.6011
+revision=1
wrksrc="Math-BigInt-GMP-${version}"
build_style=perl-module
hostmakedepends="perl"
makedepends="perl gmp-devel"
depends="perl"
short_desc="Math::BigInt::GMP - Use the GMP library for Math::BigInt routines"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Math-BigInt-GMP"
distfiles="${CPAN_SITE}/Math/Math-BigInt-GMP-${version}.tar.gz"
-checksum=5d725e6d20ccb37e072673628f0b0dd10e5dd011619f70f50ad58aded454c01f
+checksum=e7ebec6dd43a76179afa8acd235478acb6ae3a085253933ef848af007ea6081f
post_extract() {
sed -i /check_lib_or/d Makefile.PL
From 2e3abae327ba5dfd2f441c4b8d3e6038b6f42ad3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Oct 2022 17:20:15 +0200
Subject: [PATCH 168/343] perl: put multiplicity patch into patches/.
---
srcpkgs/perl/{files => patches}/multiplicity.patch | 0
srcpkgs/perl/template | 1 -
2 files changed, 1 deletion(-)
rename srcpkgs/perl/{files => patches}/multiplicity.patch (100%)
diff --git a/srcpkgs/perl/files/multiplicity.patch b/srcpkgs/perl/patches/multiplicity.patch
similarity index 100%
rename from srcpkgs/perl/files/multiplicity.patch
rename to srcpkgs/perl/patches/multiplicity.patch
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 216f30ba4a81..b4cb1953cf3b 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -143,7 +143,6 @@ done
post_extract() {
cp -a ../perl-cross-${_perl_cross_version}/* .
- patch -p1 < ${FILESDIR}/multiplicity.patch
[ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH patchlevel.h
}
From f77c8a7a89ff36d9d924fb0d925a8ac2b3db45bc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Oct 2022 17:47:44 +0200
Subject: [PATCH 169/343] perl-Alien-wxWidgets: add transitive dependency
perl-Net-SSLeay
---
srcpkgs/perl-Alien-wxWidgets/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Alien-wxWidgets/template b/srcpkgs/perl-Alien-wxWidgets/template
index 9a27996abef1..bdbc537d80b9 100644
--- a/srcpkgs/perl-Alien-wxWidgets/template
+++ b/srcpkgs/perl-Alien-wxWidgets/template
@@ -4,7 +4,7 @@ version=0.69
revision=3
wrksrc="Alien-wxWidgets-${version}"
build_style=perl-ModuleBuild
-hostmakedepends="perl perl-Module-Build perl-Module-Pluggable perl-LWP-Protocol-https"
+hostmakedepends="perl perl-Module-Build perl-Module-Pluggable perl-LWP-Protocol-https perl-Net-SSLeay"
makedepends="perl-Alien wxWidgets-devel"
depends="perl perl-Module-Pluggable perl-Alien wxWidgets perl-LWP-Protocol-https"
short_desc="Alien::wxWidgets - building, finding and using wxWidgets binaries"
From 567085181573d379f72a5303780dc13e9d61307b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 170/343] gnome-contacts: remove unused dependency
---
srcpkgs/gnome-contacts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index ac49f9c98db4..64ecf75826b7 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
version=42.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
-makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel
- libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel libportal-devel"
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-devel
+ libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 2764c9e3f77c0196f4a039d5fa606d60156aaab3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:02:47 +0200
Subject: [PATCH 171/343] gnome-online-miners: remove package
archived project, uses gfbgraph
---
.../patches/tracker3.patch | 1554 -----------------
srcpkgs/gnome-online-miners/template | 22 -
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 1576 deletions(-)
delete mode 100644 srcpkgs/gnome-online-miners/patches/tracker3.patch
delete mode 100644 srcpkgs/gnome-online-miners/template
diff --git a/srcpkgs/gnome-online-miners/patches/tracker3.patch b/srcpkgs/gnome-online-miners/patches/tracker3.patch
deleted file mode 100644
index c948f65c7953..000000000000
--- a/srcpkgs/gnome-online-miners/patches/tracker3.patch
+++ /dev/null
@@ -1,1554 +0,0 @@
-From 53869ebc2783c9d08bb32d59c543ab692770c121 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Fri, 15 May 2020 01:11:24 +0200
-Subject: [PATCH 1/5] Use GInitable interface for GomMiner class
-
-This allows for better error reporting.
----
- src/gom-application.c | 7 +++++-
- src/gom-miner.c | 58 +++++++++++++++++++++++++++++--------------
- 2 files changed, 45 insertions(+), 20 deletions(-)
-
-diff --git a/src/gom-application.c b/src/gom-application.c
-index fadd388..bfa99ec 100644
---- a/src/gom-application.c
-+++ b/src/gom-application.c
-@@ -229,10 +229,15 @@ gom_application_constructed (GObject *object)
- {
- GomApplication *self = GOM_APPLICATION (object);
- const gchar *display_name;
-+ GError *error = NULL;
-
- G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
-
-- self->miner = g_object_new (self->miner_type, NULL);
-+ self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
-+
-+ if (self->miner == NULL)
-+ g_error ("%s", error->message);
-+
- display_name = gom_miner_get_display_name (self->miner);
- gom_dbus_set_display_name (self->skeleton, display_name);
- }
-diff --git a/src/gom-miner.c b/src/gom-miner.c
-index 7147b33..1dd9bb8 100644
---- a/src/gom-miner.c
-+++ b/src/gom-miner.c
-@@ -28,7 +28,11 @@
-
- #include "gom-miner.h"
-
--G_DEFINE_TYPE (GomMiner, gom_miner, G_TYPE_OBJECT)
-+static void gom_miner_initable_interface_init (GInitableIface *iface);
-+
-+G_DEFINE_TYPE_WITH_CODE (GomMiner, gom_miner, G_TYPE_OBJECT,
-+ G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gom_miner_initable_interface_init))
-+
-
- struct _GomMinerPrivate {
- GoaClient *client;
-@@ -132,20 +136,21 @@ gom_miner_dispose (GObject *object)
- }
-
- static void
--gom_miner_init_goa (GomMiner *self)
-+gom_miner_init_goa (GomMiner *self,
-+ GError **error)
- {
- GoaAccount *account;
- GoaObject *object;
- const gchar *provider_type;
- GList *accounts, *l;
- GomMinerClass *miner_class = GOM_MINER_GET_CLASS (self);
-+ GError *inner_error = NULL;
-
-- self->priv->client = goa_client_new_sync (NULL, &self->priv->client_error);
-+ self->priv->client = goa_client_new_sync (NULL, &inner_error);
-
-- if (self->priv->client_error != NULL)
-+ if (inner_error)
- {
-- g_critical ("Unable to create GoaClient: %s - indexing for %s will not work",
-- self->priv->client_error->message, miner_class->goa_provider_type);
-+ g_propagate_error (error, inner_error);
- return;
- }
-
-@@ -170,16 +175,34 @@ gom_miner_init_goa (GomMiner *self)
- g_list_free_full (accounts, g_object_unref);
- }
-
--static void
--gom_miner_constructed (GObject *obj)
-+static gboolean
-+gom_miner_initable_init (GInitable *initable,
-+ GCancellable *cancellable,
-+ GError **error)
- {
-- GomMiner *self = GOM_MINER (obj);
-+ GError *inner_error = NULL;
-+ GomMiner *self;
-
-- G_OBJECT_CLASS (gom_miner_parent_class)->constructed (obj);
-+ self = GOM_MINER (initable);
-
-- gom_miner_init_goa (self);
-+ self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
-+ if (inner_error)
-+ {
-+ g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
-+ return FALSE;
-+ }
-+
-+ gom_miner_init_goa (self, &inner_error);
-+ if (inner_error)
-+ {
-+ g_propagate_prefixed_error (error, inner_error, "Unable to connect to GNOME Online Accounts: ");
-+ return FALSE;
-+ }
-+
-+ return TRUE;
- }
-
-+
- static void
- gom_miner_init (GomMiner *self)
- {
-@@ -187,14 +210,12 @@ gom_miner_init (GomMiner *self)
-
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOM_TYPE_MINER, GomMinerPrivate);
- self->priv->display_name = g_strdup ("");
-+}
-
-- self->priv->connection = tracker_sparql_connection_get (NULL, &self->priv->connection_error);
-- if (self->priv->connection_error != NULL)
-- {
-- g_critical ("Unable to create TrackerSparqlConnection: %s - indexing for %s will not work",
-- self->priv->connection_error->message,
-- klass->goa_provider_type);
-- }
-+static void
-+gom_miner_initable_interface_init (GInitableIface *iface)
-+{
-+ iface->init = gom_miner_initable_init;
- }
-
- static void
-@@ -202,7 +223,6 @@ gom_miner_class_init (GomMinerClass *klass)
- {
- GObjectClass *oclass = G_OBJECT_CLASS (klass);
-
-- oclass->constructed = gom_miner_constructed;
- oclass->dispose = gom_miner_dispose;
-
- cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
---
-GitLab
-
-
-From a2b53970e1c1486a61a1522010e345732ed6ca54 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Fri, 15 May 2020 01:19:58 +0200
-Subject: [PATCH 2/5] Initial port to Tracker 3
-
-Each miner now stores its data in a private Tracker database, under
-the $XDG_CACHE_HOME/gnome-online-miners/$busname directory.
-
-Each miner now supports the org.freedesktop.Tracker3.Endpoint D-Bus
-interface which apps can use to query data directly from the miners.
----
- configure.ac | 4 +-
- src/gom-application.c | 4 +-
- src/gom-miner.c | 120 +++++++++++++++++++++++++++++++++++++++++-
- src/gom-miner.h | 1 +
- src/gom-tracker.c | 2 +-
- 5 files changed, 125 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e91e4af..8ee6315 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,7 +21,7 @@ AC_HEADER_STDC
-
- GDATA_MIN_VERSION=0.15.2
- GFBGRAPH_MIN_VERSION=0.2.2
--GLIB_MIN_VERSION=2.35.1
-+GLIB_MIN_VERSION=2.56.0
- GOA_MIN_VERSION=3.13.3
- GRILO_MIN_VERSION=0.3.0
- ZAPOJIT_MIN_VERSION=0.0.2
-@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
- PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
- AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change])
-
--PKG_CHECK_MODULES(TRACKER, [tracker-miner-2.0 tracker-sparql-2.0])
-+PKG_CHECK_MODULES(TRACKER, [tracker-sparql-3.0])
-
- # Facebook
- AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook miner])], [], [enable_facebook=yes])
-diff --git a/src/gom-application.c b/src/gom-application.c
-index bfa99ec..86546ed 100644
---- a/src/gom-application.c
-+++ b/src/gom-application.c
-@@ -233,7 +233,9 @@ gom_application_constructed (GObject *object)
-
- G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
-
-- self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
-+ self->miner = g_initable_new (self->miner_type, NULL, &error,
-+ "bus-name", g_application_get_application_id (G_APPLICATION (self)),
-+ NULL);
-
- if (self->miner == NULL)
- g_error ("%s", error->message);
-diff --git a/src/gom-miner.c b/src/gom-miner.c
-index 1dd9bb8..f349d01 100644
---- a/src/gom-miner.c
-+++ b/src/gom-miner.c
-@@ -38,7 +38,9 @@ struct _GomMinerPrivate {
- GoaClient *client;
- GError *client_error;
-
-+ gchar *bus_name;
- TrackerSparqlConnection *connection;
-+ TrackerEndpointDBus *endpoint;
- GError *connection_error;
-
- gchar *display_name;
-@@ -62,6 +64,14 @@ typedef struct {
- gpointer service;
- } InsertSharedContentData;
-
-+typedef enum
-+{
-+ PROP_BUS_NAME = 1,
-+ N_PROPERTIES
-+} GomMinerProperty;
-+
-+static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
-+
- static GThreadPool *cleanup_pool;
-
- static void cleanup_job (gpointer data, gpointer user_data);
-@@ -135,6 +145,58 @@ gom_miner_dispose (GObject *object)
- G_OBJECT_CLASS (gom_miner_parent_class)->dispose (object);
- }
-
-+static void
-+gom_miner_init_database (GomMiner *self,
-+ GCancellable *cancellable,
-+ GError **error)
-+{
-+ TrackerSparqlConnectionFlags flags;
-+ g_autoptr (GFile) store_path = NULL;
-+ g_autoptr (GDBusConnection) bus = NULL;
-+ GError *inner_error = NULL;
-+
-+ flags = TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STEMMER |
-+ TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_UNACCENT |
-+ TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STOP_WORDS |
-+ TRACKER_SPARQL_CONNECTION_FLAGS_FTS_IGNORE_NUMBERS;
-+
-+ store_path = g_file_new_build_filename (g_get_user_cache_dir (),
-+ "gnome-online-miners",
-+ self->priv->bus_name,
-+ NULL);
-+
-+ self->priv->connection = tracker_sparql_connection_new (flags,
-+ store_path,
-+ tracker_sparql_get_ontology_nepomuk (),
-+ cancellable,
-+ &inner_error);
-+
-+ if (inner_error)
-+ {
-+ g_propagate_error (error, inner_error);
-+ return;
-+ }
-+
-+ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &inner_error);
-+
-+ if (inner_error)
-+ {
-+ g_propagate_error (error, inner_error);
-+ return;
-+ }
-+
-+ self->priv->endpoint = tracker_endpoint_dbus_new (self->priv->connection,
-+ bus,
-+ NULL, /* object path */
-+ cancellable,
-+ &inner_error);
-+ if (inner_error)
-+ {
-+ g_propagate_error (error, inner_error);
-+ return;
-+ }
-+}
-+
- static void
- gom_miner_init_goa (GomMiner *self,
- GError **error)
-@@ -185,10 +247,10 @@ gom_miner_initable_init (GInitable *initable,
-
- self = GOM_MINER (initable);
-
-- self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
-+ gom_miner_init_database (self, cancellable, &inner_error);
- if (inner_error)
- {
-- g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
-+ g_propagate_prefixed_error (error, inner_error, "Unable to set up Tracker database: ");
- return FALSE;
- }
-
-@@ -212,6 +274,47 @@ gom_miner_init (GomMiner *self)
- self->priv->display_name = g_strdup ("");
- }
-
-+static void
-+gom_miner_set_property (GObject *object,
-+ guint property_id,
-+ const GValue *value,
-+ GParamSpec *pspec)
-+{
-+ GomMiner *self = GOM_MINER (object);
-+
-+ switch ((GomMinerProperty) property_id)
-+ {
-+ case PROP_BUS_NAME:
-+ g_free (self->priv->bus_name);
-+ self->priv->bus_name = g_value_dup_string (value);
-+ break;
-+
-+ default:
-+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-+ break;
-+ }
-+}
-+
-+static void
-+gom_miner_get_property (GObject *object,
-+ guint property_id,
-+ GValue *value,
-+ GParamSpec *pspec)
-+{
-+ GomMiner *self = GOM_MINER (object);
-+
-+ switch ((GomMinerProperty) property_id)
-+ {
-+ case PROP_BUS_NAME:
-+ g_value_set_string (value, self->priv->bus_name);
-+ break;
-+
-+ default:
-+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-+ break;
-+ }
-+}
-+
- static void
- gom_miner_initable_interface_init (GInitableIface *iface)
- {
-@@ -224,6 +327,19 @@ gom_miner_class_init (GomMinerClass *klass)
- GObjectClass *oclass = G_OBJECT_CLASS (klass);
-
- oclass->dispose = gom_miner_dispose;
-+ oclass->set_property = gom_miner_set_property;
-+ oclass->get_property = gom_miner_get_property;
-+
-+ obj_properties[PROP_BUS_NAME] = g_param_spec_string ("bus-name",
-+ "Bus Name",
-+ "D-Bus name of the miner",
-+ NULL /* default value */,
-+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
-+ G_PARAM_STATIC_STRINGS);
-+
-+ g_object_class_install_properties (oclass,
-+ N_PROPERTIES,
-+ obj_properties);
-
- cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
-
-diff --git a/src/gom-miner.h b/src/gom-miner.h
-index 8f83139..5dcfc8d 100644
---- a/src/gom-miner.h
-+++ b/src/gom-miner.h
-@@ -61,6 +61,7 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
- typedef struct {
- GomMiner *miner;
- TrackerSparqlConnection *connection;
-+ gchar *bus_name;
-
- GoaAccount *account;
- GHashTable *services;
-diff --git a/src/gom-tracker.c b/src/gom-tracker.c
-index 68818c4..5666c16 100644
---- a/src/gom-tracker.c
-+++ b/src/gom-tracker.c
-@@ -408,7 +408,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
- gchar *retval = NULL;
- gchar *select = NULL;
-
-- g_return_val_if_fail (TRACKER_SPARQL_IS_CONNECTION (connection), NULL);
-+ g_return_val_if_fail (TRACKER_IS_SPARQL_CONNECTION (connection), NULL);
- g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- g_return_val_if_fail (make != NULL || model != NULL, NULL);
---
-GitLab
-
-
-From 3e77eff8a677c1ecd9aa129094ed857da802d787 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Fri, 15 May 2020 01:37:28 +0200
-Subject: [PATCH 3/5] Add DataObject class to our resources
-
-We need this to set nie:dataSource property. I don't understand
-how this worked in the past.
----
- src/gom-tracker.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gom-tracker.c b/src/gom-tracker.c
-index 5666c16..63a4c29 100644
---- a/src/gom-tracker.c
-+++ b/src/gom-tracker.c
-@@ -208,7 +208,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
- insert = g_string_new (NULL);
- g_string_append_printf
- (insert,
-- "INSERT OR REPLACE %s { <%s> a nie:InformationElement ; %s %s }",
-+ "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
- graph_str, resource, property_name, quoted);
- g_free (quoted);
-
---
-GitLab
-
-
-From e742a60cf9dea1391d1ff409ce5696d21f423bed Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Fri, 15 May 2020 02:13:11 +0200
-Subject: [PATCH 4/5] Organize data into content-based graphs
-
-Previously GOM used a graph per account and per resource but this
-cannot be done in Tracker 3.
-
-In Tracker 3, each graph is stored as a separate SQLite database
-and currently a maximum of ten graphs can be included in a single
-query due to SQLite's limitations.
-
-The new layout is modelled after how tracker-miner-fs uses graphs:
-we use a graph per content type (Contacts, Documents, Pictures),
-plus an extra graph to store accounts and folders/collections.
----
- src/gom-facebook-miner.c | 12 ++---
- src/gom-flickr-miner.c | 24 +++++-----
- src/gom-gdata-miner.c | 31 ++++++------
- src/gom-media-server-miner.c | 10 ++--
- src/gom-miner.c | 40 ++++++++++++----
- src/gom-miner.h | 1 -
- src/gom-owncloud-miner.c | 22 +++++----
- src/gom-tracker.c | 93 +++++++++++++++++-------------------
- src/gom-tracker.h | 14 +++++-
- src/gom-zpj-miner.c | 22 ++++-----
- 10 files changed, 150 insertions(+), 119 deletions(-)
-
-diff --git a/src/gom-facebook-miner.c b/src/gom-facebook-miner.c
-index ff42ca5..fc89096 100644
---- a/src/gom-facebook-miner.c
-+++ b/src/gom-facebook-miner.c
-@@ -70,7 +70,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
- (connection,
- cancellable, error,
- &resource_exists,
-- datasource_urn, identifier,
-+ TRACKER_PICTURES_GRAPH, identifier,
- "nfo:RemoteDataObject", class, NULL);
-
- if (*error != NULL)
-@@ -239,7 +239,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:url", album_link);
-
- if (*error != NULL)
-@@ -248,7 +248,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:description", album_description);
-
- if (*error != NULL)
-@@ -257,7 +257,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:title", album_name);
-
- if (*error != NULL)
-@@ -274,7 +274,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nco:creator", contact_resource);
- g_free (contact_resource);
-
-@@ -284,7 +284,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:contentCreated", album_created_time);
-
- if (*error != NULL)
-diff --git a/src/gom-flickr-miner.c b/src/gom-flickr-miner.c
-index 9ac338e..dc7349e 100644
---- a/src/gom-flickr-miner.c
-+++ b/src/gom-flickr-miner.c
-@@ -143,14 +143,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- (connection,
- cancellable, error,
- &resource_exists,
-- datasource_urn, identifier,
-+ TRACKER_PICTURES_GRAPH, identifier,
- "nfo:RemoteDataObject", class, NULL);
-
- if (*error != NULL)
- goto out;
-
- gom_tracker_update_datasource (connection, datasource_urn,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_PICTURES_GRAPH, resource,
- cancellable, error);
-
- if (*error != NULL)
-@@ -166,7 +166,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
- (connection, cancellable, error,
- NULL,
-- datasource_urn, parent_identifier,
-+ TRACKER_PICTURES_GRAPH, parent_identifier,
- "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
- g_free (parent_identifier);
-
-@@ -176,7 +176,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:isPartOf", parent_resource_urn);
- g_free (parent_resource_urn);
-
-@@ -187,7 +187,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:title", grl_media_get_title (entry->media));
-
- if (*error != NULL)
-@@ -202,7 +202,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- created_time = modification_date = grl_media_get_creation_date (entry->media);
- new_mtime = g_date_time_to_unix (modification_date);
- mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_PICTURES_GRAPH, resource,
- cancellable, error);
-
- if (*error != NULL)
-@@ -221,7 +221,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:contentCreated", date);
- g_free (date);
- }
-@@ -233,7 +233,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:url", url);
-
- if (*error != NULL)
-@@ -242,7 +242,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:description", grl_media_get_description (entry->media));
-
- if (*error != NULL)
-@@ -254,7 +254,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:mimeType", mime);
- g_free (mime);
-
-@@ -265,7 +265,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- contact_resource = gom_tracker_utils_ensure_contact_resource
- (connection,
- cancellable, error,
-- datasource_urn, grl_media_get_author (entry->media));
-+ TRACKER_PICTURES_GRAPH, grl_media_get_author (entry->media));
-
- if (*error != NULL)
- goto out;
-@@ -273,7 +273,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nco:creator", contact_resource);
- g_free (contact_resource);
-
-diff --git a/src/gom-gdata-miner.c b/src/gom-gdata-miner.c
-index 7872431..d0deb80 100644
---- a/src/gom-gdata-miner.c
-+++ b/src/gom-gdata-miner.c
-@@ -120,7 +120,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
- (connection,
- cancellable, error,
- &resource_exists,
-- datasource_urn, identifier,
-+ TRACKER_DOCUMENTS_GRAPH, identifier,
- "nfo:RemoteDataObject", class, NULL);
-
- if (*error != NULL)
-@@ -187,7 +187,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
- parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
- (connection, cancellable, error,
- NULL,
-- datasource_urn, parent_resource_id,
-+ GOM_GRAPH, parent_resource_id,
- "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
- g_free (parent_resource_id);
-
-@@ -219,7 +219,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
- gom_tracker_sparql_connection_toggle_favorite
- (connection,
- cancellable, error,
-- resource, starred);
-+ TRACKER_PICTURES_GRAPH, resource, starred);
-
- if (*error != NULL)
- goto out;
-@@ -400,14 +400,14 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
- (connection,
- cancellable, error,
- &resource_exists,
-- datasource_urn, identifier,
-+ TRACKER_PICTURES_GRAPH, identifier,
- "nfo:RemoteDataObject", "nmm:Photo", NULL);
-
- if (*error != NULL)
- goto out;
-
- gom_tracker_update_datasource (connection, datasource_urn,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_PICTURES_GRAPH, resource,
- cancellable, error);
- if (*error != NULL)
- goto out;
-@@ -566,6 +566,7 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
- equipment_resource = gom_tracker_utils_ensure_equipment_resource (connection,
- cancellable,
- error,
-+ TRACKER_PICTURES_GRAPH,
- make,
- model);
-
-@@ -665,7 +666,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
- (connection,
- cancellable, error,
- &resource_exists,
-- datasource_urn, identifier,
-+ TRACKER_PICTURES_GRAPH, identifier,
- "nfo:RemoteDataObject", "nfo:DataContainer",
- NULL);
-
-@@ -674,7 +675,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
-
- gom_tracker_update_datasource
- (connection, datasource_urn,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_PICTURES_GRAPH, resource,
- cancellable, error);
-
- if (*error != NULL)
-@@ -685,7 +686,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
- */
- new_mtime = gdata_entry_get_updated (GDATA_ENTRY (album));
- mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_PICTURES_GRAPH, resource,
- cancellable, error);
-
- if (*error != NULL)
-@@ -703,7 +704,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:url", alternate_uri);
-
- if (*error != NULL)
-@@ -713,7 +714,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:description", summary);
-
- if (*error != NULL)
-@@ -723,7 +724,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:title", title);
-
- if (*error != NULL)
-@@ -743,7 +744,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nco:creator", contact_resource);
- g_free (contact_resource);
-
-@@ -755,7 +756,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:contentCreated", date);
- g_free (date);
-
-@@ -865,7 +866,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
- if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
- cancellable,
- &local_error,
-- datasource_urn,
-+ TRACKER_PICTURES_GRAPH,
- source_urn,
- "nie:relatedTo",
- photo_resource_urn))
-@@ -878,7 +879,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
- if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
- cancellable,
- &local_error,
-- datasource_urn,
-+ TRACKER_PICTURES_GRAPH,
- photo_resource_urn,
- "nie:links",
- source_urn))
-diff --git a/src/gom-media-server-miner.c b/src/gom-media-server-miner.c
-index 490869e..32e08c6 100644
---- a/src/gom-media-server-miner.c
-+++ b/src/gom-media-server-miner.c
-@@ -65,14 +65,14 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
- (connection,
- cancellable, error,
- &resource_exists,
-- datasource_urn, identifier,
-+ TRACKER_PICTURES_GRAPH, identifier,
- "nfo:RemoteDataObject", class, NULL);
-
- if (*error != NULL)
- goto out;
-
- gom_tracker_update_datasource (connection, datasource_urn,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_PICTURES_GRAPH, resource,
- cancellable, error);
- if (*error != NULL)
- goto out;
-@@ -81,7 +81,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:url", photo->url);
-
- if (*error != NULL)
-@@ -90,7 +90,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:mimeType", photo->mimetype);
-
- if (*error != NULL)
-@@ -99,7 +99,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:title", photo->name);
-
- if (*error != NULL)
-diff --git a/src/gom-miner.c b/src/gom-miner.c
-index f349d01..32892fa 100644
---- a/src/gom-miner.c
-+++ b/src/gom-miner.c
-@@ -376,7 +376,7 @@ gom_miner_ensure_datasource (GomMiner *self,
- " <%s> a nie:DataSource ; nao:identifier \"%s\" . "
- " <%s> a nie:InformationElement ; nie:rootElementOf <%s> ; nie:version \"%d\""
- "}",
-- datasource_urn,
-+ GOM_GRAPH,
- datasource_urn, klass->miner_identifier,
- root_element_urn, datasource_urn, klass->version);
-
-@@ -401,8 +401,8 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
-
- select = g_string_new (NULL);
- g_string_append_printf (select,
-- "SELECT ?urn nao:identifier(?urn) WHERE { ?urn nie:dataSource <%s> }",
-- job->datasource_urn);
-+ "SELECT ?urn ?id WHERE { GRAPH <%s> { ?urn nie:dataSource <%s> ; nao:identifier ?id . } }",
-+ GOM_GRAPH, job->datasource_urn);
-
- cursor = tracker_sparql_connection_query (job->connection,
- select->str,
-@@ -415,9 +415,21 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
-
- while (tracker_sparql_cursor_next (cursor, cancellable, error))
- {
-- g_hash_table_insert (job->previous_resources,
-- g_strdup (tracker_sparql_cursor_get_string (cursor, 1, NULL)),
-- g_strdup (tracker_sparql_cursor_get_string (cursor, 0, NULL)));
-+ const gchar *urn, *identifier;
-+
-+ urn = tracker_sparql_cursor_get_string (cursor, 0, NULL);
-+ identifier = tracker_sparql_cursor_get_string (cursor, 1, NULL);
-+
-+ if (identifier != NULL)
-+ {
-+ g_hash_table_insert (job->previous_resources,
-+ g_strdup (identifier),
-+ g_strdup (urn));
-+ }
-+ else
-+ {
-+ g_warning ("Missing identifier for urn %s", urn);
-+ }
- }
-
- g_object_unref (cursor);
-@@ -489,16 +501,19 @@ gom_account_miner_job (GTask *task,
- if (error != NULL)
- goto out;
-
-+ g_debug ("account miner: Querying existing accounts stored in database");
- gom_account_miner_job_query_existing (job, &error);
-
- if (error != NULL)
- goto out;
-
-+ g_debug ("account miner: Querying remote server");
- gom_account_miner_job_query (job, &error);
-
- if (error != NULL)
- goto out;
-
-+ g_debug ("account miner: Removing stale accounts");
- gom_account_miner_job_cleanup_previous (job, &error);
-
- if (error != NULL)
-@@ -752,10 +767,15 @@ cleanup_job (gpointer data,
-
- /* find all our datasources in the tracker DB */
- select = g_string_new (NULL);
-- g_string_append_printf (select, "SELECT ?datasource nie:version(?root) WHERE { "
-- "?datasource a nie:DataSource . "
-- "?datasource nao:identifier \"%s\" . "
-- "OPTIONAL { ?root nie:rootElementOf ?datasource } }",
-+ g_string_append_printf (select,
-+ "SELECT ?datasource nie:version(?root) WHERE { "
-+ " GRAPH <%s> { "
-+ " ?datasource a nie:DataSource . "
-+ " ?datasource nao:identifier \"%s\" . "
-+ " OPTIONAL { ?root nie:rootElementOf ?datasource } "
-+ " }"
-+ "}",
-+ GOM_GRAPH,
- klass->miner_identifier);
-
- cursor = tracker_sparql_connection_query (self->priv->connection,
-diff --git a/src/gom-miner.h b/src/gom-miner.h
-index 5dcfc8d..8f83139 100644
---- a/src/gom-miner.h
-+++ b/src/gom-miner.h
-@@ -61,7 +61,6 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
- typedef struct {
- GomMiner *miner;
- TrackerSparqlConnection *connection;
-- gchar *bus_name;
-
- GoaAccount *account;
- GHashTable *services;
-diff --git a/src/gom-owncloud-miner.c b/src/gom-owncloud-miner.c
-index 34d303b..623f2e1 100644
---- a/src/gom-owncloud-miner.c
-+++ b/src/gom-owncloud-miner.c
-@@ -100,14 +100,14 @@ account_miner_job_process_file (GomAccountMinerJob *job,
- (connection,
- cancellable, error,
- &resource_exists,
-- datasource_urn, identifier,
-+ TRACKER_DOCUMENTS_GRAPH, identifier,
- "nfo:RemoteDataObject", class, NULL);
-
- if (*error != NULL)
- goto out;
-
- gom_tracker_update_datasource (connection, datasource_urn,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
- cancellable, error);
-
- if (*error != NULL)
-@@ -117,7 +117,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
- modification_time = g_date_time_new_from_timeval_local (&tv);
- new_mtime = g_date_time_to_unix (modification_time);
- mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
- cancellable, error);
-
- if (*error != NULL)
-@@ -133,7 +133,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_DOCUMENTS_GRAPH, resource,
- "nie:url", uri);
-
- if (*error != NULL)
-@@ -156,7 +156,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
- parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
- (connection, cancellable, error,
- NULL,
-- datasource_urn, parent_identifier,
-+ GOM_GRAPH, parent_identifier,
- "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
- g_checksum_reset (checksum);
- g_free (parent_identifier);
-@@ -168,7 +168,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_DOCUMENTS_GRAPH, resource,
- "nie:isPartOf", parent_resource_urn);
- g_free (parent_resource_urn);
-
-@@ -182,7 +182,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_DOCUMENTS_GRAPH, resource,
- "nie:mimeType", mime);
-
- if (*error != NULL)
-@@ -194,7 +194,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_DOCUMENTS_GRAPH, resource,
- "nfo:fileName", display_name);
-
- if (*error != NULL)
-@@ -416,6 +416,11 @@ query_owncloud (GomAccountMinerJob *job,
- mount = g_volume_get_mount (volume);
- if (mount == NULL)
- {
-+ g_autofree gchar *volume_name;
-+
-+ volume_name = g_volume_get_name (volume);
-+ g_debug ("Mounting Online Account volume %s", volume_name);
-+
- data.error = error;
-
- context = g_main_context_new ();
-@@ -436,6 +441,7 @@ query_owncloud (GomAccountMinerJob *job,
- }
-
- root = g_mount_get_root (mount);
-+ g_debug ("Got volume from gnome-online-accounts: root is %s", g_file_peek_path (root));
- account_miner_job_traverse_dir (job, connection, previous_resources, datasource_urn, root, TRUE, cancellable, error);
-
- g_object_unref (root);
-diff --git a/src/gom-tracker.c b/src/gom-tracker.c
-index 63a4c29..0d1766c 100644
---- a/src/gom-tracker.c
-+++ b/src/gom-tracker.c
-@@ -26,16 +26,11 @@
- #include "gom-tracker.h"
- #include "gom-utils.h"
-
--static gchar *
--_tracker_utils_format_into_graph (const gchar *graph)
--{
-- return (graph != NULL) ? g_strdup_printf ("INTO <%s> ", graph) : g_strdup ("");
--}
--
- static gboolean
- gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *connection,
- GCancellable *cancellable,
- GError **error,
-+ const gchar *graph,
- const gchar *resource,
- const gchar *attribute,
- gchar **value)
-@@ -45,8 +40,8 @@ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *con
- const gchar *string_value = NULL;
- gboolean res;
-
-- g_string_append_printf (select, "SELECT ?val { <%s> %s ?val }",
-- resource, attribute);
-+ g_string_append_printf (select, "SELECT ?val { GRAPH <%s> { <%s> %s ?val } }",
-+ graph, resource, attribute);
- cursor = tracker_sparql_connection_query (connection,
- select->str,
- cancellable, error);
-@@ -86,7 +81,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
- const gchar *class,
- ...)
- {
-- GString *select, *insert, *inner;
-+ GString *select, *inner;
-+ gchar *insert;
- va_list args;
- const gchar *arg;
- TrackerSparqlCursor *cursor;
-@@ -98,6 +94,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
- gchar *key = NULL, *val = NULL;
- gboolean exists = FALSE;
-
-+ g_return_val_if_fail (graph != NULL, NULL);
-+
- /* build the inner query with all the classes */
- va_start (args, class);
- inner = g_string_new (NULL);
-@@ -112,7 +110,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
- /* query if such a resource is already in the DB */
- select = g_string_new (NULL);
- g_string_append_printf (select,
-- "SELECT ?urn WHERE { ?urn %s }", inner->str);
-+ "SELECT ?urn WHERE { GRAPH <%s> { ?urn %s } }", graph, inner->str);
-
- cursor = tracker_sparql_connection_query (connection,
- select->str,
-@@ -138,19 +136,12 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
- }
-
- /* not found, create the resource */
-- insert = g_string_new (NULL);
-- graph_str = _tracker_utils_format_into_graph (graph);
--
-- g_string_append_printf (insert, "INSERT %s { _:res %s }",
-- graph_str, inner->str);
-- g_free (graph_str);
-- g_string_free (inner, TRUE);
--
-+ insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
-+ graph, inner->str);
- insert_res =
-- tracker_sparql_connection_update_blank (connection, insert->str,
-+ tracker_sparql_connection_update_blank (connection, insert,
- G_PRIORITY_DEFAULT, NULL, error);
--
-- g_string_free (insert, TRUE);
-+ g_free (insert);
-
- if (*error != NULL)
- goto out;
-@@ -194,10 +185,10 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
- const gchar *property_value)
- {
- GString *insert;
-- gchar *graph_str, *quoted;
-+ gchar *quoted;
- gboolean retval = TRUE;
-
-- graph_str = _tracker_utils_format_into_graph (graph);
-+ g_return_val_if_fail (graph != NULL, FALSE);
-
- /* the "null" value must not be quoted */
- if (property_value == NULL)
-@@ -208,8 +199,8 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
- insert = g_string_new (NULL);
- g_string_append_printf
- (insert,
-- "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
-- graph_str, resource, property_name, quoted);
-+ "INSERT OR REPLACE INTO <%s> { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
-+ graph, resource, property_name, quoted);
- g_free (quoted);
-
- g_debug ("Insert or replace triple: query %s", insert->str);
-@@ -223,8 +214,6 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
- if (*error != NULL)
- retval = FALSE;
-
-- g_free (graph_str);
--
- return retval;
- }
-
-@@ -271,6 +260,7 @@ gboolean
- gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
- GCancellable *cancellable,
- GError **error,
-+ const gchar *graph,
- const gchar *resource,
- gboolean favorite)
- {
-@@ -279,15 +269,15 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
- gboolean retval = TRUE;
-
- if (favorite)
-- op_str = "INSERT OR REPLACE";
-+ op_str = "INSERT OR REPLACE INTO";
- else
-- op_str = "DELETE";
-+ op_str = "DELETE FROM";
-
- update = g_string_new (NULL);
- g_string_append_printf
- (update,
-- "%s { <%s> nao:hasTag nao:predefined-tag-favorite }",
-- op_str, resource);
-+ "%s <%s> { <%s> nao:hasTag nao:predefined-tag-favorite }",
-+ op_str, graph, resource);
-
- g_debug ("Toggle favorite: query %s", update->str);
-
-@@ -321,9 +311,13 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
- mail_uri = g_strconcat ("mailto:", email, NULL);
- select = g_string_new (NULL);
- g_string_append_printf (select,
-- "SELECT ?urn WHERE { ?urn a nco:Contact . "
-- "?urn nco:hasEmailAddress ?mail . "
-- "FILTER (fn:contains(?mail, \"%s\" )) }", mail_uri);
-+ "SELECT ?urn WHERE { "
-+ " GRAPH <%s> { "
-+ " ?urn a nco:Contact . "
-+ " ?urn nco:hasEmailAddress ?mail . "
-+ " FILTER (fn:contains(?mail, \"%s\" )) "
-+ " }"
-+ "}", TRACKER_CONTACTS_GRAPH, mail_uri);
-
- cursor = tracker_sparql_connection_query (connection,
- select->str,
-@@ -351,8 +345,9 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
- insert = g_string_new (NULL);
-
- g_string_append_printf (insert,
-- "INSERT { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
-+ "INSERT INTO <%s> { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
- "_:res a nco:Contact ; nco:hasEmailAddress <%s> ; nco:fullname \"%s\" . }",
-+ TRACKER_CONTACTS_GRAPH,
- mail_uri, email,
- mail_uri, fullname);
-
-@@ -397,6 +392,7 @@ gchar *
- gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
- GCancellable *cancellable,
- GError **error,
-+ const gchar *graph,
- const gchar *make,
- const gchar *model)
- {
-@@ -416,7 +412,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
- equip_uri = tracker_sparql_escape_uri_printf ("urn:equipment:%s:%s:",
- make != NULL ? make : "",
- model != NULL ? model : "");
-- select = g_strdup_printf ("SELECT <%s> WHERE { }", equip_uri);
-+ select = g_strdup_printf ("ASK { GRAPH <%s> { <%s> a nfo:Equipment } }", graph, equip_uri);
-
- local_error = NULL;
- cursor = tracker_sparql_connection_query (connection, select, cancellable, &local_error);
-@@ -436,20 +432,19 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
-
- if (res)
- {
-- const gchar *cursor_uri;
--
-- cursor_uri = tracker_sparql_cursor_get_string (cursor, 0, NULL);
-- if (g_strcmp0 (cursor_uri, equip_uri) == 0)
-+ if (tracker_sparql_cursor_get_boolean (cursor, 0))
- {
-- /* return the found resource */
-- retval = g_strdup (cursor_uri);
-+ /* The resource exists */
-+ retval = equip_uri;
-+ equip_uri = NULL;
- g_debug ("Found resource in the store: %s", retval);
- goto out;
- }
- }
-
- /* not found, create the resource */
-- insert = g_strdup_printf ("INSERT { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
-+ insert = g_strdup_printf ("INSERT INTO <%s> { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
-+ graph,
- equip_uri,
- make,
- model);
-@@ -480,7 +475,7 @@ void
- gom_tracker_update_datasource (TrackerSparqlConnection *connection,
- const gchar *datasource_urn,
- gboolean resource_exists,
-- const gchar *identifier,
-+ const gchar *graph,
- const gchar *resource,
- GCancellable *cancellable,
- GError **error)
-@@ -498,7 +493,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection *connection,
-
- res = gom_tracker_sparql_connection_get_string_attribute
- (connection, cancellable, error,
-- resource, "nie:dataSource", &old_value);
-+ graph, resource, "nie:dataSource", &old_value);
- g_clear_error (error);
-
- if (res)
-@@ -514,7 +509,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection *connection,
- if (set_datasource)
- gom_tracker_sparql_connection_set_triple
- (connection, cancellable, error,
-- identifier, resource,
-+ graph, resource,
- "nie:dataSource", datasource_urn);
- }
-
-@@ -522,7 +517,7 @@ gboolean
- gom_tracker_update_mtime (TrackerSparqlConnection *connection,
- gint64 new_mtime,
- gboolean resource_exists,
-- const gchar *identifier,
-+ const gchar *graph,
- const gchar *resource,
- GCancellable *cancellable,
- GError **error)
-@@ -536,7 +531,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection *connection,
- {
- res = gom_tracker_sparql_connection_get_string_attribute
- (connection, cancellable, error,
-- resource, "nie:contentLastModified", &old_value);
-+ graph, resource, "nie:contentLastModified", &old_value);
- g_clear_error (error);
-
- if (res)
-@@ -552,7 +547,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection *connection,
- date = gom_iso8601_from_timestamp (new_mtime);
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection, cancellable, error,
-- identifier, resource,
-+ graph, resource,
- "nie:contentLastModified", date);
- g_free (date);
-
-diff --git a/src/gom-tracker.h b/src/gom-tracker.h
-index 94a39e8..a5ae6fd 100644
---- a/src/gom-tracker.h
-+++ b/src/gom-tracker.h
-@@ -29,6 +29,14 @@
-
- G_BEGIN_DECLS
-
-+/* The graph where we store account meta information */
-+#define GOM_GRAPH "tracker.api.gnome.org/ontology/v3/gnome-online-miners"
-+
-+/* Graphs where we store content information */
-+#define TRACKER_CONTACTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Contacts"
-+#define TRACKER_DOCUMENTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Documents"
-+#define TRACKER_PICTURES_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Pictures"
-+
- gchar *gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connection,
- GCancellable *cancellable,
- GError **error,
-@@ -57,6 +65,7 @@ gboolean gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *conn
- gboolean gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
- GCancellable *cancellable,
- GError **error,
-+ const gchar *graph,
- const gchar *resource,
- gboolean favorite);
-
-@@ -69,20 +78,21 @@ gchar* gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *conne
- gchar *gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
- GCancellable *cancellable,
- GError **error,
-+ const gchar *graph,
- const gchar *make,
- const gchar *model);
-
- void gom_tracker_update_datasource (TrackerSparqlConnection *connection,
- const gchar *datasource_urn,
- gboolean resource_exists,
-- const gchar *identifier,
-+ const gchar *graph,
- const gchar *resource,
- GCancellable *cancellable,
- GError **error);
- gboolean gom_tracker_update_mtime (TrackerSparqlConnection *connection,
- gint64 new_mtime,
- gboolean resource_exists,
-- const gchar *identifier,
-+ const gchar *graph,
- const gchar *resource,
- GCancellable *cancellable,
- GError **error);
-diff --git a/src/gom-zpj-miner.c b/src/gom-zpj-miner.c
-index 6dff947..1372de5 100644
---- a/src/gom-zpj-miner.c
-+++ b/src/gom-zpj-miner.c
-@@ -70,14 +70,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- (connection,
- cancellable, error,
- &resource_exists,
-- datasource_urn, identifier,
-+ TRACKER_PICTURES_GRAPH, identifier,
- "nfo:RemoteDataObject", class, NULL);
-
- if (*error != NULL)
- goto out;
-
- gom_tracker_update_datasource (connection, datasource_urn,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_PICTURES_GRAPH, resource,
- cancellable, error);
-
- if (*error != NULL)
-@@ -86,7 +86,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- updated_time = zpj_skydrive_entry_get_updated_time (entry);
- new_mtime = g_date_time_to_unix (updated_time);
- mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
-- resource_exists, identifier, resource,
-+ resource_exists, TRACKER_PICTURES_GRAPH, resource,
- cancellable, error);
-
- if (*error != NULL)
-@@ -102,7 +102,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:url", identifier);
-
- if (*error != NULL)
-@@ -119,7 +119,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
- (connection, cancellable, error,
- NULL,
-- datasource_urn, parent_identifier,
-+ TRACKER_PICTURES_GRAPH, parent_identifier,
- "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
- g_free (parent_identifier);
-
-@@ -129,7 +129,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:isPartOf", parent_resource_urn);
- g_free (parent_resource_urn);
-
-@@ -142,7 +142,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:mimeType", mime);
- g_free (mime);
-
-@@ -154,7 +154,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:description", zpj_skydrive_entry_get_description (entry));
-
- if (*error != NULL)
-@@ -163,7 +163,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nfo:fileName", name);
-
- if (*error != NULL)
-@@ -180,7 +180,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nco:creator", contact_resource);
- g_free (contact_resource);
-
-@@ -192,7 +192,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
- gom_tracker_sparql_connection_insert_or_replace_triple
- (connection,
- cancellable, error,
-- datasource_urn, resource,
-+ TRACKER_PICTURES_GRAPH, resource,
- "nie:contentCreated", date);
- g_free (date);
-
---
-GitLab
-
-
-From 34259944dd9e6e167663c97080142f6e8b7f00f2 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Mon, 27 Jul 2020 23:48:49 +0200
-Subject: [PATCH 5/5] Update for API changes in Tracker 2.99
-
----
- src/gom-miner.c | 3 ---
- src/gom-tracker.c | 22 ++++++----------------
- 2 files changed, 6 insertions(+), 19 deletions(-)
-
-diff --git a/src/gom-miner.c b/src/gom-miner.c
-index 32892fa..d9ccf67 100644
---- a/src/gom-miner.c
-+++ b/src/gom-miner.c
-@@ -382,7 +382,6 @@ gom_miner_ensure_datasource (GomMiner *self,
-
- tracker_sparql_connection_update (self->priv->connection,
- datasource_insert->str,
-- G_PRIORITY_DEFAULT,
- cancellable,
- error);
-
-@@ -469,7 +468,6 @@ gom_account_miner_job_cleanup_previous (GomAccountMinerJob *job,
-
- tracker_sparql_connection_update (job->connection,
- delete->str,
-- G_PRIORITY_DEFAULT,
- cancellable,
- error);
-
-@@ -709,7 +707,6 @@ cleanup_job_do_cleanup (CleanupJob *job, GCancellable *cancellable)
-
- tracker_sparql_connection_update (self->priv->connection,
- update->str,
-- G_PRIORITY_DEFAULT,
- cancellable,
- &error);
- g_string_free (update, TRUE);
-diff --git a/src/gom-tracker.c b/src/gom-tracker.c
-index 0d1766c..5f49f73 100644
---- a/src/gom-tracker.c
-+++ b/src/gom-tracker.c
-@@ -138,9 +138,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
- /* not found, create the resource */
- insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
- graph, inner->str);
-- insert_res =
-- tracker_sparql_connection_update_blank (connection, insert,
-- G_PRIORITY_DEFAULT, NULL, error);
-+ insert_res = tracker_sparql_connection_update_blank (connection, insert, NULL, error);
- g_free (insert);
-
- if (*error != NULL)
-@@ -205,9 +203,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
-
- g_debug ("Insert or replace triple: query %s", insert->str);
-
-- tracker_sparql_connection_update (connection, insert->str,
-- G_PRIORITY_DEFAULT, cancellable,
-- error);
-+ tracker_sparql_connection_update (connection, insert->str, cancellable, error);
-
- g_string_free (insert, TRUE);
-
-@@ -235,9 +231,7 @@ gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *connection,
- "DELETE { <%s> %s ?val } WHERE { <%s> %s ?val }", resource,
- property_name, resource, property_name);
-
-- tracker_sparql_connection_update (connection, delete->str,
-- G_PRIORITY_DEFAULT, cancellable,
-- error);
-+ tracker_sparql_connection_update (connection, delete->str, cancellable, error);
-
- g_string_free (delete, TRUE);
- if (*error != NULL)
-@@ -281,9 +275,7 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
-
- g_debug ("Toggle favorite: query %s", update->str);
-
-- tracker_sparql_connection_update (connection, update->str,
-- G_PRIORITY_DEFAULT, cancellable,
-- error);
-+ tracker_sparql_connection_update (connection, update->str, cancellable, error);
-
- g_string_free (update, TRUE);
-
-@@ -351,9 +343,7 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
- mail_uri, email,
- mail_uri, fullname);
-
-- insert_res =
-- tracker_sparql_connection_update_blank (connection, insert->str,
-- G_PRIORITY_DEFAULT, cancellable, error);
-+ insert_res = tracker_sparql_connection_update_blank (connection, insert->str, cancellable, error);
-
- g_string_free (insert, TRUE);
-
-@@ -450,7 +440,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
- model);
-
- local_error = NULL;
-- tracker_sparql_connection_update (connection, insert, G_PRIORITY_DEFAULT, cancellable, &local_error);
-+ tracker_sparql_connection_update (connection, insert, cancellable, &local_error);
- if (local_error != NULL)
- {
- g_propagate_error (error, local_error);
---
-GitLab
-
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
deleted file mode 100644
index a9b2f37d69a5..000000000000
--- a/srcpkgs/gnome-online-miners/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'gnome-online-miners'
-pkgname=gnome-online-miners
-version=3.34.0
-revision=3
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel autoconf
- automake libtool autoconf-archive"
-makedepends="libzapojit-devel libgdata-devel grilo-devel
- tracker3-devel gfbgraph-devel gnome-online-accounts-devel"
-depends="libzapojit>=0.0.3_3"
-short_desc="GNOME service that crawls through your online content"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
-lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 574d278136fb..97361ca5056f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -114,6 +114,7 @@ replaces="
gnome-documents<=3.34.0_2
gnome-games<=40.0_1
gnome-getting-started-docs<=3.38.1_1
+ gnome-online-miners<=3.34.0_3
gnome-shell-mousewheel-zoom<=0.8.0_2
gnome-twitch<=0.4.2_1
go-gdm<=1.4_7
From 2241265cb09c9a8a407857f46e576e8b33d2e5e5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:03:56 +0200
Subject: [PATCH 172/343] gnome-core: remove gnome-online-miners
gnome-online-miners is a removed package
---
srcpkgs/gnome-core/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 1cee451d1e65..d4a852d1ea88 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=42.0
-revision=1
+revision=2
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -33,7 +33,6 @@ depends="
gnome-initial-setup>=${version}
gnome-keyring>=40.0
gnome-online-accounts>=3.44.0
- gnome-online-miners>=3.34.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
From 42cc8850c4633ab4ee706923e25042a58f0fe5e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:45:54 +0200
Subject: [PATCH 173/343] empathy: remove package
* uses libsoup2, archived upstream
---
srcpkgs/empathy/files/README.voidlinux | 6 --
srcpkgs/empathy/patches/enchant-2.patch | 79 -------------------------
srcpkgs/empathy/template | 39 ------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 124 deletions(-)
delete mode 100644 srcpkgs/empathy/files/README.voidlinux
delete mode 100644 srcpkgs/empathy/patches/enchant-2.patch
delete mode 100644 srcpkgs/empathy/template
diff --git a/srcpkgs/empathy/files/README.voidlinux b/srcpkgs/empathy/files/README.voidlinux
deleted file mode 100644
index 090705a4075f..000000000000
--- a/srcpkgs/empathy/files/README.voidlinux
+++ /dev/null
@@ -1,6 +0,0 @@
-Some optional packages must be installed for additional functionality:
-
- - telepathy-gabble for XMPP/jabber support
- - telepathy-haze for libpurple support
- - telepathy-idle for IRC support
- - telepathy-salut for link-local XMPP support
diff --git a/srcpkgs/empathy/patches/enchant-2.patch b/srcpkgs/empathy/patches/enchant-2.patch
deleted file mode 100644
index c2b3a50c038f..000000000000
--- a/srcpkgs/empathy/patches/enchant-2.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Source: https://gitlab.gnome.org/GNOME/empathy/-/merge_requests/3
-Upstream: no, because upstream is completely abandoned
-
-From f42c415154c797a1b3fbddde60ad8fedb2eda988 Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Tue, 7 Jan 2020 11:09:26 +0100
-Subject: [PATCH 1/2] libempathy-gtk: Stop using deprecated enchant function
-
-Replace enchant_dict_add_to_pwl() by enchant_dict_add() and bump minimal
-version accordingly
----
- configure.ac | 2 +-
- libempathy-gtk/empathy-spell.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7aeb6b31c..4bf2d4d0c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0
- GOA_REQUIRED=3.5.1
-
- # Optional deps
--ENCHANT_REQUIRED=1.2.0
-+ENCHANT_REQUIRED=1.4.0
- GEOCLUE_REQUIRED=2.1.0
- GEOCODE_GLIB_REQUIRED=0.99.1
- ISO_CODES_REQUIRED=0.35
-diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
-index 27f27f902..bb0159fd8 100644
---- a/libempathy-gtk/empathy-spell.c
-+++ b/libempathy-gtk/empathy-spell.c
-@@ -424,7 +424,7 @@ empathy_spell_add_to_dictionary (const gchar *code,
- if (lang == NULL)
- return;
-
-- enchant_dict_add_to_pwl (lang->speller, word, strlen (word));
-+ enchant_dict_add (lang->speller, word, strlen (word));
- }
-
- #else /* not HAVE_ENCHANT */
---
-GitLab
-
-
-From 6c12a411274acf86e494b36704abb8e18b56642e Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Tue, 7 Jan 2020 11:38:13 +0100
-Subject: [PATCH 2/2] configure.ac: Switch to enchant-2
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4bf2d4d0c..14f83c852 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0
- GOA_REQUIRED=3.5.1
-
- # Optional deps
--ENCHANT_REQUIRED=1.4.0
-+ENCHANT_REQUIRED=2.1.1
- GEOCLUE_REQUIRED=2.1.0
- GEOCODE_GLIB_REQUIRED=0.99.1
- ISO_CODES_REQUIRED=0.35
-@@ -307,7 +307,7 @@ AC_ARG_ENABLE(spell,
- if test "x$enable_spell" != "xno"; then
- PKG_CHECK_MODULES(ENCHANT,
- [
-- enchant >= $ENCHANT_REQUIRED,
-+ enchant-2 >= $ENCHANT_REQUIRED,
- iso-codes >= $ISO_CODES_REQUIRED
- ], have_enchant="yes", have_enchant="no")
-
---
-GitLab
-
diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
deleted file mode 100644
index 34319aa881c6..000000000000
--- a/srcpkgs/empathy/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'empathy'
-pkgname=empathy
-version=3.12.14
-revision=4
-build_style=gnu-configure
-configure_args="
- --enable-gst-1.0=yes --enable-gudev=yes --enable-spell=yes
- --disable-schemas-compile --disable-static --enable-goa=no
- --enable-ubuntu-online-accounts=no --enable-geocode=yes
- --enable-location=yes --enable-nautilus-sendto=no --enable-map=yes"
-hostmakedepends="pkg-config intltool itstool glib-devel libxslt geoclue2
- autoconf automake libtool gettext-devel yelp-tools"
-makedepends="
- libcanberra-devel clutter-gst-devel clutter-gtk-devel
- telepathy-glib-devel telepathy-logger-devel libnotify-devel
- telepathy-farstream-devel telepathy-mission-control-devel
- evolution-data-server-devel geocode-glib-devel folks-devel
- webkit2gtk-devel libgudev-devel pulseaudio-devel cheese-devel
- enchant2-devel NetworkManager-devel libchamplain-devel
- gnutls-devel gsettings-desktop-schemas-devel geoclue2-devel iso-codes"
-depends="gsettings-desktop-schemas>=3.12 iso-codes"
-short_desc="GNOME instant messaging client using the Telepathy framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://live.gnome.org/Empathy"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3
-disable_parallel_build=yes
-# Disable checks, the only work with an irc server in place.
-make_check=no
-
-pre_configure() {
- CFLAGS+=" -I$wrksrc/telepathy-account-widgets"
- autoreconf -fi
-}
-
-post_install() {
- vdoc $FILESDIR/README.voidlinux
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 97361ca5056f..edbc0bb83a78 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -85,6 +85,7 @@ replaces="
electron7<=7.3.3_1
electron9<=9.4.1_1
emacs-gtk2<=27.2_1
+ empathy<=3.12.14_4
enventor<=1.0.0_2
epstopdf<=2.27_3
flickcurl-devel<=1.26_4
From 168c05347962cdd0798abe017249c74fe733c62e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:47:19 +0200
Subject: [PATCH 174/343] FeedReader: remove package
* uses libsoup2, archived upstream
---
.../files/fix-FeedServerMain_vala.patch | 23 ----------------
srcpkgs/FeedReader/template | 26 -------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 49 deletions(-)
delete mode 100644 srcpkgs/FeedReader/files/fix-FeedServerMain_vala.patch
delete mode 100644 srcpkgs/FeedReader/template
diff --git a/srcpkgs/FeedReader/files/fix-FeedServerMain_vala.patch b/srcpkgs/FeedReader/files/fix-FeedServerMain_vala.patch
deleted file mode 100644
index b73903affbb2..000000000000
--- a/srcpkgs/FeedReader/files/fix-FeedServerMain_vala.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: In musl libc stdin, stdout, and stderr are FILE const*
-
-The unreadCount option may print intialization messages before the
-number of unread articles. This _may_ break existing apps relying
-on the output being just one number, while I know of no such app.
-If someone knows how to temporarily disable stdout with musl libc
-please modify this patch and move it to ../patches.
-
---- src/FeedReaderMain.vala 2019-07-13 21:09:05.000000000 +0200
-+++ src/FeedReaderMain.vala 2020-04-14 01:26:11.436124423 +0200
-@@ -98,10 +98,7 @@
-
- if(unreadCount)
- {
-- var old_stdout =(owned)stdout;
-- stdout = FileStream.open("/dev/null", "w");
- Logger.init(verbose);
-- stdout =(owned)old_stdout;
- stdout.printf("%u\n", DataBase.readOnly().get_unread_total());
- return 0;
- }
diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template
deleted file mode 100644
index ab71a0c6f042..000000000000
--- a/srcpkgs/FeedReader/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'FeedReader'
-pkgname=FeedReader
-version=2.11.0
-revision=2
-build_style=meson
-hostmakedepends="glib-devel intltool itstool pkg-config vala"
-makedepends="gnome-online-accounts-devel gst-plugins-base1-devel json-glib-devel
- libcurl-devel libgee08-devel libnotify-devel libpeas-devel libsecret-devel
- rest-devel vala-devel webkit2gtk-devel gumbo-parser-devel libsoup-devel"
-short_desc="Modern desktop RSS desktop client"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-only"
-homepage="https://jangernert.github.io/FeedReader/"
-distfiles="https://github.com/jangernert/${pkgname}/archive/v${version}.tar.gz"
-checksum=9f679cc08e5673e9e90541b0a0c4066990deacddfe2692f6611799d99bdf5b3e
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- makedepends+=" libexecinfo-devel"
- LDFLAGS+=" -lexecinfo"
-fi
-
-pre_configure() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- patch -Np0 -i ${FILESDIR}/fix-FeedServerMain_vala.patch
- fi
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index edbc0bb83a78..02b43cdad8b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -9,6 +9,7 @@ license="Public Domain"
homepage="https://voidlinux.org"
replaces="
+ FeedReader<=2.11.0_2
ImageMagick6<=6.9.12.12_2
MoinMoin<=1.9.11_1
MultiMC<=0.6.13_1
From a5134e4535118d5af04e947976a692c89bbd5021 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:42:51 +0200
Subject: [PATCH 175/343] vte3: update to 0.70.0, build gtk4 library
---
common/shlibs | 1 +
srcpkgs/vte3-gtk4 | 1 +
srcpkgs/vte3-gtk4-devel | 1 +
srcpkgs/vte3/template | 47 ++++++++++++++++++++++++++++++-----------
4 files changed, 38 insertions(+), 12 deletions(-)
create mode 120000 srcpkgs/vte3-gtk4
create mode 120000 srcpkgs/vte3-gtk4-devel
diff --git a/common/shlibs b/common/shlibs
index 33311eb0fed8..0c8349894019 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -823,6 +823,7 @@ libXevie.so.1 libXevie-1.0.2_1
libatspi.so.0 at-spi2-core-1.91.91_1
libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
libvte-2.91.so.0 vte3-0.68.0_1
+libvte-2.91-gtk4.so.0 vte3-gtk4-0.70.0_1
libpipeline.so.1 libpipeline-1.2.0_1
libosp.so.5 opensp-1.5.2_1
libogrove.so.0 openjade-1.3.2_1
diff --git a/srcpkgs/vte3-gtk4 b/srcpkgs/vte3-gtk4
new file mode 120000
index 000000000000..30ca3abb8773
--- /dev/null
+++ b/srcpkgs/vte3-gtk4
@@ -0,0 +1 @@
+vte3
\ No newline at end of file
diff --git a/srcpkgs/vte3-gtk4-devel b/srcpkgs/vte3-gtk4-devel
new file mode 120000
index 000000000000..30ca3abb8773
--- /dev/null
+++ b/srcpkgs/vte3-gtk4-devel
@@ -0,0 +1 @@
+vte3
\ No newline at end of file
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index aaaa69bfe51f..4d3bda10c502 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,21 +1,21 @@
# Template file for 'vte3'
pkgname=vte3
-version=0.68.0
-revision=2
+version=0.70.0
+revision=1
wrksrc="vte-${version}"
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
- $(vopt_bool gir gir) $(vopt_bool gir vapi)"
-hostmakedepends="glib-devel gperf intltool pkg-config
+ $(vopt_bool gir gir) $(vopt_bool gir vapi) -Dgtk4=true"
+hostmakedepends="glib-devel gperf gettext pkg-config
$(vopt_if gir vala)"
-makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if gir vala-devel)"
+makedepends="gnutls-devel gtk4-devel gtk+3-devel pcre2-devel $(vopt_if gir vala-devel)"
short_desc="Terminal widget with improved accessibility and I18N support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749
+checksum=93e0dd4a1bc2a7a1a62da64160a274cce456976ea1567d98591da96e2d265ae6
# Suppress warnings as errors for NULL format strings (musl libc)
CXXFLAGS="-Wno-error=format="
@@ -28,16 +28,39 @@ pre_build() {
export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/.libs"
}
+vte3-gtk4_package() {
+ short_desc+=" - GTK4 version"
+ pkg_install() {
+ vmove usr/bin/vte-2.91-gtk4
+ vmove usr/lib/libvte-2.91-gtk4.so.0
+ vmove usr/lib/girepository-1.0/Vte-3.91.typelib
+ }
+}
+
vte3-devel_package() {
- depends="gnutls-devel gtk+3-devel pcre2-devel vte3>=${version}_${revision}"
+ depends="libglib-devel gtk+3-devel pango-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/vte-2.91
+ vmove usr/lib/pkgconfig/vte-2.91.pc
+ vmove usr/lib/libvte-2.91.so
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/Vte-2.91.gir
+ vmove "usr/share/vala/vapi/vte-2.91.*"
+ fi
+ }
+}
+
+vte3-gtk4-devel_package() {
+ depends="libglib-devel gtk4-devel pango-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
+ vmove usr/include/vte-2.91-gtk4
+ vmove usr/lib/libvte-2.91-gtk4.so
+ vmove usr/lib/pkgconfig/vte-2.91-gtk4.pc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- vmove usr/share/vala
+ vmove usr/share/gir-1.0/Vte-3.91.gir
+ vmove "usr/share/vala/vapi/vte-2.91-gtk4.*"
fi
}
}
From 04a0d31e48194a35ab7aa74587d4628af17b9648 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:54:30 +0200
Subject: [PATCH 176/343] gnome: remove gnome-recipes from -apps
gnome-recipes is not regularly maintained and doesn't might be removed soon
because of incompatibility with modern versions of libraries like libsoup 3
and rest 1.0.
---
srcpkgs/gnome/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 85bb43724dd9..72507f88501e 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
version=42.0
-revision=4
+revision=5
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -61,7 +61,6 @@ _apps_depends="
gnome-music>=${version}
gnome-nettool>=${version}
gnome-photos>=${version}
- gnome-recipes>=2.0.4
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
gnome-system-monitor>=${version}
From 59a35fff1d77dbe706147007f023d58c2b47d6df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 12:50:36 +0200
Subject: [PATCH 177/343] CPU-X: disable tests, don't break base-chroot
---
srcpkgs/CPU-X/template | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 36246fc521f9..2b0ff13ff4b4 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -8,7 +8,6 @@ hostmakedepends="pkg-config nasm"
makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
glfw-devel ocl-icd-devel procps-ng-devel libstatgrab
$(vopt_if gtk3 gtk+3-devel)"
-checkdepends="mawk nawk grep"
short_desc="Free software that gathers information on CPU, motherboard and more"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-3.0-or-later"
@@ -18,15 +17,11 @@ distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433
build_options="gtk3"
build_options_default="gtk3"
+# needs grep -P which is not available in chroot-grep and replacing it with
+# grep breaks base-chroot
+make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LDFLAGS="-lexecinfo"
fi
-
-# Tests depend on the -P flag of grep, which is not available in chroot-grep
-# and installing grep as checkdepends breaks base-chroot.
-# So, only run tests in CI, where the masterdir is ephemeral anyway.
-if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
- make_check=no # breaks base-chroot
-fi
From c9b33a597dd99881377dd02025efe5186d7b0162 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 15:45:27 +0200
Subject: [PATCH 178/343] appstream-glib: update to 0.8.1.
---
...d-archive_entry_h-order-on-client-as-util.patch | 14 --------------
...ntry_h-order-on-libappstream-glib-as-util.patch | 14 --------------
srcpkgs/appstream-glib/template | 12 ++++++------
3 files changed, 6 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
delete mode 100644 srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
diff --git a/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch b/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
deleted file mode 100644
index 90d85364681d..000000000000
--- a/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-They are in the wrong order.
-
---- a/client/as-util.c
-+++ b/client/as-util.c
-@@ -27,8 +27,8 @@
- #include <gio/gio.h>
-
- #include <appstream-glib.h>
--#include <archive_entry.h>
- #include <archive.h>
-+#include <archive_entry.h>
- #include <libsoup/soup.h>
- #include <locale.h>
- #include <stdlib.h>
diff --git a/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch b/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
deleted file mode 100644
index 2502048d75ac..000000000000
--- a/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-They are in the wrong order.
-
---- a/libappstream-glib/as-utils.c
-+++ b/libappstream-glib/as-utils.c
-@@ -34,8 +34,8 @@
-
- #include <fnmatch.h>
- #include <string.h>
--#include <archive_entry.h>
- #include <archive.h>
-+#include <archive_entry.h>
- #include <libsoup/soup.h>
- #include <stdlib.h>
- #include <uuid.h>
diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template
index 5eaf493d53f6..ef5baf1afdf9 100644
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@@ -1,6 +1,6 @@
# Template file for 'appstream-glib'
pkgname=appstream-glib
-version=0.7.18
+version=0.8.1
revision=1
build_style=meson
build_helper="gir"
@@ -8,25 +8,25 @@ configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false
-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gcab gperf pkg-config glib-devel"
makedepends="gcab-devel gtk+3-devel json-glib-devel libarchive-devel
- libsoup-devel libyaml-devel"
+ libcurl-devel libyaml-devel"
short_desc="Install and update applications"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://people.freedesktop.org/~hughsient/appstream-glib/"
changelog="https://raw.githubusercontent.com/hughsie/appstream-glib/master/NEWS"
-distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002
+distfiles="https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-${version}.tar.xz"
+checksum=68a3d007f5b3aa84592dbef07950d9acf327da97ec8a6e88a90575d9055ddf6d
build_options="gir"
build_options_default="gir"
post_install() {
- rm -rf -- "${DESTDIR}"/usr/share/installed-tests
+ rm -r "${DESTDIR}"/usr/share/installed-tests
}
appstream-glib-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gcab-devel gdk-pixbuf-devel
- libarchive-devel libsoup-devel libyaml-devel"
+ libarchive-devel libcurl-devel libyaml-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 9cba3b8007f4406d82d845486d02b67a6b725c09 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 17:51:06 +0200
Subject: [PATCH 179/343] budgie-control-center: update to 1.1.1.
---
srcpkgs/budgie-control-center/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index 416cbf8d584b..d39469cc2ef4 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
-version=1.0.1
-revision=2
+version=1.1.1
+revision=1
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
@@ -12,7 +12,7 @@ makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel
polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel
libX11-devel libXi-devel libepoxy-devel gdk-pixbuf-devel gtk+3-devel
libglib-devel cups-devel libgudev-devel libwacom-devel libsecret-devel
- udisks2-devel gsound-devel libsoup-devel gcr-devel cheese-devel"
+ udisks2-devel gsound-devel gnutls-devel gcr-devel cheese-devel"
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
short_desc="Budgie Control Center"
@@ -20,11 +20,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/BuddiesOfBudgie/budgie-control-center"
distfiles="https://github.com/BuddiesOfBudgie/budgie-control-center/releases/download/v${version}/budgie-control-center-${version}.tar.xz"
-checksum=6c049d02600f6650238b4376a7eac77d8fcd786e9c603c4e4ec87cad0022028a
+checksum=0a0f27cee3e5a33f17e6b34ad698b4a54fe8ef7c1d215a0aa9a07431722ac963
budgie-control-center-devel_package() {
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/share/pkgconfig
- }
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - transitional package"
+ build_style=meta
}
From 3988af8ee955494f886a188d4fc16029df5459ab Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Oct 2022 16:56:03 +0200
Subject: [PATCH 180/343] dbus: update to 1.14.2.
---
srcpkgs/dbus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aa6b118f52ae..6c3d3494bee0 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
# Template file for 'dbus'
# NOTE: keep this pkg synchronized with dbus-elogind
pkgname=dbus
-version=1.14.0
+version=1.14.2
revision=1
build_style=gnu-configure
configure_args="--disable-selinux --enable-inotify --with-dbus-user=dbus
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+checksum=07351839a36b3c833b3afe405c4420e7ee367f2ecf57c7ac3633e53110d799fa
python_version=3
conf_files="/etc/dbus-1/*.conf"
From 60a25563a2c5b28c58360a9644ba14b1178dfda7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Oct 2022 16:56:09 +0200
Subject: [PATCH 181/343] dbus-elogind: update to 1.14.2.
---
srcpkgs/dbus-elogind/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbus-elogind/template b/srcpkgs/dbus-elogind/template
index 61a6040d200d..fc7e1c8ed822 100644
--- a/srcpkgs/dbus-elogind/template
+++ b/srcpkgs/dbus-elogind/template
@@ -1,7 +1,7 @@
# Template file for 'dbus-elogind'
# NOTE: keep this pkg synchronized with dbus
pkgname=dbus-elogind
-version=1.14.0
+version=1.14.2
revision=1
wrksrc="dbus-${version}"
build_style=gnu-configure
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+checksum=07351839a36b3c833b3afe405c4420e7ee367f2ecf57c7ac3633e53110d799fa
conf_files="/etc/dbus-1/*.conf"
replaces="dbus>=0"
provides="dbus-${version}_${revision}"
From 9f2f2941484088fc52db72524095ef8347e0a8ef Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Oct 2022 22:15:54 +0200
Subject: [PATCH 182/343] libabigail: update to 2.1.
---
common/shlibs | 2 +-
srcpkgs/libabigail/template | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0c8349894019..987cff25f146 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2655,7 +2655,7 @@ libcmark.so.0 cmark-0.24.1_1
libspotify.so.12 libspotify-12.1.51_1
libvidstab.so.1.1 libvidstab-1.1.0_1
libxdo.so.3 xdotool-3.20150503.1_1
-libabigail.so.0 libabigail-1.0.rc3_1
+libabigail.so.1 libabigail-2.1_1
libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
libKDevCMakeCommon.so.36 kdevelop-22.04.1_1
libKDevClangPrivate.so.36 kdevelop-22.04.1_1
diff --git a/srcpkgs/libabigail/template b/srcpkgs/libabigail/template
index 502a5a2dc3e9..89f535e35302 100644
--- a/srcpkgs/libabigail/template
+++ b/srcpkgs/libabigail/template
@@ -1,6 +1,6 @@
# Template file for 'libabigail'
pkgname=libabigail
-version=2.0
+version=2.1
revision=1
build_style=gnu-configure
configure_args="--enable-cxx11=yes"
@@ -11,10 +11,13 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-3.0-or-later"
homepage="https://www.sourceware.org/libabigail/"
distfiles="http://mirrors.kernel.org/sourceware/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3704ae97a56bf076ca08fb5dea6b21db998fbbf14c4f9de12824b78db53b6fda
+checksum=4a6297d41d15d1936256117116bd61296e6b9bee23d54a0caf8d3f5ab8ddcc4c
case "$XBPS_TARGET_MACHINE" in
- *-musl) makedepends+=" musl-fts-devel"; LDFLAGS="-lfts" ;;
+*-musl)
+ makedepends+=" musl-fts-devel"
+ export FTS_CFLAGS=" " FTS_LIBS="-lfts"
+ ;;
esac
pre_configure() {
From f643570af2edffb822ad7e6ebed5b7b28f26765b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Oct 2022 22:46:55 +0200
Subject: [PATCH 183/343] stress-ng: update to 0.14.06.
---
.../patches/disable-linux52-syscalls.patch | 53 -------------------
srcpkgs/stress-ng/patches/ppc32.patch | 20 -------
srcpkgs/stress-ng/template | 9 ++--
3 files changed, 5 insertions(+), 77 deletions(-)
delete mode 100644 srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
delete mode 100644 srcpkgs/stress-ng/patches/ppc32.patch
diff --git a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
deleted file mode 100644
index c452e1c899fc..000000000000
--- a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-This disables usage of new Linux 5.2 system calls.
-
-This is necessary as musl has picked up the syscall numbers for these in its
-most recent release, but our kernel-libc-headers is still 4.19, which breaks
-build.
-
-Glibc is fine because it uses syscall numbers from these kernel headers
-instead of defining its own.
-
---- a/core-shim.c
-+++ b/core-shim.c
-@@ -24,6 +24,19 @@
- */
- #include "stress-ng.h"
-
-+#ifdef __NR_fsopen
-+#undef __NR_fsopen
-+#endif
-+#ifdef __NR_fsmount
-+#undef __NR_fsmount
-+#endif
-+#ifdef __NR_fsconfig
-+#undef __NR_fsconfig
-+#endif
-+#ifdef __NR_move_mount
-+#undef __NR_move_mount
-+#endif
-+
- /*
- * Various shim abstraction wrappers around systems calls and
- * GCC helper functions that may not be supported by some
---- a/stress-ramfs.c
-+++ b/stress-ramfs.c
-@@ -24,6 +24,19 @@
- */
- #include "stress-ng.h"
-
-+#ifdef __NR_fsopen
-+#undef __NR_fsopen
-+#endif
-+#ifdef __NR_fsmount
-+#undef __NR_fsmount
-+#endif
-+#ifdef __NR_fsconfig
-+#undef __NR_fsconfig
-+#endif
-+#ifdef __NR_move_mount
-+#undef __NR_move_mount
-+#endif
-+
- static const stress_help_t help[] = {
- { NULL, "ramfs N", "start N workers exercising ramfs mounts" },
- { NULL, "ramfs-ops N", "stop after N bogo ramfs mount operations" },
diff --git a/srcpkgs/stress-ng/patches/ppc32.patch b/srcpkgs/stress-ng/patches/ppc32.patch
deleted file mode 100644
index 6c38b5cca320..000000000000
--- a/srcpkgs/stress-ng/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 142c4e0a4e9d85c5d32faf0479b086ee4381502b
-Author: q66 <daniel@octaforge.org>
-Date: Fri Sep 16 11:48:52 2022 +0000
-
- fix build on ppc32
-
- stress-regs.c:120:2: error: void value not ignored as it ought to be
-
-diff --git a/stress-regs.c b/stress-regs.c
-index 1ba97a8..63bf3ed 100644
---- a/stress-regs.c
-+++ b/stress-regs.c
-@@ -117,7 +117,6 @@ static void regs_check128(
- do { \
- (void)args; \
- (void)reg; \
-- (void)expected; \
- (void)value; \
- } while (0)
- #endif
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 91e296110114..f99b9d75d9ef 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,7 +1,7 @@
# Template file for 'stress-ng'
pkgname=stress-ng
-version=0.14.05
-revision=3
+version=0.14.06
+revision=1
build_style=gnu-makefile
make_use_env=1
short_desc="Load and stress a computer system"
@@ -9,8 +9,9 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/ColinIanKing/stress-ng/"
distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=2ee20333d306037cf44f4e8d038bc6253106dcb54f37ee548e9adfd94a6a391c
+checksum=54f6c3f84b20efedafd3394ec168e53632a685cfdd76f24270653e898d9ede08
case "$XBPS_MACHINE" in
- x86_64) nodebug=yes ;;
+ # stress-vecshuf.c:107:39: internal compiler error: in expand_debug_locations, at cfgexpand.c:5458
+ x86_64) nodebug=yes;;
esac
From 9a192a1ab8efe004768290ce99e6651ccbc4f298 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 Oct 2022 22:48:23 +0200
Subject: [PATCH 184/343] perl-Exporter-Tiny: update to 1.004003.
---
srcpkgs/perl-Exporter-Tiny/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Exporter-Tiny/template b/srcpkgs/perl-Exporter-Tiny/template
index 4b49e273ab7e..2b8dd8264faa 100644
--- a/srcpkgs/perl-Exporter-Tiny/template
+++ b/srcpkgs/perl-Exporter-Tiny/template
@@ -1,15 +1,16 @@
# Template file for 'perl-Exporter-Tiny'
pkgname=perl-Exporter-Tiny
-version=1.004002
+version=1.004003
revision=1
wrksrc="Exporter-Tiny-${version}"
build_style=perl-module
hostmakedepends="perl"
makedepends="perl"
depends="perl"
+checkdepends="perl-Test-Fatal perl-Test-Warnings"
short_desc="Exporter::Tiny - an exporter with the features of Sub::Exporter"
maintainer="Leah Neukirchen <leah@vuxu.org>"
homepage="https://metacpan.org/release/Exporter-Tiny"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
distfiles="${CPAN_SITE}/Exporter/Exporter-Tiny-${version}.tar.gz"
-checksum=0d53898ad60e1b7dc28aeee198c4b6f454f71adefff120f016037e4974395574
+checksum=7c6852f18367af05f03912f007a1fac318471a870a457f0e502c11adcf9a457b
From d40aa1558a7f78bd9db4f92bb53dd1b8c5a0a7f0 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sat, 1 Oct 2022 19:15:39 +1000
Subject: [PATCH 185/343] xwinwrap: update checksum
---
srcpkgs/xwinwrap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xwinwrap/template b/srcpkgs/xwinwrap/template
index 7dbffb515f54..3846b0f0150b 100644
--- a/srcpkgs/xwinwrap/template
+++ b/srcpkgs/xwinwrap/template
@@ -9,7 +9,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://github.com/mmhobi7/xwinwrap"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0e840586deaf6780d426dc49f7a344366198aead96535cc1eb2ac7ce366777df
+checksum=1792f59c5d85fc766f356f8f903a2081fe4dccc5e8e61cdd946bae0438d15d9a
pre_install() {
vsed -i Makefile -e 's|/local||'
From e59d968be0dfb6fd09415a7521e7ce60bf55a88f Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sat, 1 Oct 2022 19:49:28 +1000
Subject: [PATCH 186/343] tidy5: update checksum
---
srcpkgs/tidy5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tidy5/template b/srcpkgs/tidy5/template
index d6a894937399..6fd09bc344ec 100644
--- a/srcpkgs/tidy5/template
+++ b/srcpkgs/tidy5/template
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="W3C"
homepage="http://www.htacg.org/tidy-html5/"
distfiles="https://github.com/htacg/tidy-html5/archive/${version}.tar.gz"
-checksum=2fc78c4369cde9a80f4ae3961880bd003ac31e8b160f6b9422645bab3be5a6cf
+checksum=59c86d5b2e452f63c5cdb29c866a12a4c55b1741d7025cf2f3ce0cde99b0660e
provides="tidy-${version}_${revision}"
replaces="tidy>0"
From 0e372ea10cb195fff3bad705c20d5dc6f32ab76f Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 19:58:31 +0200
Subject: [PATCH 187/343] alacritty: generate terminfo when building
This commit also fixes a xlint warning about including the specific
version of autocfg in cargo update.
---
srcpkgs/alacritty/alacritty-terminfo.INSTALL | 6 ------
srcpkgs/alacritty/alacritty-terminfo.REMOVE | 7 -------
srcpkgs/alacritty/template | 5 ++---
3 files changed, 2 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/alacritty/alacritty-terminfo.INSTALL
delete mode 100644 srcpkgs/alacritty/alacritty-terminfo.REMOVE
diff --git a/srcpkgs/alacritty/alacritty-terminfo.INSTALL b/srcpkgs/alacritty/alacritty-terminfo.INSTALL
deleted file mode 100644
index 71e122147942..000000000000
--- a/srcpkgs/alacritty/alacritty-terminfo.INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-post)
- # Compile the terminfo description.
- tic -xe alacritty,alacritty-direct usr/share/terminfo/a/alacritty.info
- ;;
-esac
diff --git a/srcpkgs/alacritty/alacritty-terminfo.REMOVE b/srcpkgs/alacritty/alacritty-terminfo.REMOVE
deleted file mode 100644
index 572df4e79ba9..000000000000
--- a/srcpkgs/alacritty/alacritty-terminfo.REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$ACTION" in
-pre)
- # Remove compiled terminfo files.
- rm -f usr/share/terminfo/a/alacritty
- rm -f usr/share/terminfo/a/alacritty-direct
- ;;
-esac
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 354614c35545..9e6180a05a6d 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -17,7 +17,7 @@ checksum=e48d4b10762c2707bb17fd8f89bd98f0dcccc450d223cade706fdd9cfaefb308
post_patch() {
# fixes an indexmap error when cross compiling
- cargo update --package autocfg --precise 1.1.0
+ cargo update --package autocfg:1.0.1 --precise 1.1.0
}
case "$XBPS_TARGET_MACHINE" in
@@ -31,14 +31,13 @@ post_install() {
vinstall ../extra/completions/alacritty.bash 644 usr/share/bash-completion/completions alacritty
vinstall ../extra/completions/_alacritty 644 usr/share/zsh/site-functions
vinstall ../extra/completions/alacritty.fish 644 usr/share/fish/vendor_completions.d
- vinstall ../extra/alacritty.info 644 usr/share/terminfo/a
+ tic -o ${DESTDIR}/usr/share/terminfo -xe alacritty,alacritty-direct ../extra/alacritty.info
vman ../extra/alacritty.man alacritty.1
vsconf ../alacritty.yml
}
alacritty-terminfo_package() {
short_desc+=" - terminfo data"
- depends="ncurses"
pkg_install() {
vmove usr/share/terminfo
}
From c24301c1722bbf74ae329dfa542c3808b1096ba1 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 10:56:03 +0200
Subject: [PATCH 188/343] dvtm: generate terminfo when building & simplify
Generating terminfo in INSTALL is unnecessary and leaves .info file in
/usr/share/terminfo which can confuse some programs.
Dvtm now also uses proper build_style=gnu_makefile instead of calling
make explicitly.
---
srcpkgs/dvtm/INSTALL | 6 ------
srcpkgs/dvtm/REMOVE | 7 -------
srcpkgs/dvtm/template | 15 +++++----------
3 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/dvtm/INSTALL
delete mode 100644 srcpkgs/dvtm/REMOVE
diff --git a/srcpkgs/dvtm/INSTALL b/srcpkgs/dvtm/INSTALL
deleted file mode 100644
index 61fb79d9537d..000000000000
--- a/srcpkgs/dvtm/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-post)
- # Compile the terminfo description.
- tic -s usr/share/terminfo/d/dvtm.info
- ;;
-esac
diff --git a/srcpkgs/dvtm/REMOVE b/srcpkgs/dvtm/REMOVE
deleted file mode 100644
index 7ea17f65f6c1..000000000000
--- a/srcpkgs/dvtm/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case "$ACTION" in
-pre)
- # Remove compiled terminfo files.
- rm -f usr/share/terminfo/d/dvtm-256color
- rm -f usr/share/terminfo/d/dvtm
- ;;
-esac
diff --git a/srcpkgs/dvtm/template b/srcpkgs/dvtm/template
index a65c17c2d9c2..e16b36bd8677 100644
--- a/srcpkgs/dvtm/template
+++ b/srcpkgs/dvtm/template
@@ -1,9 +1,11 @@
# Template file for 'dvtm'
pkgname=dvtm
version=0.15
-revision=2
+revision=3
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="ncurses"
makedepends="ncurses-devel"
-depends="ncurses" # needs tic at post-install
short_desc="Tiling window manager for the console"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
@@ -11,13 +13,6 @@ homepage="http://www.brain-dump.org/projects/dvtm/"
distfiles="http://www.brain-dump.org/projects/dvtm/$pkgname-$version.tar.gz"
checksum=8f2015c05e2ad82f12ae4cf12b363d34f527a4bbc8c369667f239e4542e1e510
-do_build() {
- # Do not run tic, useless in build environment.
- sed -i 's,tic,/bin/true,g' Makefile
- make CC=$CC V=1
-}
-do_install() {
- make PREFIX=/usr DESTDIR=${DESTDIR} install
+post_install() {
vlicense LICENSE
- vinstall dvtm.info 644 usr/share/terminfo/d
}
From cf33a8664542e97575e4339064a33c717eb372b4 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:33:12 +0200
Subject: [PATCH 189/343] mtm: generate terminfo when building
This commit also removes build_style=gnu-makefile because do_build() and
do_install() are defined anyway.
---
srcpkgs/mtm/mtm-terminfo.INSTALL | 5 -----
srcpkgs/mtm/mtm-terminfo.REMOVE | 7 -------
srcpkgs/mtm/template | 9 ++++-----
3 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/mtm/mtm-terminfo.INSTALL
delete mode 100644 srcpkgs/mtm/mtm-terminfo.REMOVE
diff --git a/srcpkgs/mtm/mtm-terminfo.INSTALL b/srcpkgs/mtm/mtm-terminfo.INSTALL
deleted file mode 100644
index 4c2d03b145ca..000000000000
--- a/srcpkgs/mtm/mtm-terminfo.INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-post)
- tic -sx usr/share/terminfo/m/mtm.ti
- ;;
-esac
diff --git a/srcpkgs/mtm/mtm-terminfo.REMOVE b/srcpkgs/mtm/mtm-terminfo.REMOVE
deleted file mode 100644
index 767b67b2bee4..000000000000
--- a/srcpkgs/mtm/mtm-terminfo.REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-case "${ACTION}" in
-pre)
- rm usr/share/terminfo/m/mtm
- rm usr/share/terminfo/m/mtm-256color
- rm usr/share/terminfo/m/mtm-noutf
- ;;
-esac
diff --git a/srcpkgs/mtm/template b/srcpkgs/mtm/template
index a6cfd2c104ce..599fa463410d 100644
--- a/srcpkgs/mtm/template
+++ b/srcpkgs/mtm/template
@@ -1,10 +1,9 @@
# Template file for 'mtm'
pkgname=mtm
version=1.2.0
-revision=3
-build_style=gnu-makefile
+revision=4
+hostmakedepends="ncurses"
makedepends="ncurses-devel ncurses-libs"
-depends="ncurses"
short_desc="Micro Terminal Multiplexer"
maintainer="travankor <travankor@tuta.io>"
license="GPL-3.0-or-later"
@@ -18,13 +17,13 @@ do_build() {
do_install() {
vbin mtm
- vinstall mtm.ti 644 usr/share/terminfo/m
+ mkdir -p ${DESTDIR}/usr/share/terminfo
+ tic -sx -o ${DESTDIR}/usr/share/terminfo mtm.ti
vman mtm.1
}
mtm-terminfo_package() {
short_desc+=" - terminfo data"
- depends="ncurses"
pkg_install() {
vmove usr/share/terminfo
}
From c402d797b687e4d4df0025516208f882422c60c9 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:38:59 +0200
Subject: [PATCH 190/343] rxvt-unicode: do not include .terminfo file
xrvt-unicode already compiles the terminfo descriptions so having the
raw version in /usr/share/terminfo is unnecessary.
---
srcpkgs/rxvt-unicode/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 11bc4a51a1db..6593340186ef 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -69,7 +69,6 @@ pre_install() {
}
post_install() {
- vinstall doc/etc/rxvt-unicode.terminfo 644 usr/share/terminfo/r
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps
}
From b98d534eae4d86e254e7167f2b59455c311cf279 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:50:12 +0200
Subject: [PATCH 191/343] st: generate terminfo when building & adopt
---
srcpkgs/st/st-terminfo.INSTALL | 5 -----
srcpkgs/st/st-terminfo.REMOVE | 11 -----------
srcpkgs/st/template | 13 +++++++------
3 files changed, 7 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/st/st-terminfo.INSTALL
delete mode 100644 srcpkgs/st/st-terminfo.REMOVE
diff --git a/srcpkgs/st/st-terminfo.INSTALL b/srcpkgs/st/st-terminfo.INSTALL
deleted file mode 100644
index 53bfb42d10f8..000000000000
--- a/srcpkgs/st/st-terminfo.INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-post)
- tic -sx usr/share/terminfo/s/st.terminfo
- ;;
-esac
diff --git a/srcpkgs/st/st-terminfo.REMOVE b/srcpkgs/st/st-terminfo.REMOVE
deleted file mode 100644
index ad3893f3269a..000000000000
--- a/srcpkgs/st/st-terminfo.REMOVE
+++ /dev/null
@@ -1,11 +0,0 @@
-case "${ACTION}" in
-pre)
- rm usr/share/terminfo/s/st
- rm usr/share/terminfo/s/st-bs
- rm usr/share/terminfo/s/st-bs-256color
- rm usr/share/terminfo/s/st-mono
- rm usr/share/terminfo/s/st-meta
- rm usr/share/terminfo/s/st-meta-256color
- rm usr/share/terminfo/s/st-256color
- ;;
-esac
diff --git a/srcpkgs/st/template b/srcpkgs/st/template
index 9376a0c0c983..e6d7e3beb977 100644
--- a/srcpkgs/st/template
+++ b/srcpkgs/st/template
@@ -1,14 +1,14 @@
# Template file for 'st'
pkgname=st
version=0.8.5
-revision=1
+revision=2
build_style=gnu-makefile
make_use_env=compliant
hostmakedepends="pkg-config"
makedepends="fontconfig-devel libX11-devel libXft-devel"
depends="ncurses st-terminfo-${version}_${revision}"
short_desc="Simple terminal implementation for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="meator <meator.dev@gmail.com>"
license="MIT"
homepage="https://st.suckless.org"
distfiles="https://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz"
@@ -17,19 +17,20 @@ checksum=ea6832203ed02ff74182bcb8adaa9ec454c8f989e79232cb859665e2f544ab37
pre_build() {
sed -i 's|Liberation Mono|Monospace|g' config.def.h
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
- # We will use tic after install. See INSTALL.
- vsed -i Makefile -e '/tic/d'
+ mkdir -p ${DESTDIR}/usr/share/terminfo
+}
+
+pre_install() {
+ export TERMINFO=${DESTDIR}/usr/share/terminfo
}
post_install() {
- vinstall st.info 644 usr/share/terminfo/s st.terminfo
vdoc README
vlicense LICENSE
}
st-terminfo_package() {
short_desc+=" - terminfo data"
- depends="ncurses"
pkg_install() {
vmove usr/share/terminfo
}
From bd391f6c31bcaf2555d4808fd7bb49ef74d2db68 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Thu, 21 Jul 2022 21:56:28 +0200
Subject: [PATCH 192/343] xst: generate terminfo when building & simplify
---
srcpkgs/xst/INSTALL | 5 -----
srcpkgs/xst/REMOVE | 8 --------
srcpkgs/xst/template | 8 ++------
3 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/xst/INSTALL
delete mode 100644 srcpkgs/xst/REMOVE
diff --git a/srcpkgs/xst/INSTALL b/srcpkgs/xst/INSTALL
deleted file mode 100644
index fcad0563b681..000000000000
--- a/srcpkgs/xst/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-post)
- tic -sx usr/share/terminfo/x/xst.terminfo
- ;;
-esac
diff --git a/srcpkgs/xst/REMOVE b/srcpkgs/xst/REMOVE
deleted file mode 100644
index b46f677d7fdf..000000000000
--- a/srcpkgs/xst/REMOVE
+++ /dev/null
@@ -1,8 +0,0 @@
-case "${ACTION}" in
-pre)
- rm usr/share/terminfo/x/xst
- rm usr/share/terminfo/x/xst-meta
- rm usr/share/terminfo/x/xst-meta-256color
- rm usr/share/terminfo/x/xst-256color
- ;;
-esac
diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template
index 8600c680ae36..f06dbed9b3d5 100644
--- a/srcpkgs/xst/template
+++ b/srcpkgs/xst/template
@@ -1,7 +1,7 @@
# Template file for 'xst'
pkgname=xst
version=0.8.4.1
-revision=2
+revision=3
build_style=gnu-makefile
make_use_env=compliant
hostmakedepends="pkg-config"
@@ -14,11 +14,7 @@ homepage="https://github.com/gnotclub/xst"
distfiles="https://github.com/gnotclub/xst/archive/v${version}.tar.gz"
checksum=cbeb2da6c289415d1168559c6f58b4ce47fd266edefbabc38fd59e8b7c87226d
-do_install() {
- vbin xst
- vman st.1 xst.1
-
- vinstall st.info 644 usr/share/terminfo/x xst.terminfo
+post_install() {
vdoc README
vdoc FAQ
vdoc .Xresources Xresources
From eef21aca25d6a6cb78adf168c38f2a48f5a6396f Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Fri, 22 Jul 2022 19:35:48 +0200
Subject: [PATCH 193/343] ncurses: Resolve conflicts with -terminfo packages
ncurses-term provides terminfo entries only for terminals which don't
have their own -terminfo subackage now.
This also replaces the remove-foot.patch with rm in post_install() to
make handling of terminfo conflicts consistent.
---
srcpkgs/ncurses/patches/remove-foot.patch | 64 -----------------------
srcpkgs/ncurses/template | 10 +++-
2 files changed, 9 insertions(+), 65 deletions(-)
delete mode 100644 srcpkgs/ncurses/patches/remove-foot.patch
diff --git a/srcpkgs/ncurses/patches/remove-foot.patch b/srcpkgs/ncurses/patches/remove-foot.patch
deleted file mode 100644
index 0328c5c4dad8..000000000000
--- a/srcpkgs/ncurses/patches/remove-foot.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ruN ncurses-6.3_orig/misc/terminfo.src ncurses-6.3/misc/terminfo.src
---- ncurses-6.3_orig/misc/terminfo.src 2022-05-17 17:22:53.886017351 +0200
-+++ ncurses-6.3/misc/terminfo.src 2022-05-17 17:23:31.941720306 +0200
-@@ -7627,60 +7627,6 @@
-
- ######## WAYLAND CLIENTS
-
--#### Foot
--# https://codeberg.org/dnkl/foot/
--# Version 1.8.2
--#
--# This identifies as a VT220 with 4=sixel and 22=color, however:
--# tack:
--# bell does not work
--# status-line does not work because foot does not set the window title
--# sends escape when meta key is used, whether or not smm/rmm enabled
--# vttest:
--# wrap-test fails
--# no application-mode for numeric keypad (unless private mode 1035 is set)
--# no NRCS
--# no VT52
--# no SRM
--# protected areas do not work
--# SU/SD work, SL/SR do not
--# DECRPM responds, but not the corresponding ANSI reports.
--# otherwise few reports, except cursor-position and mouse and some dtterm
--# VT520 cursor-movement works, except for left/right margins
--# supports xterm/DECSCUSR, though default case in vttest does not blink
--# Send: <27> [ 0 <32> q
--# Text: The cursor should be a blinking rectangle
--# partial support for xterm mouse any-event mode and button-event mode:
--# + does not report focus-in/focus-out
--# + does not report buttons 6/7
--# alternate-screen works
--foot|foot terminal emulator,
-- oc=\E]104\E\\, use=xterm+256color2, use=foot+base,
--
--foot-direct|foot with direct color indexing,
-- use=xterm+direct, use=foot+base,
--
--foot+base|foot base fragment,
-- am, bce, bw, hs, mir, msgr, npc, xenl, AX, XT,
-- cols#80, it#8, lines#24,
-- acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
-- bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
-- cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
-- el1=\E[1K, flash=\E]555\E\\, ind=\n, invis=\E[8m,
-- is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z,
-- oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B,
-- rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
-- sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
-- %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
-- sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
-- smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis,
-- use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local,
-- use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep,
-- use=ansi+tabs, use=ecma+index, use=ecma+italics,
-- use=ecma+strikeout, use=xterm+alt+title,
-- use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2,
--
- ######## WEB CLIENTS
-
- #### DomTerm
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 8386760db22f..7a56c537bf2e 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
# Template file for 'ncurses'
pkgname=ncurses
version=6.3
-revision=2
+revision=3
bootstrap=yes
configure_args="--enable-big-core"
short_desc="System V Release 4.0 curses emulation library"
@@ -97,6 +97,14 @@ do_install() {
fi
}
+post_install() {
+ # resolve conflict with *-terminfo packages
+ rm ${DESTDIR}/usr/share/terminfo/a/alacritty{,-direct}
+ rm ${DESTDIR}/usr/share/terminfo/d/dvtm{,-256color}
+ rm ${DESTDIR}/usr/share/terminfo/s/st{,-256color}
+ rm ${DESTDIR}/usr/share/terminfo/f/foot{,-direct,+base}
+}
+
ncurses-libs_package() {
short_desc+=" -- shared libraries"
pkg_install() {
From 5c739a4a8e4dfa72900e89f5b781c8e45e38a834 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Sat, 1 Oct 2022 17:06:44 +0600
Subject: [PATCH 194/343] txr: update to 282.
---
srcpkgs/txr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index 0e609b25565f..d9b0e96ebe5a 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,6 +1,6 @@
# Template file for 'txr'
pkgname=txr
-version=275
+version=282
revision=1
archs="x86_64* i686* aarch64* arm* ppc64* mips*"
build_style=configure
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
homepage="http://www.nongnu.org/txr/"
changelog="http://www.kylheku.com/cgit/txr/tree/RELNOTES"
distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=1e6ca44f2879178f4205ad70ee8fc757a4392ecc75424c5ed0904741d1b1541e
+checksum=5f10467610d8213be9af8a1fc9dafbd4902b7b473a82d8b2945cfa5ea6d2fee5
nopie=yes
if [ "$CROSS_BUILD" ]; then
From bccc8815c47c28a56b130531e97a355c1cd372a8 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 29 Sep 2022 18:21:15 +0200
Subject: [PATCH 195/343] stern: update to 1.22.0.
---
srcpkgs/stern/template | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 1efac280670f..08b209e41cf6 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,6 +1,6 @@
# Template file for 'stern'
pkgname=stern
-version=1.21.0
+version=1.22.0
revision=1
build_style=go
go_import_path="github.com/stern/stern"
@@ -9,7 +9,20 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="Apache-2.0"
homepage="https://github.com/stern/stern"
distfiles="https://github.com/stern/stern/archive/v${version}.tar.gz"
-checksum=0ccf1375ee3c20508c37de288a46faa6b0e4dffb3a3749f4b699a30f95e861be
+checksum=3726e3c6a0e8c2828bce7b67f9ee94ddbedcfbeeecf9e6ab42e23873e3f54161
# fix: collect2: fatal error: cannot find 'ld'
-LDFLAGS="-fuse-ld=bfd"
+export LDFLAGS="-fuse-ld=bfd"
+
+post_build() {
+ for shell in bash fish zsh; do
+ CGO_ENABLED=0 GOARCH="" go run main.go --completion "$shell" \
+ >"completion.$shell"
+ done
+}
+
+post_install() {
+ for shell in bash fish zsh; do
+ vcompletion "completion.$shell" "$shell"
+ done
+}
From 705fdd4968514b3038d067d0a153a96e6a91b2ef Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Wed, 28 Sep 2022 19:28:15 -0300
Subject: [PATCH 196/343] oil: update to 0.12.6
---
srcpkgs/oil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index e6b0e135b791..605f5aaf6417 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
# Template file for 'oil'
pkgname=oil
-version=0.12.5
+version=0.12.6
revision=1
build_style=configure
configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="https://www.oilshell.org/download/oil-${version}.tar.xz"
-checksum=c72f897f37ff4696812836ba8ecadbefe555b1866ae488304db6de159b2b1741
+checksum=8e5366ae9cded3683814be041652a8642ed7fd83abdf18495a73133e06b705ab
register_shell="/usr/bin/osh /usr/bin/oil"
nocross="Build systems gets confused with host and cross toolchains/headers"
nostrip=yes
From 7549f487f4836e1cef8b71e71bb39639834670c0 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 10:28:34 +1100
Subject: [PATCH 197/343] tcllib: update checksum
---
srcpkgs/tcllib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcllib/template b/srcpkgs/tcllib/template
index b51d853ee003..8fb524e58ba8 100644
--- a/srcpkgs/tcllib/template
+++ b/srcpkgs/tcllib/template
@@ -11,7 +11,7 @@ maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
license="TCL"
homepage="http://core.tcl.tk/tcllib/"
distfiles="https://github.com/tcltk/${pkgname}/archive/${pkgname}-${version/./-}.tar.gz"
-checksum=e56892698903e0cc902a75a0eb9324845efcd3257c41e09edec25a6ab1654cf3
+checksum=076daf919ba0f8964dacb86ae974a6992db4d874eb738dffec1e1efebbd6d080
post_install() {
vlicense ./license.terms LICENSE
From f515921877f2bfe6a906859eefeef46162ce860a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sun, 24 Jul 2022 22:06:29 -0400
Subject: [PATCH 198/343] python3-trimesh: update to 3.15.2.
---
srcpkgs/python3-trimesh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index 3bd4a284eca9..4a30e9f6015c 100644
--- a/srcpkgs/python3-trimesh/template
+++ b/srcpkgs/python3-trimesh/template
@@ -1,6 +1,6 @@
# Template file for 'python3-trimesh'
pkgname=python3-trimesh
-version=3.11.2
+version=3.15.2
revision=1
wrksrc="trimesh-${version}"
build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="MIT"
homepage="https://trimsh.org/"
distfiles="https://github.com/mikedh/trimesh/archive/${version}.tar.gz"
-checksum=bee21e9aa5b6c98f46dde34d490a0082e5c209f99288435282e145d328f14672
+checksum=543a8c4a44228c77e44918af9649a6e3828cec9d3ff9083e82453c34a0872add
post_install() {
vlicense LICENSE.md
From 8c650eceedf3f19dcbfccbe3138b39b145b364e2 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 1 Oct 2022 21:44:04 +0200
Subject: [PATCH 199/343] gdu: update to 5.19.0.
---
srcpkgs/gdu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 967975677edb..e7b5b0681569 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,6 +1,6 @@
# Template file for 'gdu'
pkgname=gdu
-version=5.18.1
+version=5.19.0
revision=1
build_style=go
go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/dundee/gdu"
distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
-checksum=a841230f59243965c6591d40761b624d1df207963f2cf29bda0fc6c1645ae9be
+checksum=69c47eaedd0fc1e664d5a08c91e7b107961145aa307d1fd11cf208dfec573f0c
post_install() {
vman gdu.1
From ec11cee86ae556cd4909040baa5f5434d3e05f31 Mon Sep 17 00:00:00 2001
From: gary <28818063+garylaski@users.noreply.github.com>
Date: Fri, 30 Sep 2022 11:00:17 -0400
Subject: [PATCH 200/343] picard: update to 2.8.3
---
srcpkgs/picard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index 2c69c2b6ec5b..5acdbd8855c1 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,6 +1,6 @@
# Template file for 'picard'
pkgname=picard
-version=2.7.3
+version=2.8.3
revision=1
wrksrc="${pkgname}-release-${version}"
build_style=python3-module
@@ -17,4 +17,4 @@ license="GPL-2.0-or-later"
homepage="https://picard.musicbrainz.org/"
changelog="https://picard.musicbrainz.org/changelog/"
distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=6a273fe72b3cd84c67a60f0f4ae01f04f169fe372c33f0f58b764bf62c20d94b
+checksum=6ab650d2ffb16fa4fab17b837a0a8a5691d1f211368a79a69b7088497c989e40
From d8008fd86e32c22797953d88fcd3f8c58a784dc0 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Fri, 30 Sep 2022 18:56:43 +0200
Subject: [PATCH 201/343] sqlite: update to 3.39.4.
---
srcpkgs/sqlite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 33a12851a34d..1a0bb1420c00 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
# Template file for 'sqlite'
pkgname=sqlite
-version=3.39.3
+version=3.39.4
revision=1
_amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,7 +13,7 @@ license="Public Domain"
homepage="https://sqlite.org/"
changelog="https://www.sqlite.org/changes.html"
distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=7868fb3082be3f2cf4491c6fba6de2bddcbc293a35fefb0624ee3c13f01422b9
+checksum=f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb
CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
-DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
From eaf7c7de342127132f87cc99c797759dd3b07d7e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Fri, 20 May 2022 21:27:06 -0400
Subject: [PATCH 202/343] python3-numpy-stl: update to 2.17.1.
---
srcpkgs/python3-numpy-stl/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template
index 2e77adb71479..b0e934c7d55a 100644
--- a/srcpkgs/python3-numpy-stl/template
+++ b/srcpkgs/python3-numpy-stl/template
@@ -1,10 +1,12 @@
# Template file for 'python3-numpy-stl'
pkgname=python3-numpy-stl
-version=2.16.3
+version=2.17.1
revision=1
wrksrc="numpy-stl-${version}"
build_style=python3-module
build_helper="numpy"
+# skip flake8 tests
+make_check_args="-o addopts=--doctest-modules --ignore=build"
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel"
depends="python3-numpy python3-utils"
@@ -14,7 +16,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/WoLpH/numpy-stl/"
distfiles="https://github.com/WoLpH/numpy-stl/archive/v${version}.tar.gz"
-checksum=11a0afb41923e5a6839dcce4cc5f55229a36c7251e138d3a1a818d7636e5e777
+checksum=6228bd07cdb67bb3e4a67721146c425a6f2b0546dba8dfa082d7cf58642c0f1a
conflicts="python-numpy-stl>=0"
From d239b1afde86d33460a173a21ff2b2dcffbee51b Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 26 Sep 2022 21:46:43 +0200
Subject: [PATCH 203/343] slack-desktop: update to 4.28.182
---
srcpkgs/slack-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 0b322cb0213a..c7a71391845b 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'slack-desktop'
pkgname=slack-desktop
-version=4.28.171
+version=4.28.182
revision=1
archs="x86_64"
hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="custom:Proprietary"
homepage="https://slack.com/"
distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=aec1d7fcd2cb191d1766c83709ce868cd2baad273d5263365e47e3ab0b09655e
+checksum=f4812b6de024017610fdd9a1bcf279153cebc7f9169f40ace7ed7f8780c479b6
restricted=yes
repository="nonfree"
nopie=yes
From 496e856b90213106625ccfcb486cc08fc0a98e71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 28 Sep 2022 15:51:56 -0700
Subject: [PATCH 204/343] xdg-desktop-portal: update to 1.15.0.
---
srcpkgs/xdg-desktop-portal/template | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index 966016ad9e7b..2e29350b5d3d 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,21 +1,22 @@
# Template file for 'xdg-desktop-portal'
pkgname=xdg-desktop-portal
-version=1.14.6
+version=1.15.0
revision=1
-build_style=gnu-configure
-configure_args="--enable-pipewire --enable-geoclue --enable-libportal --without-systemd"
-hostmakedepends="pkg-config glib-devel"
+build_style=meson
+configure_args="-Dpipewire=enabled -Dgeoclue=enabled -Dlibportal=enabled
+ -Dsystemd=disabled"
+hostmakedepends="pkg-config gettext glib-devel bubblewrap flatpak"
makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel
libportal-devel"
-checkdepends="dbus"
+checkdepends="dbus python3-dbusmock"
short_desc="Portal frontend service for Flatpak"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/flatpak/xdg-desktop-portal"
changelog="https://github.com/flatpak/xdg-desktop-portal/raw/main/NEWS"
-distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=f2e589972c0af78f2ba92ac222ebc9b9e1499bc9017aaa00041567caed950de0
+distfiles="https://github.com/flatpak/xdg-desktop-portal/archive/refs/tags/${version}.tar.gz"
+checksum=a0fc502e862dd4b23530bf4aa97899145415228b4c54bf6e6ef8b61e68ebb2bf
-post_install() {
- rm -rf "${DESTDIR}/usr/lib/systemd"
-}
+if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+ export TEST_IN_CI="true"
+fi
From 2ff7ff83cc33c5c213066c60b797bb10465bda10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 28 Sep 2022 23:08:02 +0200
Subject: [PATCH 205/343] filelight: update to 22.08.1.
---
srcpkgs/filelight/patches/musl.patch | 41 ----------------------------
srcpkgs/filelight/template | 9 +++---
2 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/srcpkgs/filelight/patches/musl.patch b/srcpkgs/filelight/patches/musl.patch
index 56b36abac39c..01f8cc132a30 100644
--- a/srcpkgs/filelight/patches/musl.patch
+++ b/srcpkgs/filelight/patches/musl.patch
@@ -1,44 +1,3 @@
---- a/src/radialMap/sincos.h 2018-05-06 06:10:38.000000000 +0200
-+++ b/src/radialMap/sincos.h 2018-05-06 06:10:38.000000000 +0200
-@@ -21,10 +21,10 @@
-
- #ifndef SINCOS_H
- #define SINCOS_H
--
-+#define _GNU_SOURCE
- #include <math.h>
-
--#if !defined(__GLIBC__) || (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
-+#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
-
- #include <qmath.h>
-
---- a/src/radialMap/sincos.h 2018-05-25 01:30:46.775385798 +0200
-+++ b/src/radialMap/sincos.h 2018-05-25 01:30:46.775385798 +0200
-@@ -23,23 +23,4 @@
- #define SINCOS_H
- #define _GNU_SOURCE
- #include <math.h>
--
--#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
--
--#include <qmath.h>
--
--void
--sincos(double angleRadians, double *Sin, double *Cos);
--
--#ifdef SINCOS_H_IMPLEMENTATION
--void
--sincos(double angleRadians, double *Sin, double *Cos)
--{
-- *Sin = qSin(angleRadians);
-- *Cos = qCos(angleRadians);
--}
--#endif
--
--#endif
--
- #endif
--- a/src/posixWalker.cpp 2022-05-09 04:52:35.000000000 +0200
+++ - 2022-05-15 17:20:54.296063960 +0200
@@ -3,6 +3,10 @@
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 68d0dd27b30d..327a11ab960c 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,15 +1,16 @@
# Template file for 'filelight'
pkgname=filelight
-version=22.04.3
+version=22.08.1
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
- qt5-host-tools qt5-qmake"
-makedepends="kparts-devel qt5-devel"
+ kpackage qt5-host-tools qt5-qmake"
+makedepends="kparts-devel kdeclarative-devel qt5-devel qt5-quickcontrols2-devel"
+depends="kirigami2 kquickcharts"
short_desc="Interactive map that helps visualize disk usage on your computer"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-only"
homepage="https://utils.kde.org/projects/filelight/"
changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=00ee4c583f06fb5a8004d63d74a2c295ee66fec53f14c7703798a50c8a572ff7
+checksum=3c26588ec81cb3ce334c7d70ccb28cd443eb7d333274aa68b1cbfe56f0ad0fbb
From 0bcad584dfa6d96ebec10193890a362884e24b6f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 28 Sep 2022 21:15:09 +0200
Subject: [PATCH 206/343] tpm2-tools: update to 5.3
---
srcpkgs/tpm2-tools/patches/bootstrap-no-git.patch | 13 +++++++++++++
srcpkgs/tpm2-tools/patches/version-cache.patch | 11 -----------
srcpkgs/tpm2-tools/template | 6 +++---
3 files changed, 16 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/tpm2-tools/patches/bootstrap-no-git.patch
delete mode 100644 srcpkgs/tpm2-tools/patches/version-cache.patch
diff --git a/srcpkgs/tpm2-tools/patches/bootstrap-no-git.patch b/srcpkgs/tpm2-tools/patches/bootstrap-no-git.patch
new file mode 100644
index 000000000000..b6c1f21929e3
--- /dev/null
+++ b/srcpkgs/tpm2-tools/patches/bootstrap-no-git.patch
@@ -0,0 +1,13 @@
+diff --git a/bootstrap b/bootstrap
+index f8de2d3..bd2ab07 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -5,7 +5,7 @@ set -e
+
+ # Generate a VERSION file that is included in the dist tarball to avoid needed git
+ # when calling autoreconf in a release tarball.
+-git describe --tags --always --dirty > VERSION
++# git describe --tags --always --dirty > VERSION
+
+ # generate list of source files for use in Makefile.am
+ # if you add new source files, you must run ./bootstrap again
diff --git a/srcpkgs/tpm2-tools/patches/version-cache.patch b/srcpkgs/tpm2-tools/patches/version-cache.patch
deleted file mode 100644
index 3766b3fe9a53..000000000000
--- a/srcpkgs/tpm2-tools/patches/version-cache.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index f1c1711..2ca51b0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,5 @@
- AC_INIT([tpm2-tools],
-- [m4_esyscmd_s([git describe --tags --always --dirty])])
-+ [m4_esyscmd_s([cat VERSION])])
- AC_CONFIG_MACRO_DIR([m4])
-
- AX_IS_RELEASE([dash-version])
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 30120d8fc322..f1f2d2e8582e 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,6 +1,6 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
-version=5.2
+version=5.3
revision=1
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
homepage="https://github.com/tpm2-software/tpm2-tools/"
changelog="https://raw.githubusercontent.com/tpm2-software/tpm2-tools/master/docs/CHANGELOG.md"
distfiles="https://github.com/tpm2-software/tpm2-tools/archive/refs/tags/${version}.tar.gz"
-checksum=6b81d8214cc8006a8a5011926df917b885f320e428470a61669f577c0778e4d8
+checksum=24a4113ad1aef589a48031ad448d019466294e0400c8382ffab3e8d4aff48c2d
build_options="man"
desc_option_man="Use pandoc for manpages"
@@ -26,5 +26,5 @@ pre_configure() {
}
post_install() {
- vlicense doc/LICENSE
+ vlicense docs/LICENSE
}
From d61e65eb9dd36e1dcee97b562c24b9e05dde5bb5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Oct 2022 17:14:16 +0200
Subject: [PATCH 207/343] encodings: update to 1.0.6.
---
srcpkgs/encodings/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index a4baa147efe1..f29dcc1c2f67 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -1,20 +1,21 @@
# Template file for 'encodings'
pkgname=encodings
-version=1.0.5
-revision=2
+version=1.0.6
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config font-util"
depends="font-util"
-short_desc="X11 Font Index Generator"
+short_desc="Font encoding tables for libfontenc"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:Public domain"
homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31
+distfiles="${XORG_SITE}/font/encodings-${version}.tar.xz"
+checksum=77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26
pre_build() {
- sed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile
+ vsed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile
}
+
post_install() {
# encodings.dir are generated at pkg post-install time.
find ${DESTDIR} -name encodings.dir -delete
From 05628981f79da1120254814e11747329dc85018e Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Wed, 28 Sep 2022 19:43:15 +0700
Subject: [PATCH 208/343] conky-cli: update to 1.13.1
---
srcpkgs/conky-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 9e56e9ad4309..58279fa4dfb4 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,7 +1,7 @@
# Template file for 'conky-cli'
# Keep in sync with 'conky'
pkgname=conky-cli
-version=1.12.2
+version=1.13.1
revision=1
wrksrc="${pkgname/-cli/}-${version}"
build_style=cmake
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, GPL-3.0-or-later"
homepage="https://github.com/brndnmtthws/conky"
distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=a7eb112fe7a6bcd6c44706a53cbf6222e640cd1e585492fc654aa9e05a7bbc94
+checksum=f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
provides="conky-${version}_${revision}"
conflicts="conky>=0"
From 14bc706a89f713cb6aaf2eda57fa45813a749963 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Wed, 28 Sep 2022 19:43:28 +0700
Subject: [PATCH 209/343] conky: update to 1.13.1
---
srcpkgs/conky/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index d50cbcfbd119..016ddeab5c8a 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,7 +1,7 @@
# Template file for 'conky'
# Keep in sync with 'conky-cli'
pkgname=conky
-version=1.12.2
+version=1.13.1
revision=1
build_style=cmake
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, GPL-3.0-or-later"
homepage="https://github.com/brndnmtthws/conky"
distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=a7eb112fe7a6bcd6c44706a53cbf6222e640cd1e585492fc654aa9e05a7bbc94
+checksum=f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
post_install() {
vmkdir etc/conky
From 8ef8e89e37fe318ed110ea8374f84097bf5843c4 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 25 Sep 2022 09:40:50 +0530
Subject: [PATCH 210/343] swayimg: update to 1.9
---
.../patches/0001-fix-zsh-completion.patch | 23 +++++++++++++++++
srcpkgs/swayimg/patches/0002-fix-help.patch | 25 +++++++++++++++++++
srcpkgs/swayimg/template | 7 +++---
3 files changed, 52 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
create mode 100644 srcpkgs/swayimg/patches/0002-fix-help.patch
diff --git a/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch b/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
new file mode 100644
index 000000000000..b9360242ee42
--- /dev/null
+++ b/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
@@ -0,0 +1,23 @@
+From e938dc5b04bb54dd3f3a89a71d46c7a53ac087bd Mon Sep 17 00:00:00 2001
+From: Leon <adigitoleo@dissimulo.com>
+Date: Wed, 31 Aug 2022 23:07:23 +1000
+Subject: [PATCH] Fix typo in zsh completion
+
+Signed-off-by: Leon <adigitoleo@dissimulo.com>
+---
+ extra/zsh.completion | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extra/zsh.completion b/extra/zsh.completion
+index a690528..32b159b 100644
+--- a/extra/zsh.completion
++++ b/extra/zsh.completion
+@@ -8,7 +8,7 @@ _arguments \
+ '(-r --recursive)'{-r,--recursive}'[read directories recursively]' \
+ '(-a --all)'{-a,--all}'[open all files from the same directory]' \
+ '(-m --mark)'{-m,--mark}'[enable marking mode]' \
+- '(-l --slideshow)'{-l --slideshow}'[activate slideshow mode on startup]' \
++ '(-l --slideshow)'{-l,--slideshow}'[activate slideshow mode on startup]' \
+ '(-f --fullscreen)'{-f,--fullscreen}'[show image in full screen mode]' \
+ '(-s --scale=SCALE)'{-s,--scale=}'[set initial image scale]:scale:(optimal fit real)' \
+ '(-b --background)'{-b,--background=}'[set image background color]:bkg:(none grid)' \
diff --git a/srcpkgs/swayimg/patches/0002-fix-help.patch b/srcpkgs/swayimg/patches/0002-fix-help.patch
new file mode 100644
index 000000000000..b735d938d1ad
--- /dev/null
+++ b/srcpkgs/swayimg/patches/0002-fix-help.patch
@@ -0,0 +1,25 @@
+From 1cbbe5e6e0cc3f7fb26055e952153c3a23bfad45 Mon Sep 17 00:00:00 2001
+From: Artem Senichev <artemsen@gmail.com>
+Date: Sat, 17 Sep 2022 11:57:10 +0300
+Subject: [PATCH] Allow long option `--help`
+
+Fix error when `--help` is not accepted by getopt.
+
+Signed-off-by: Artem Senichev <artemsen@gmail.com>
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index 3939ccb..4eecd12 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -93,7 +93,7 @@ static int parse_cmdargs(int argc, char* argv[], struct config* cfg)
+ }
+ // add terminations
+ *short_opts_ptr = 0;
+- memset(&options[(sizeof(arguments) / sizeof(arguments[0])) - 1], 0,
++ memset(&options[(sizeof(arguments) / sizeof(arguments[0]))], 0,
+ sizeof(struct option));
+
+ // parse arguments
diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index 8a7e4b052b2d..bfdc3a496d21 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,21 +1,22 @@
# Template file for 'swayimg'
pkgname=swayimg
-version=1.8
+version=1.9
revision=1
build_style=meson
hostmakedepends="pkg-config wayland-devel"
makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel
- wayland-protocols libavif-devel giflib-devel libjpeg-turbo-devel
+ wayland-protocols libheif-devel giflib-devel libjpeg-turbo-devel
libpng-devel librsvg-devel libwebp-devel libexif-devel"
short_desc="Image viewer for Sway/Wayland"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="MIT"
homepage="https://github.com/artemsen/swayimg"
distfiles="https://github.com/artemsen/swayimg/archive/v${version}.tar.gz"
-checksum=d4b4988a673522d47c38939c3406dbb72bd213f857dd6116185cd9811b887b23
+checksum=693a23a7755ebedb144271b2b674980a1c51a2036dabcff9697c3e3c6258f108
post_install() {
vcompletion extra/bash.completion bash
+ vcompletion extra/zsh.completion zsh
vsconf extra/swayimgrc
vlicense LICENSE
}
From 2a688b5c1bc33e27e826734826def5f8c94f50f5 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 24 Sep 2022 21:35:25 +0530
Subject: [PATCH 211/343] lsof: update to 4.96.3
---
srcpkgs/lsof/patches/lsof.8.patch | 23 -----------------------
srcpkgs/lsof/template | 11 ++++++-----
2 files changed, 6 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/lsof/patches/lsof.8.patch
diff --git a/srcpkgs/lsof/patches/lsof.8.patch b/srcpkgs/lsof/patches/lsof.8.patch
deleted file mode 100644
index ecb21013512d..000000000000
--- a/srcpkgs/lsof/patches/lsof.8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lsof.8
-+++ b/lsof.8
-@@ -1,7 +1,7 @@
- .so ./version
- .TH LSOF 8 Revision-\*(VN
--\" Register )P is used neither by this file nor any groff macro. However,
--\" some versions of nroff require it.
-+.\" Register )P is used neither by this file nor any groff macro. However,
-+.\" some versions of nroff require it.
- .if !\n(.g \{\
- . if !\n()P .nr )P 1v
- .\}
-@@ -967,8 +967,8 @@ where:
- .br
- applies to all IP versions.
- .br
-- \fIprotocol\fP is a protocol name \- \fBTCP\fP, \fBUDP\fP
--.br or \fBUDPLITE\fP.
-+ \fIprotocol\fP is a protocol name \- \fBTCP\fP, \fBUDP\fP or \fBUDPLITE\fP.
-+.br
- .br
- \fIhostname\fP is an Internet host name. Unless a
- .br
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 0151fb4a9e84..4dcfdb240e43 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,21 +1,20 @@
# Template file for 'lsof'
pkgname=lsof
-version=4.95.0
+version=4.96.3
revision=1
-wrksrc="${pkgname}_${version}.linux"
build_style=configure
configure_script="./Configure"
configure_args="-n linux"
make_check_target="all"
make_check_args="-C tests"
-hostmakedepends="perl"
+hostmakedepends="perl groff"
short_desc="LiSt Open Files"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="custom:lsof"
homepage="https://github.com/lsof-org/lsof"
changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof_${version}.linux.tar.bz2"
-checksum=e9faa0fbcc48638c1d1f143e93573ac43b65e76646150f83e24bd8c18786303c
+distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
+checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
post_extract() {
# See: https://github.com/lsof-org/lsof/issues/61
@@ -35,6 +34,8 @@ pre_configure() {
vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-i dialects/linux/machine.h
+
+ soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
}
do_install() {
From 28eb4965aeda94e8ad3e5ecc26d9a8c8681ac27d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 28 Sep 2022 20:48:12 -0700
Subject: [PATCH 212/343] xdg-desktop-portal-gnome: update to 43.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 8002ddcc399c..03c68355eb9e 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,6 +1,6 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-version=42.3
+version=43.0
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
@@ -13,6 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-42/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ed105a667e46325467103dc7346d2023faec1d5ec153bd17316da938f53ace0
+checksum=0e1867a45bcaa5ddb240a4cfdb22dd055cf87f07210b9e3bb70949f3c7be16a6
From b26027a39f90c627eba245521541d3eb3c4113ef Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 24 Sep 2022 01:50:05 -0400
Subject: [PATCH 213/343] python3-jq: update to 1.3.0.
replace Arch's patch with FreeBSD's patch
---
srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 -------------------
srcpkgs/python3-jq/patches/setup.py.patch | 24 ++++
srcpkgs/python3-jq/template | 8 +-
3 files changed, 28 insertions(+), 147 deletions(-)
delete mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch
create mode 100644 srcpkgs/python3-jq/patches/setup.py.patch
diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch
deleted file mode 100644
index 1eb4f28e7aa9..000000000000
--- a/srcpkgs/python3-jq/patches/jq-py-setup.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
-From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
-Date: Fri, 7 May 2021 19:14:20 -0400
-Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
-
----
- setup.py | 98 +-------------------------------------------------------
- 1 file changed, 1 insertion(+), 97 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 663792c..3ebcabe 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,113 +1,19 @@
- #!/usr/bin/env python
-
- import os
--import subprocess
--import tarfile
--import shutil
--import sysconfig
-
--import requests
- from setuptools import setup
--from setuptools.command.build_ext import build_ext
- from setuptools.extension import Extension
-
-
--def urlretrieve(source_url, destination_path):
-- response = requests.get(source_url, stream=True)
-- if response.status_code != 200:
-- raise Exception("status code was: {}".format(response.status_code))
--
-- with open(destination_path, "wb") as fileobj:
-- for chunk in response.iter_content(chunk_size=128):
-- fileobj.write(chunk)
--
--def path_in_dir(relative_path):
-- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
--
--def dependency_path(relative_path):
-- return os.path.join(path_in_dir("_deps"), relative_path)
--
- def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
-
-
--jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz")
--jq_lib_dir = dependency_path("jq-1.6")
--
--oniguruma_version = "6.9.4"
--oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version))
--oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
--oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
--
--class jq_build_ext(build_ext):
-- def run(self):
-- if not os.path.exists(dependency_path(".")):
-- os.makedirs(dependency_path("."))
-- self._build_oniguruma()
-- self._build_libjq()
-- build_ext.run(self)
--
-- def _build_oniguruma(self):
-- self._build_lib(
-- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
-- tarball_path=oniguruma_lib_tarball_path,
-- lib_dir=oniguruma_lib_build_dir,
-- commands=[
-- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
-- ["make"],
-- ["make", "install"],
-- ])
--
--
-- def _build_libjq(self):
-- self._build_lib(
-- source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz",
-- tarball_path=jq_lib_tarball_path,
-- lib_dir=jq_lib_dir,
-- commands=[
-- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
-- ["make"],
-- ])
--
-- def _build_lib(self, source_url, tarball_path, lib_dir, commands):
-- self._download_tarball(
-- source_url=source_url,
-- tarball_path=tarball_path,
-- lib_dir=lib_dir,
-- )
--
-- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
-- if macosx_deployment_target:
-- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
--
-- def run_command(args):
-- print("Executing: %s" % ' '.join(args))
-- subprocess.check_call(args, cwd=lib_dir)
--
-- for command in commands:
-- run_command(command)
--
-- def _download_tarball(self, source_url, tarball_path, lib_dir):
-- if os.path.exists(tarball_path):
-- os.unlink(tarball_path)
-- print("Downloading {}".format(source_url))
-- urlretrieve(source_url, tarball_path)
-- print("Downloaded {}".format(source_url))
--
-- if os.path.exists(lib_dir):
-- shutil.rmtree(lib_dir)
-- tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
--
--
- jq_extension = Extension(
- "jq",
- sources=["jq.c"],
-- include_dirs=[os.path.join(jq_lib_dir, "src")],
-- extra_link_args=["-lm"],
-- extra_objects=[
-- os.path.join(jq_lib_dir, ".libs/libjq.a"),
-- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
-- ],
-+ libraries=["jq"]
- )
-
- setup(
-@@ -120,7 +26,6 @@ setup(
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
- license='BSD 2-Clause',
- ext_modules = [jq_extension],
-- cmdclass={"build_ext": jq_build_ext},
- classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
-@@ -137,4 +42,3 @@ setup(
- 'Programming Language :: Python :: 3.9',
- ],
- )
--
---
-2.29.3
diff --git a/srcpkgs/python3-jq/patches/setup.py.patch b/srcpkgs/python3-jq/patches/setup.py.patch
new file mode 100644
index 000000000000..9ccffed61039
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/setup.py.patch
@@ -0,0 +1,24 @@
+--- a/setup.py.orig 2022-09-19 15:51:09 UTC
++++ b/setup.py
+@@ -36,8 +36,6 @@ class jq_build_ext(build_ext):
+ def run(self):
+ if not os.path.exists(_dep_build_path(".")):
+ os.makedirs(_dep_build_path("."))
+- self._build_oniguruma()
+- self._build_libjq()
+ build_ext.run(self)
+
+ def _build_oniguruma(self):
+@@ -87,11 +85,7 @@ jq_extension = Extension(
+ "jq",
+ sources=["jq.c"],
+ include_dirs=[os.path.join(jq_lib_dir, "src")],
+- extra_link_args=["-lm"],
+- extra_objects=[
+- os.path.join(jq_lib_dir, ".libs/libjq.a"),
+- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
+- ],
++ extra_link_args=["-lm", "-ljq", "-lonig"],
+ )
+
+ setup(
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
index 443318c6bbd7..1a91caae99cb 100644
--- a/srcpkgs/python3-jq/template
+++ b/srcpkgs/python3-jq/template
@@ -1,11 +1,11 @@
# Template file for 'python3-jq'
pkgname=python3-jq
-version=1.2.3
+version=1.3.0
revision=1
wrksrc="${pkgname#*-}.py-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
-makedepends="python3-devel jq-devel"
+makedepends="python3-devel jq-devel oniguruma-devel"
depends="python3"
short_desc="Python bindings for jq"
maintainer="RunningDroid <runningdroid@zoho.com>"
@@ -13,10 +13,10 @@ license="BSD-2-Clause"
homepage="https://pypi.org/project/jq/"
changelog="https://raw.githubusercontent.com/mwilliamson/jq.py/master/CHANGELOG.rst"
distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz"
-checksum=52392e001cd90769d68f4e46821c645e277b9c1db01528a6bbc9d1875b81fcf5
+checksum=736e0d42d719592189cdd9921eab19d5bb4b65a3ce41a8f8f13794153fc5a5b1
pre_build() {
- cython jq.pyx
+ cython -X language_level=3 jq.pyx
}
post_install() {
From cba0ce02601bc8c6b64b5d789bbd2d2467e30c81 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Aug 2022 01:11:07 +0200
Subject: [PATCH 214/343] tracker: update to 3.4.0.
---
srcpkgs/tracker/patches/disable-cli-test.patch | 11 +++++++++++
srcpkgs/tracker/template | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/tracker/patches/disable-cli-test.patch
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
new file mode 100644
index 000000000000..7b3f90302925
--- /dev/null
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -0,0 +1,11 @@
+fails to create database and then times out at creating a http server
+--- a/tests/functional-tests/meson.build
++++ b/tests/functional-tests/meson.build
+@@ -35,7 +35,6 @@ functional_tests = [
+ 'collation',
+ 'ontology-changes',
+ 'ontology-rollback',
+- 'cli',
+ 'portal',
+ ]
+
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 3fb3fdcc40e3..ed0f7bc04040 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.3.0
-revision=2
+version=3.4.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda
+checksum=b3b380c9571d7c7423b5f401e4a2f2d78de47143b035eb2c1281e2423c59218b
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From 99d99db317308f717c067128179b8285fc912424 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Aug 2022 01:11:10 +0200
Subject: [PATCH 215/343] tracker-miners: update to 3.4.0.
---
srcpkgs/tracker-miners/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index d5586258075a..b605d5176242 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.3.0
-revision=2
+version=3.4.0
+revision=1
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://developer.gnome.org/libtracker-miner/stable"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417
+checksum=a2e0365e30811bb61e95c8214b33f4782a3a04e0c6246a06ecd9c01417cd84e6
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
From 9730cdab887f2be42aa25cc73012b1310f9c5beb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 11 Sep 2022 13:30:19 -0700
Subject: [PATCH 216/343] ibus: update to 1.5.27.
---
.../patches/src-Fix-refcounting-issues.patch | 267 ------------------
srcpkgs/ibus/template | 24 +-
2 files changed, 10 insertions(+), 281 deletions(-)
delete mode 100644 srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
diff --git a/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch b/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
deleted file mode 100644
index d1923f71a18e..000000000000
--- a/srcpkgs/ibus/patches/src-Fix-refcounting-issues.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-From 17648f0522910480b6c5dd4f5356ca1f6c160bf5 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Tue, 29 Mar 2022 22:48:19 +0200
-Subject: [PATCH] src: Fix refcounting issues
-
-Commit 5a455b1ead attempted to fix both GLib warnings around
-floating references and other presumed refcounting issues. However
-it missed 2 kinds of bugs:
-
-- The places that take an IBusText created from a static string
- were made to avoid freeing it afterwards, but the staticness refers
- to the string content, not the object itself.
-- The places that are documented to emit signals on floating object
- references used to do the following after signal emission:
-
- if (g_object_is_floating (object))
- g_object_unref (object)
-
- And did possibly trigger GLib warnings were changed to:
-
- if (g_object_is_floating (object))
- g_object_sink_ref (object);
- g_object_unref (object);
-
- Which fixes the GLib warning for floating references, but do
- unintendedly steal one reference away for non floating references.
-
-This commit is essentially a revert of commit 5a455b1ead, but
-addressing both things differently:
-
-- All label/tooltip/symbol IBusText properties in IBusProperty do
- now always sink the reference of the stored object.
-
-- All places documented as maybe using objects with a floating reference
- on signals changed to doing:
-
- if (g_object_is_floating (object)) {
- g_object_ref_sink (object);
- g_object_unref (object);
- }
-
- So the floating reference is owned and unreferenced without warnings,
- but already owned references are left unchanged.
-
-This addresses the possible GLib warnings, fixes the possible double
-unrefs happening on IBusText used in signals, and fixes the missing
-unrefs on IBusText objects created from static strings.
-
-BUG=https://github.com/ibus/ibus/issues/2393
-BUG=https://github.com/ibus/ibus/issues/2387
----
- src/ibusinputcontext.c | 35 +++++++++++++++++++++--------------
- src/ibusproperty.c | 32 +++++++++++++++++---------------
- 2 files changed, 38 insertions(+), 29 deletions(-)
-
-diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
-index 4b27551bd..7981de381 100644
---- a/src/ibusinputcontext.c
-+++ b/src/ibusinputcontext.c
-@@ -549,9 +549,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
- g_variant_unref (variant);
- g_signal_emit (context, context_signals[COMMIT_TEXT], 0, text);
-
-- if (g_object_is_floating (text))
-+ if (g_object_is_floating (text)) {
- g_object_ref_sink (text);
-- g_object_unref (text);
-+ g_object_unref (text);
-+ }
- return;
- }
- if (g_strcmp0 (signal_name, "UpdatePreeditText") == 0) {
-@@ -569,9 +570,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
- cursor_pos,
- visible);
-
-- if (g_object_is_floating (text))
-+ if (g_object_is_floating (text)) {
- g_object_ref_sink (text);
-- g_object_unref (text);
-+ g_object_unref (text);
-+ }
- return;
- }
- if (g_strcmp0 (signal_name, "UpdatePreeditTextWithMode") == 0) {
-@@ -592,9 +594,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
- visible,
- mode);
-
-- if (g_object_is_floating (text))
-+ if (g_object_is_floating (text)) {
- g_object_ref_sink (text);
-- g_object_unref (text);
-+ g_object_unref (text);
-+ }
- return;
- }
-
-@@ -621,9 +624,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
- 0,
- text,
- visible);
-- if (g_object_is_floating (text))
-+ if (g_object_is_floating (text)) {
- g_object_ref_sink (text);
-- g_object_unref (text);
-+ g_object_unref (text);
-+ }
- return;
- }
-
-@@ -640,9 +644,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
- 0,
- table,
- visible);
-- if (g_object_is_floating (table))
-+ if (g_object_is_floating (table)) {
- g_object_ref_sink (table);
-- g_object_unref (table);
-+ g_object_unref (table);
-+ }
- return;
-
- }
-@@ -659,9 +664,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
- 0,
- prop_list);
-
-- if (g_object_is_floating (prop_list))
-+ if (g_object_is_floating (prop_list)) {
- g_object_ref_sink (prop_list);
-- g_object_unref (prop_list);
-+ g_object_unref (prop_list);
-+ }
- return;
- }
-
-@@ -673,9 +679,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy,
-
- g_signal_emit (context, context_signals[UPDATE_PROPERTY], 0, prop);
-
-- if (g_object_is_floating (prop))
-+ if (g_object_is_floating (prop)) {
- g_object_ref_sink (prop);
-- g_object_unref (prop);
-+ g_object_unref (prop);
-+ }
- return;
- }
-
-diff --git a/src/ibusproperty.c b/src/ibusproperty.c
-index 6d4ed088e..cd8a0e2a6 100644
---- a/src/ibusproperty.c
-+++ b/src/ibusproperty.c
-@@ -336,20 +336,17 @@ ibus_property_destroy (IBusProperty *prop)
- prop->priv->icon = NULL;
-
- if (prop->priv->label) {
-- if (!ibus_text_get_is_static (prop->priv->label))
-- g_object_unref (prop->priv->label);
-+ g_object_unref (prop->priv->label);
- prop->priv->label = NULL;
- }
-
- if (prop->priv->symbol) {
-- if (!ibus_text_get_is_static (prop->priv->symbol))
-- g_object_unref (prop->priv->symbol);
-+ g_object_unref (prop->priv->symbol);
- prop->priv->symbol = NULL;
- }
-
- if (prop->priv->tooltip) {
-- if (!ibus_text_get_is_static (prop->priv->tooltip))
-- g_object_unref (prop->priv->tooltip);
-+ g_object_unref (prop->priv->tooltip);
- prop->priv->tooltip = NULL;
- }
-
-@@ -404,7 +401,7 @@ ibus_property_deserialize (IBusProperty *prop,
- g_variant_get_child (variant, retval++, "u", &prop->priv->type);
-
- GVariant *subvar = g_variant_get_child_value (variant, retval++);
-- if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
-+ if (prop->priv->label) {
- g_object_unref (prop->priv->label);
- }
- prop->priv->label = IBUS_TEXT (ibus_serializable_deserialize (subvar));
-@@ -414,7 +411,7 @@ ibus_property_deserialize (IBusProperty *prop,
- ibus_g_variant_get_child_string (variant, retval++, &prop->priv->icon);
-
- subvar = g_variant_get_child_value (variant, retval++);
-- if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
-+ if (prop->priv->tooltip) {
- g_object_unref (prop->priv->tooltip);
- }
- prop->priv->tooltip = IBUS_TEXT (ibus_serializable_deserialize (subvar));
-@@ -435,7 +432,7 @@ ibus_property_deserialize (IBusProperty *prop,
-
- /* Keep the serialized order for the compatibility when add new members. */
- subvar = g_variant_get_child_value (variant, retval++);
-- if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
-+ if (prop->priv->symbol) {
- g_object_unref (prop->priv->symbol);
- }
- prop->priv->symbol = IBUS_TEXT (ibus_serializable_deserialize (subvar));
-@@ -567,7 +564,7 @@ ibus_property_set_label (IBusProperty *prop,
- g_assert (IBUS_IS_PROPERTY (prop));
- g_return_if_fail (label == NULL || IBUS_IS_TEXT (label));
-
-- if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) {
-+ if (prop->priv->label) {
- g_object_unref (prop->priv->label);
- }
-
-@@ -575,8 +572,10 @@ ibus_property_set_label (IBusProperty *prop,
- prop->priv->label = ibus_text_new_from_static_string ("");
- }
- else {
-- prop->priv->label = g_object_ref_sink (label);
-+ prop->priv->label = label;
- }
-+
-+ g_object_ref_sink (prop->priv->label);
- }
-
- void
-@@ -586,7 +585,7 @@ ibus_property_set_symbol (IBusProperty *prop,
- g_assert (IBUS_IS_PROPERTY (prop));
- g_return_if_fail (symbol == NULL || IBUS_IS_TEXT (symbol));
-
-- if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) {
-+ if (prop->priv->symbol) {
- g_object_unref (prop->priv->symbol);
- }
-
-@@ -594,8 +593,10 @@ ibus_property_set_symbol (IBusProperty *prop,
- prop->priv->symbol = ibus_text_new_from_static_string ("");
- }
- else {
-- prop->priv->symbol = g_object_ref_sink (symbol);
-+ prop->priv->symbol = symbol;
- }
-+
-+ g_object_ref_sink (prop->priv->symbol);
- }
-
- void
-@@ -615,7 +616,7 @@ ibus_property_set_tooltip (IBusProperty *prop,
- g_assert (IBUS_IS_PROPERTY (prop));
- g_assert (tooltip == NULL || IBUS_IS_TEXT (tooltip));
-
-- if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) {
-+ if (prop->priv->tooltip) {
- g_object_unref (prop->priv->tooltip);
- }
-
-@@ -624,8 +625,9 @@ ibus_property_set_tooltip (IBusProperty *prop,
- }
- else {
- prop->priv->tooltip = tooltip;
-- g_object_ref_sink (prop->priv->tooltip);
- }
-+
-+ g_object_ref_sink (prop->priv->tooltip);
- }
-
- void
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index d84d4f6dceb8..28408f6a3383 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,29 +1,29 @@
# Template file for 'ibus'
pkgname=ibus
-version=1.5.26
-revision=2
+version=1.5.27
+revision=1
build_style=gnu-configure
build_helper="gir"
configure_args="--enable-ui --enable-gtk3 --enable-gtk4
+ --enable-memconf --enable-dconf --enable-wayland --enable-xim
--disable-tests --disable-schemas-compile --disable-systemd-services
- --enable-memconf --enable-dconf --enable-wayland
- --with-python=/usr/bin/python3
+ --with-python=/usr/bin/python3 --disable-python2
$(vopt_enable dicts emoji-dict) $(vopt_enable dicts unicode-dict)
--enable-introspection --enable-vala $(vopt_enable ibus_setup setup)"
-hostmakedepends="automake gettext-devel libtool pkg-config intltool dconf
+hostmakedepends="pkg-config libtool gettext-devel intltool dconf
python3 glib-devel vala
$(vopt_if dicts 'cldr-emoji-annotation unicode-character-database unicode-emoji')"
-makedepends="dconf-devel gtk+-devel gtk4-devel hicolor-icon-theme
+makedepends="dconf-devel gtk+-devel gtk+3-devel gtk4-devel hicolor-icon-theme
iso-codes json-glib-devel libnotify-devel librsvg-devel python3-xdg
vala libXtst-devel"
-depends="hicolor-icon-theme iso-codes dbus-x11 python3-xdg
- $(vopt_if ibus_setup 'python3-gobject>=3.12.1_3')"
+depends="hicolor-icon-theme iso-codes setxkbmap dconf python3-xdg
+ dbus-x11 $(vopt_if ibus_setup 'python3-gobject>=3.12.1_3')"
short_desc="Intelligent Input Bus"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/ibus/ibus"
distfiles="https://github.com/ibus/ibus/releases/download/${version}/ibus-${version}.tar.gz"
-checksum=5c2fd118e7bfd4e9a42c3a20e6175a263426c90b6256f94989ed3d0384f4c9fc
+checksum=6efbda5adb96f607cf7108d1e270962c0729a59c9ea6d58eea2dde0e3cbb97df
build_options="ibus_setup dicts"
desc_option_ibus_setup="Enable support for building the ibus setup UI"
@@ -33,10 +33,6 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" dicts"
fi
-pre_install() {
- vmkdir etc/dconf/db
-}
-
post_install() {
vinstall bindings/pygobject/gi/overrides/IBus.py 644 ${py3_sitelib}/gi/overrides
}
From c1e2f407cf2c33a877530b3260197efb5b4320fb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 2 Oct 2022 14:04:22 +0200
Subject: [PATCH 217/343] vagrant: update to 2.3.1.
---
srcpkgs/vagrant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 6c2d0bf6a11f..057f5dc5e659 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,6 +1,6 @@
# Template file for 'vagrant'
pkgname=vagrant
-version=2.3.0
+version=2.3.1
revision=1
archs="i686 x86_64*"
build_style=gemspec
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://www.vagrantup.com/"
changelog="https://raw.githubusercontent.com/hashicorp/vagrant/main/CHANGELOG.md"
distfiles="https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"
-checksum=1931dbf29ec3c6622a649ae145fe706e5b957d7075870ce577358dd22c3d5dca
+checksum=661401d2368289150299f6ede2c50b1f70510ccee77222b47b457209507505db
nocross=yes
post_extract() {
From da6cea94fee826846a3811944a17213c63312e4c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 2 Oct 2022 00:01:54 -0700
Subject: [PATCH 218/343] gnome-backgrounds: update to 43.
---
srcpkgs/gnome-backgrounds/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 46b86e2f6317..5879accd8a4b 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,12 +1,13 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=42.0
+version=43
revision=1
build_style=meson
-hostmakedepends=gettext
+hostmakedepends="gettext"
+depends="librsvg webp-pixbuf-loader"
short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d
+distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
+checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
From a8c278fe125cf7e7ceeadfdef200d00631e82cee Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 2 Oct 2022 13:28:51 +0000
Subject: [PATCH 219/343] cloudflared: update to 2022.9.1
---
srcpkgs/cloudflared/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index df4f55c8e08b..64ca8edd8feb 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,6 +1,6 @@
# Template file for 'cloudflared'
pkgname=cloudflared
-version=2022.8.2
+version=2022.9.1
revision=1
build_style=go
go_import_path=github.com/cloudflare/cloudflared
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://developers.cloudflare.com/argo-tunnel/"
changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
-checksum=45ff0c9b95997e2f1795b08af5c3ed2fc19d2d3cb35391c01452163003b858a1
+checksum=4919eef5814b4ecc41e1359f9546389688194c9e893b4de3c40b0e3cd2919605
pre_build() {
go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
From 0433d9f6c40f0d00b3e18b56d8f96115b869d443 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sun, 2 Oct 2022 11:10:20 +0200
Subject: [PATCH 220/343] cpuid: update to 20220927.
---
srcpkgs/cpuid/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 53c577008d60..39b0d46f6cf4 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
# Template file for 'cpuid'
pkgname=cpuid
-version=20220812
+version=20220927
revision=1
archs="i686* x86_64*"
build_style=gnu-makefile
@@ -10,6 +10,6 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://www.etallen.com/cpuid.html"
distfiles="https://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=3bf68fb97d94714f90763ccad810df8dc5f7fe9c1f9a3652436491fd75415abf
+checksum=b3291a89344826028681a22806052920c0f3498d099ffdce3f63f567a1ea40ec
conflicts="msr-tools"
From 7c50332207fe978067445bd75b3915e556a193c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 Oct 2022 15:32:35 +0200
Subject: [PATCH 221/343] sbcl: update to 2.2.9.
---
srcpkgs/sbcl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0b3ca5f75070..7d401b5e166c 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
# Template file for 'sbcl'
pkgname=sbcl
-version=2.2.8
+version=2.2.9
revision=1
# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
@@ -13,7 +13,7 @@ license="custom:BSD+public_domain"
homepage="http://www.sbcl.org/"
changelog="http://www.sbcl.org/news.html"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=992fcc2b5319010f7587cdc2294b088a595d6c0982ff195b565adfaf4b7d7b0e
+checksum=7ebebd6d2023fff7077b0372fa1171f880529bdec6104f20983297c2feb7c172
nocross=yes
nopie=yes
@@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
case "$XBPS_TARGET_MACHINE" in
x86_64)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
- checksum+=" 702a6883403d241663247cb5d1346fadeb359690e085485a1403c539b386d270"
+ checksum+=" 54d8b1acc2080f0ef34ce01c80b15322145f056b282dbb3151bfd3ac73fee5d1"
;;
arm*)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"
From 8a13a6c44b7304a3a9c22fabe034c41ff33f78a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 Oct 2022 15:40:05 +0200
Subject: [PATCH 222/343] netpbm: update to 11.00.00.
---
srcpkgs/netpbm/files/netpbm-security-code.patch | 12 ------------
srcpkgs/netpbm/template | 6 +++---
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch
index 6f7c4976114b..37893a95073d 100644
--- a/srcpkgs/netpbm/files/netpbm-security-code.patch
+++ b/srcpkgs/netpbm/files/netpbm-security-code.patch
@@ -639,18 +639,6 @@ diff -up netpbm-10.58.01/editor/pnmhisteq.c.security-code netpbm-10.58.01/editor
MALLOCARRAY(lumahist, maxval + 1);
if (lumahist == NULL)
pm_error("Out of storage allocating array for %u histogram elements",
-diff -up netpbm-10.58.01/editor/pnmindex.csh.security-code netpbm-10.58.01/editor/pnmindex.csh
---- netpbm-10.58.01/editor/pnmindex.csh.security-code 2012-04-09 15:31:33.000000000 +0200
-+++ netpbm-10.58.01/editor/pnmindex.csh 2012-04-09 15:40:03.221619564 +0200
-@@ -1,5 +1,8 @@
- #!/bin/csh -f
- #
-+echo "Unsafe code, needs debugging, do not ship"
-+exit 1
-+#
- # pnmindex - build a visual index of a bunch of anymaps
- #
- # Copyright (C) 1991 by Jef Poskanzer.
diff -up netpbm-10.58.01/editor/pnmpad.c.security-code netpbm-10.58.01/editor/pnmpad.c
--- netpbm-10.58.01/editor/pnmpad.c.security-code 2012-04-09 15:31:34.000000000 +0200
+++ netpbm-10.58.01/editor/pnmpad.c 2012-04-09 15:40:03.221619564 +0200
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 80a777fa34db..2c9f45042734 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,9 +1,9 @@
# Template file for 'netpbm'
pkgname=netpbm
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.99.03
+version=11.00.00
revision=1
-_githash=30afec0b7050d438e664f123b4faa97f9f7e6e20
+_githash=0d782c278caeb9e70b1a5635d018168b09ecf2ba
_githash_guide=fb48776592aebf481e5b27db16786005dd965c71
create_wrksrc=yes
build_wrksrc="netpbm-mirror-${_githash}"
@@ -16,7 +16,7 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
homepage="http://netpbm.sourceforge.net/"
distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="af26aa92eb7ae3e10cb3b084607c8cb812a6f975b2874b43bb653b7017ec7468
+checksum="68940d516caf6348063cce2bb7990a3deb6c32aac23ae7d919ca41e20b6f25e4
cfe66c6f29c42ab006f640bae59cdea8e903aec80aca7a144504c74707572ddf"
post_extract() {
From bf00b362207aba1187f5c0819b9df5c91306b50f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 2 Oct 2022 18:13:49 +0530
Subject: [PATCH 223/343] jc: update to 1.22.0.
---
srcpkgs/jc/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 5163d73b96f5..4446872f1f99 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
# Template file for 'jc'
pkgname=jc
-version=1.21.2
+version=1.22.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,11 +12,11 @@ license="MIT"
homepage="https://github.com/kellyjonbrazil/jc"
changelog="https://raw.githubusercontent.com/kellyjonbrazil/jc/master/CHANGELOG"
distfiles="https://github.com/kellyjonbrazil/jc/archive/refs/tags/v${version}.tar.gz"
-checksum=7d230cad5651673812daa424cb9ace354d2c66605ddf37b3e4ebe6905d5f51b6
+checksum=5a5b8ae21ed083387ef8fb616a825917f53453ecd2ca65d7a51f2a01bcc94090
post_install() {
vman man/jc.1
vlicense LICENSE.md
- vcompletion completions/jc_bash_completion.sh bash jc
- vcompletion completions/jc_bash_completion.sh zsh _jc
+ vcompletion completions/jc_bash_completion.sh bash
+ vcompletion completions/jc_zsh_completion.sh zsh
}
From faa4cbc484ff7491916ad8f52d12a63035e87736 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 2 Oct 2022 12:30:24 +0200
Subject: [PATCH 224/343] minikube: update to 1.27.0.
---
srcpkgs/minikube/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index 28d18ebbd677..daa5be039a32 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,6 +1,6 @@
# Template file for 'minikube'
pkgname=minikube
-version=1.25.1
+version=1.27.0
revision=1
archs="x86_64* i686* aarch64*"
build_style=go
@@ -16,7 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/kubernetes/minikube"
changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELOG.md"
distfiles="https://github.com/kubernetes/minikube/archive/v$version.tar.gz"
-checksum=a3ee571062ccedd2f07344dd21c3eb9de0ccd1aa3c7431469c2220c896a0324d
+checksum=8978a27cff9bf1450c0cd56e28306e8272150f599a017ba31c2bad57fd9248d2
pre_build() {
local storage_provisioner_tag= iso_version=
From 55e67f14027c1c928f95cc3895ae374a62743fa8 Mon Sep 17 00:00:00 2001
From: Dustin Marquess <jailbird@fdf.net>
Date: Sun, 2 Oct 2022 00:35:49 -0500
Subject: [PATCH 225/343] tinyssh: update to 20220801
---
srcpkgs/tinyssh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 05245c35db62..65e4ec6e7b8b 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,6 +1,6 @@
# Template file for 'tinyssh'
pkgname=tinyssh
-version=20220305
+version=20220801
revision=1
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
license="Public Domain"
homepage="https://tinyssh.org"
distfiles="https://github.com/janmojzis/tinyssh/archive/${version}.tar.gz"
-checksum=26e1f14ee865fc48c173f51efa03aeeb72c44f102a0084ff267693406bd7aebe
+checksum=234656fc8d369608eb5d0f3a26280e0e38e2e6b134cfc610b6e24bce176acd4f
if [ -n "${CROSS_BUILD}" ] ; then
make_build_target=cross-compile
From b66303d01f446dc0ae2fcd0fca516983a0992175 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 1 Oct 2022 23:33:09 +0200
Subject: [PATCH 226/343] libxslt: update to 1.1.37.
---
srcpkgs/libxslt/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index ec65d71f1974..2327035cbe10 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,17 +1,18 @@
# Template file for 'libxslt'
pkgname=libxslt
-version=1.1.35
-revision=2
+version=1.1.37
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-dependency-tracking"
hostmakedepends="docbook-xml docbook-xsl libtool pkg-config python3"
makedepends="libxml2-devel libgcrypt-devel python3-devel"
+checkdepends="libxml2-python3"
short_desc="XSLT parser library from the GNOME project"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://gitlab.gnome.org/GNOME/libxslt"
distfiles="${GNOME_SITE}/libxslt/${version%.*}/libxslt-${version}.tar.xz"
-checksum=8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
+checksum=3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4
python_version=3
CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
From f310ff4452ab5506d34f865a5e972a3c3aaf90fd Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Fri, 30 Sep 2022 20:16:02 +0200
Subject: [PATCH 227/343] ImageMagick: add support for HEIC files
---
srcpkgs/ImageMagick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 3d475bd6a8e1..728539c9ab8d 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -12,7 +12,7 @@ hostmakedepends="automake libtool pkg-config autoconf"
makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
ocl-icd-devel pango-devel libopenjpeg2-devel graphviz-devel liblqr-devel
- libraqm-devel libopenexr-devel"
+ libraqm-devel libopenexr-devel libheif-devel"
short_desc="Create, edit, compose, or convert bitmap images"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
license="ImageMagick"
From 2a92e8021e305cc98940028d43a4743a891c13cd Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 21 Sep 2022 14:37:07 +0530
Subject: [PATCH 228/343] inxi: update to 3.3.21.
---
srcpkgs/inxi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template
index 9bfc1831f109..82e9e0990dc4 100644
--- a/srcpkgs/inxi/template
+++ b/srcpkgs/inxi/template
@@ -1,6 +1,6 @@
# Template file for 'inxi'
pkgname=inxi
-version=3.3.19
+version=3.3.21
revision=1
wrksrc="inxi-${version}-1"
depends="dmidecode file glxinfo pciutils perl usbutils xdpyinfo xprop xrandr
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
homepage="https://smxi.org/docs/inxi.htm"
changelog="https://raw.githubusercontent.com/smxi/inxi/master/inxi.changelog"
distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz"
-checksum=bf8881c140eac6fd266e32db31bcd90d93c5e3d429c426aacfb295d0e57e1bd9
+checksum=19b196e07c881ea8da5ecd628ba6fe607690593eab122c2704f66c932d3dafdd
do_install() {
vbin inxi
From 00db28682f0dd6263df8fccd0715e003a277b395 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 1 Oct 2022 00:48:59 +0530
Subject: [PATCH 229/343] libvterm: update to 0.3.
---
common/shlibs | 2 +-
srcpkgs/libvterm/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 987cff25f146..3297091f7cc0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2483,7 +2483,7 @@ libi3ipc-glib-1.0.so.0 i3ipc-glib-0.6.0_1
libcsound64.so.6.0 csound-6.05.0_1
libcsnd6.so.6.0 csound-6.05.0_1
libfko.so.3 libfko-2.6.9_1
-libvterm.so.0 libvterm-0.0.20151005_1
+libvterm.so.0 libvterm-0.3_1
libboinc_opencl.so.7 boinc-7.16.16_2
libboinc_api.so.7 boinc-7.16.16_2
libboinc_graphics2.so.7 boinc-7.16.16_2
diff --git a/srcpkgs/libvterm/template b/srcpkgs/libvterm/template
index 54d9ad06321a..f03f276d2c27 100644
--- a/srcpkgs/libvterm/template
+++ b/srcpkgs/libvterm/template
@@ -1,6 +1,6 @@
# Template file for 'libvterm'
pkgname=libvterm
-version=0.1.4
+version=0.3
revision=1
build_style=gnu-makefile
make_install_target="install-lib install-inc"
@@ -8,9 +8,9 @@ hostmakedepends="libtool perl pkg-config"
short_desc="Abstract VT220/xterm/ECMA-48 emulation library"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="MIT"
-homepage="http://www.leonerd.org.uk/code/libvterm"
-distfiles="http://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"
-checksum=bc70349e95559c667672fc8c55b9527d9db9ada0fb80a3beda533418d782d3dd
+homepage="https://www.leonerd.org.uk/code/libvterm"
+distfiles="https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"
+checksum=61eb0d6628c52bdf02900dfd4468aa86a1a7125228bab8a67328981887483358
post_extract() {
if [ "$CROSS_BUILD" ]; then
From 573668d98fb91f9ce40d174e00917140da723d13 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 1 Oct 2022 01:12:53 +0530
Subject: [PATCH 230/343] neovim: update to 0.8.0.
Closes: #39552 [via git-merge-pr]
---
srcpkgs/neovim/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index c29b7b6885a1..f8e4b24802e8 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,6 +1,6 @@
# Template file for 'neovim'
pkgname=neovim
-version=0.7.2
+version=0.8.0
revision=1
build_style=cmake
build_helper="qemu"
@@ -8,13 +8,12 @@ configure_args="-DCMAKE_BUILD_TYPE=Release -DCOMPILE_LUA=OFF"
hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack"
makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
LuaJIT-devel libluv-devel tree-sitter-devel"
-depends="libvterm>=0.1.0"
short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="Apache-2.0, custom:Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=ccab8ca02a0c292de9ea14b39f84f90b635a69282de38a6b4ccc8565bc65d096
+checksum=505e3dfb71e2f73495c737c034a416911c260c0ba9fd2092c6be296655be4d18
alternatives="
vi:vi:/usr/bin/nvim
From 717e81402a7587d39ca167ad3fcc58bb46582eb6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 30 Sep 2022 18:20:56 +0530
Subject: [PATCH 231/343] pre-commit: update to 2.20.0.
---
srcpkgs/pre-commit/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 58e2730dde1f..3d96b78a0189 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,17 +1,19 @@
# Template file for 'pre-commit'
pkgname=pre-commit
-version=2.18.1
+version=2.20.0
revision=1
wrksrc="pre_commit-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="nodeenv python3-cfgv python3-identify python3-yaml python3-toml"
+depends="nodeenv python3-cfgv python3-identify python3-yaml
+python3-toml python3-virtualenv"
short_desc="Framework for multi-language pre-commit hooks"
maintainer="Joseph Benden <joe@benden.us>"
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=5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10
+checksum=a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959
make_check=no # No tests available
post_install() {
From f78d227ae1508724675e68efff581b9e0fb5423c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 2 Oct 2022 12:56:52 -0400
Subject: [PATCH 232/343] python3-executing: update to 1.1.0.
---
srcpkgs/python3-executing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-executing/template b/srcpkgs/python3-executing/template
index 6813ea7a4af5..837f283b5a61 100644
--- a/srcpkgs/python3-executing/template
+++ b/srcpkgs/python3-executing/template
@@ -1,6 +1,6 @@
# Template file for 'python3-executing'
pkgname=python3-executing
-version=1.0.0
+version=1.1.0
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/alexmojaki/executing"
distfiles="${PYPI_SITE}/e/executing/executing-${version}.tar.gz"
-checksum=98daefa9d1916a4f0d944880d5aeaf079e05585689bebd9ff9b32e31dd5e1017
+checksum=2c2c07d1ec4b2d8f9676b25170f1d8445c0ee2eb78901afb075a4b8d83608c6a
do_check() {
PYTHONPATH="$(cd build/lib* && pwd)" python3 tests/test_main.py
From 61fe26d9ddff4f9f4f4329a0de76ed79f466fffb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 2 Oct 2022 12:57:56 -0400
Subject: [PATCH 233/343] python3-pytz: update to 2022.4.
---
srcpkgs/python3-pytz/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytz/template b/srcpkgs/python3-pytz/template
index 7bd2402f9a24..d8e7dae4084a 100644
--- a/srcpkgs/python3-pytz/template
+++ b/srcpkgs/python3-pytz/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytz'
pkgname=python3-pytz
-version=2022.2.1
+version=2022.4
revision=1
wrksrc="pytz-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://pythonhosted.org/pytz/"
distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz"
-checksum=cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5
+checksum=48ce799d83b6f8aab2020e369b627446696619e79645419610b9facd909b3174
post_install() {
# use system tz database
From 8e1e3de21bd96c70b2204eaa64e8d17e20ad35a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 2 Oct 2022 12:57:46 -0400
Subject: [PATCH 234/343] python3-iso8601: update to 1.1.0.
---
srcpkgs/python3-iso8601/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-iso8601/template b/srcpkgs/python3-iso8601/template
index 22d4ade77de8..76080b157e35 100644
--- a/srcpkgs/python3-iso8601/template
+++ b/srcpkgs/python3-iso8601/template
@@ -1,6 +1,6 @@
# Template file for 'python3-iso8601'
pkgname=python3-iso8601
-version=1.0.2
+version=1.1.0
revision=1
wrksrc="iso8601-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/micktwomey/pyiso8601"
distfiles="${PYPI_SITE}/i/iso8601/iso8601-${version}.tar.gz"
-checksum=27f503220e6845d9db954fb212b95b0362d8b7e6c1b2326a87061c3de93594b1
+checksum=32811e7b81deee2063ea6d2e94f8819a86d1f3811e49d23623a41fa832bef03f
replaces="python3-iso-8601>=0"
post_install() {
From abcc4d1abf6242ef78faae33c512a60415dd8b75 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 2 Oct 2022 12:57:34 -0400
Subject: [PATCH 235/343] python3-imageio: update to 2.22.0.
---
srcpkgs/python3-imageio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 3a9a1e529151..5c84b2cc91f5 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
# Template file for 'python3-imageio'
pkgname=python3-imageio
-version=2.21.3
+version=2.22.0
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-2-Clause"
homepage="https://github.com/imageio/imageio"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=bf9fe62c0e84aeb802ec64b9b5015373ff02fa08c98797629e88af7625bc31d8
+checksum=076682035ca0b75fc752ed780472822dbacae6ecaa130c109908129c1fee18f8
post_install() {
vlicense LICENSE
From 7b38e9b1b8b78d07bff2d5afceacb1ccc56de0fb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 1 Oct 2022 20:46:53 -0400
Subject: [PATCH 236/343] websocat: update to 1.11.0
---
srcpkgs/websocat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index 7a35af8f877e..144b09957990 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,6 +1,6 @@
# Template file for 'websocat'
pkgname=websocat
-version=1.10.1
+version=1.11.0
revision=1
build_style=cargo
configure_args="--features=ssl"
@@ -11,7 +11,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
homepage="https://github.com/vi/websocat"
distfiles="https://github.com/vi/websocat/archive/v${version}.tar.gz"
-checksum=5256629b0b063b51aad317dbd8f385ad0d56cc4155621d9bb0f6484aa2e7c95c
+checksum=943d6f66045658cca7341dd89fe1c2f5bdac62f4a3c7be40251b810bc811794f
post_install() {
vlicense LICENSE
From 509430c6e824fcfc6c10f61e07cccfbed3089f4f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 28 Sep 2022 00:17:45 +0200
Subject: [PATCH 237/343] toxcore: update to 0.2.18, add tox-bootstrapd
service, adopt
---
srcpkgs/toxcore/files/tox-bootstrapd/run | 4 ++++
srcpkgs/toxcore/template | 24 ++++++++++++++++++------
2 files changed, 22 insertions(+), 6 deletions(-)
create mode 100755 srcpkgs/toxcore/files/tox-bootstrapd/run
diff --git a/srcpkgs/toxcore/files/tox-bootstrapd/run b/srcpkgs/toxcore/files/tox-bootstrapd/run
new file mode 100755
index 000000000000..e9acbdd6ee95
--- /dev/null
+++ b/srcpkgs/toxcore/files/tox-bootstrapd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _tox_bootstrapd tox-bootstrapd --foreground ${OPTS:-"--config=/etc/tox-bootstrapd.conf"}
diff --git a/srcpkgs/toxcore/template b/srcpkgs/toxcore/template
index 863ef10268af..d43928dfa5ac 100644
--- a/srcpkgs/toxcore/template
+++ b/srcpkgs/toxcore/template
@@ -1,22 +1,34 @@
# Template file for 'toxcore'
pkgname=toxcore
-version=0.2.13
+version=0.2.18
revision=1
wrksrc="c-toxcore-${version}"
build_style=cmake
-configure_args="-DMUST_BUILD_TOXAV=ON -DBUILD_TOXAV=ON"
+configure_args="-DMUST_BUILD_TOXAV=ON -DBUILD_TOXAV=ON -DDHT_BOOTSTRAP=OFF
+ -DBOOTSTRAP_DAEMON=ON"
hostmakedepends="pkg-config"
makedepends="libconfig-devel libsodium-devel libvpx-devel opus-devel"
short_desc="Encrypted peer-to-peer instant messenger protocol library"
-maintainer="Spencer Hill <spencernh77@gmail.com>"
+maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-3.0-or-later"
homepage="https://tox.chat"
changelog="https://raw.githubusercontent.com/TokTok/c-toxcore/master/CHANGELOG.md"
-distfiles="https://github.com/TokTok/c-toxcore/archive/v${version}.tar.gz"
-checksum=67114fa57504c58b695f5dce8ef85124d555f2c3c353d0d2615e6d4845114ab8
+distfiles="https://github.com/TokTok/c-toxcore/releases/download/v${version}/c-toxcore-${version}.tar.gz"
+checksum=f2940537998863593e28bc6a6b5f56f09675f6cd8a28326b7bc31b4836c08942
+
+conf_files="/etc/tox-bootstrapd.conf"
+system_accounts="_tox_bootstrapd"
+make_dirs="/var/lib/tox-bootstrapd 0700 _tox_bootstrapd _tox_bootstrapd"
+_tox_bootstrapd_homedir="/var/lib/tox-bootstrapd"
+_tox_bootstrapd_desc="Account to run Tox's DHT bootstrap daemon"
+
+if [ "${XBPS_CHECK_PKGS}" ]; then
+ configure_args+=" -DAUTOTEST=ON"
+fi
post_install() {
- vsconf other/bootstrap_daemon/tox-bootstrapd.conf
+ vconf other/bootstrap_daemon/tox-bootstrapd.conf
+ vsv tox-bootstrapd
}
toxcore-devel_package() {
From 15d1cb6aabf945fef141b7a58d72e237331eb0ec Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Sun, 2 Oct 2022 20:46:47 +0200
Subject: [PATCH 238/343] pyradio: update to 0.8.9.28
---
srcpkgs/pyradio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 9e6c7211359b..aed19934c2e3 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
# Template file for 'pyradio'
pkgname=pyradio
-version=0.8.9.27
+version=0.8.9.28
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
homepage="http://www.coderholic.com/pyradio/"
changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=9ef8bef4e38b5e9ae71359d7af9bc0d5f90d4e6456360219abd230a62e143bcc
+checksum=3e973ae2bdf33ebd7db83c6e27c1abeadecd82134b5445b06d9f508459504622
make_check=no # pytest reports "no tests ran"
post_install() {
From 7fb93a92de325406f1b2f30e5ce2fccd9221036d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 2 Oct 2022 16:37:23 +0200
Subject: [PATCH 239/343] exiftool: update to 12.46.
---
srcpkgs/exiftool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index cf1c5d42ae87..9023c1901fde 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
# Template file for 'exiftool'
pkgname=exiftool
-version=12.45
+version=12.46
revision=1
wrksrc="Image-ExifTool-${version}"
build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://exiftool.org/"
changelog="https://exiftool.org/history.html"
distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=c2c0ad1c881593e56f7a0ce508b240529d7da52583af1d553e107704e28cbe42
+checksum=d3fff083f3c14abb34edc5f68b946f93f993e3238f14fa9171d02202c6a0e079
From 67d9b54c82dd6f0b53c28ca9215a4ff64ae4e0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 2 Oct 2022 16:26:48 +0200
Subject: [PATCH 240/343] qpdf: update to 11.1.1.
---
srcpkgs/qpdf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 9791caa65605..f8c22af33de5 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
# Template file for 'qpdf'
pkgname=qpdf
-version=11.1.0
+version=11.1.1
revision=1
build_style=cmake
hostmakedepends="perl pkg-config"
@@ -11,7 +11,7 @@ license="Apache-2.0"
homepage="https://github.com/qpdf/qpdf"
changelog="https://raw.githubusercontent.com/qpdf/qpdf/stable/manual/release-notes.rst"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c6cd5a09806a82ea1f75aa467b1b7a1f59694472b4c4d9d732ba3b7fa241d9dc
+checksum=785edab622a1bc7e25e1537ad2c325005d48c5c7957f7abedff405deb80fa59a
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 378e65a4ede793cee21eec33cc0b8498a25d01ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:31 +0200
Subject: [PATCH 241/343] attica: update to 5.98.0.
---
srcpkgs/attica/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 92b42718d9f8..4273051d60ac 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
# Template file for 'attica'
pkgname=attica
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/attica"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5f82aac64fc59376eaca14190e7a31d3697b41f9468375f43ef0890573b3832
+checksum=d74e356e264238b2c71012ebc55a5090183c6bf7b0096ba51838a82805373c70
do_check() {
cd build
From fc28620abe756e33b6ce6552a0ead117bee814bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:33 +0200
Subject: [PATCH 242/343] baloo5: update to 5.98.0.
---
srcpkgs/baloo5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index c5bce40ed8f1..cb24e5df9127 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
# Template file for 'baloo5'
pkgname=baloo5
-version=5.97.0
+version=5.98.0
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://community.kde.org/Baloo"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=1f869c0eecca5b27bac4b51a29f5782725f2123430946e6a8f1fcc56beba5968
+checksum=3c8778cb3d0fe8139af2152499270013a1f8eb09988814cbd696febc2d2da174
do_check() {
cd build
From fb3e64735dfe065fa56c08df75693e86005ba021 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:34 +0200
Subject: [PATCH 243/343] bluez-qt5: update to 5.98.0.
---
srcpkgs/bluez-qt5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 8023b0dde4ec..c0ef01e0392d 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
# Template file for 'bluez-qt5'
pkgname=bluez-qt5
-version=5.97.0
+version=5.98.0
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/bluez-qt"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=033a9fd5f3a8bcf54649bae79dbad036f8c4cf74683809c1c908807270e6ea99
+checksum=4fdc9835eb24dea9ce9959734a69332c66a84a3f3a97682f0b22d9a923165340
do_check() {
cd build
From a3e309e365cef676820eb5b971b71f3ec8dffed7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:37 +0200
Subject: [PATCH 244/343] breeze-icons: update to 5.98.0.
---
srcpkgs/breeze-icons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 3b9d7f6a6f09..c45776739717 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
# Template file for 'breeze-icons'
pkgname=breeze-icons
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-3.0-or-later"
homepage="https://community.kde.org/Frameworks"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6eae442282779802c348e91080132d52b0229288cc8793b2aaa6f906e39171a3
+checksum=57ea7d0fe96a520cb63828d0a6f44de92673a81ede4a7f25d8dd6ac760dd7f28
nostrip=yes
if [ -z "$CROSS_BUILD" ]; then
From 2ed28bcc63f0fe5f64f63bd7ef08ca6d7d61ab86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:38 +0200
Subject: [PATCH 245/343] extra-cmake-modules: update to 5.98.0.
---
srcpkgs/extra-cmake-modules/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 652bdcac8948..056eb7546948 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
# Template file for 'extra-cmake-modules'
pkgname=extra-cmake-modules
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9ed235f3dad82ba67dc61eeab12536b6d5936c036d32d7e7d2f38a17b9efc50a
+checksum=3c198f9e4840a0fbfb8d322f2f2711daae20e5bbfd68e998ba9078bc51aac918
python_version=3
do_check() {
From 8e33f5e5991272e63a00f046f9b7784f61c3dc47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:40 +0200
Subject: [PATCH 246/343] frameworkintegration: update to 5.98.0.
---
srcpkgs/frameworkintegration/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 7ef29d2fa71c..5736ead443aa 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
# Template file for 'frameworkintegration'
pkgname=frameworkintegration
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/frameworkintegration"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3b6822538383ae4a152498c09024c02c03c97742e40a1fe3bdb08eb5ed4332eb
+checksum=d8c4ebed8cf573daa6916f089d596ab345cbbf5016c379a525155224e5b32ad7
frameworkintegration-devel_package() {
short_desc+=" - development"
From 67533b84365529776091502094339ab6ae667569 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:42 +0200
Subject: [PATCH 247/343] kactivities5-stats: update to 5.98.0.
---
srcpkgs/kactivities5-stats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 1bf74cc57443..8d6ba9223100 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
# Template file for 'kactivities5-stats'
pkgname=kactivities5-stats
-version=5.97.0
+version=5.98.0
revision=1
wrksrc="${pkgname/5/}-${version}"
build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e8a6c3b02dc9c3d9c250d44fa4b5a2e6c553bc8c0457e23ce7664274cdb88bdb
+checksum=a8af6c60a1077dd0865b966839f49a8720a0a2e46acbd513e521391eea1c7c7f
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
From 6d16004c651c861dcab9a156b627e86a12146eee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:44 +0200
Subject: [PATCH 248/343] kactivities5: update to 5.98.0.
---
srcpkgs/kactivities5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 9663370ada8a..fffcc0d675b1 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
# Template file for 'kactivities5'
pkgname=kactivities5
-version=5.97.0
+version=5.98.0
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kactivities"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d12dbb6e6ff62244eb090027a00f72a4816358b1a18d7b96df8371865a06cf37
+checksum=31b5a957192b02e10b10ee46f95b6dbf4d56f8720876415581b7a2153c42f958
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools"
From 4afff2dd9307ae229a223b04ace43eb65607c152 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:46 +0200
Subject: [PATCH 249/343] kapidox: update to 5.98.0.
---
srcpkgs/kapidox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 91e333d0f76f..e08a1e17d957 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
# Template file for 'kapidox'
pkgname=kapidox
-version=5.97.0
+version=5.98.0
revision=1
build_style=python3-module
hostmakedepends="python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-2-Clause, CC0-1.0"
homepage="https://invent.kde.org/frameworks/kapidox"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9d8fc3011350c2a4cb421153cd67990f3e69c0cd7226b9d9f1956460360be965
+checksum=566cf41abcf30e98ff591d0ef49fad97ea4a33b2222561276cb895bd229a58cc
post_install() {
vlicense LICENSES/BSD-2-Clause.txt
From 6754cae596ec883aa9a4a29bad33b44bad48da76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:47 +0200
Subject: [PATCH 250/343] karchive: update to 5.98.0.
---
srcpkgs/karchive/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index b973d1203030..5b0949d6f904 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
# Template file for 'karchive'
pkgname=karchive
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/karchive"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1bff8249ddbb5a38916c9e145e5027de3f18a14772e7a8bdd4a954fae7ca8d92
+checksum=02c7c60c35c9ad0611d70be3186f017a716c201a51de8bc137e5191e833cf2c6
karchive-devel_package() {
short_desc+=" - development"
From 4c6bd9b4b8cd01511a19770503d0741bfc0dc83f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:49 +0200
Subject: [PATCH 251/343] kauth: update to 5.98.0.
---
srcpkgs/kauth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index fd6f51b98eb7..931be05ba2b4 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
# Template file for 'kauth'
pkgname=kauth
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kauth"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d74dc553b3628657241d6e7129b17a38e5fd3b26b21de000390382c871ca42f5
+checksum=e6975e4d5f3e0218b1e75ec5bc71806c1b92a57389d2fb1f0bf8ae5845dfed5b
do_check() {
cd build
From bb135db068c37d25d64ff041a1ee5f07a1d547f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:51 +0200
Subject: [PATCH 252/343] kbookmarks: update to 5.98.0.
---
srcpkgs/kbookmarks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 2a0f1dec5c34..f01211086656 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
# Template file for 'kbookmarks'
pkgname=kbookmarks
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only"
homepage="https://invent.kde.org/frameworks/kbookmarks"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=776dac6741d15dd02593891ad1b5d9ca3598df5edb3d431ed9e8c1386ae16b6a
+checksum=71e3ec3b5523656b0aa0089a8e8837e9823517654dde31c5e5625ddbc5c7f2e6
kbookmarks-devel_package() {
short_desc+=" - development"
From 140a4867170bbd2ba7ddc3e5b9e8ea237e9f73dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:52 +0200
Subject: [PATCH 253/343] kcalendarcore: update to 5.98.0.
---
srcpkgs/kcalendarcore/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 507ed734073d..48c3600169e6 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
# Template file for 'kcalendarcore'
pkgname=kcalendarcore
reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8a7ae053f0620e51e36b04a29240425f293077bad5a8298ed9c09ce97f4e690
+checksum=d3abd98486515b91345186cc05f18531247645a428867f804d8d7ea9afa66c9a
replaces="kcalcore>=0"
do_check() {
From 82727fe5cf6283ca287b96720e3ad097ef50ed93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:54 +0200
Subject: [PATCH 254/343] kcmutils: update to 5.98.0.
---
srcpkgs/kcmutils/patches/cross.patch | 11 -----------
srcpkgs/kcmutils/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/kcmutils/patches/cross.patch
diff --git a/srcpkgs/kcmutils/patches/cross.patch b/srcpkgs/kcmutils/patches/cross.patch
deleted file mode 100644
index d56e56eb50f5..000000000000
--- a/srcpkgs/kcmutils/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt 2022-08-07 15:19:37.000000000 +0200
-+++ - 2022-09-11 10:33:06.432528721 +0200
-@@ -28,7 +28,7 @@
-
-
- include(CMakeDependentOption)
--cmake_dependent_option(TOOLS_ONLY "Only build the tools and not the rest of KCMUtils" OFF "NOT CMAKE_CROSSCOMPILING" ON)
-+option(TOOLS_ONLY "Only build the tools and not the rest of KCMUtils" OFF)
- if (TOOLS_ONLY)
- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
- add_subdirectory(tools)
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index e074e8cbcaf5..9450427b877f 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
# Template file for 'kcmutils'
pkgname=kcmutils
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.0-only"
homepage="https://invent.kde.org/frameworks/kcmutils"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad1907b5347a907cfa2ff0ef37432d4f1f6b6abbaac2866b75a590b8926a5a75
+checksum=1d1740f3a115111802fcd58c3f7c3e52ca77f65e2c449859ccdd4a132279134b
kcmutils-devel_package() {
short_desc+=" - development"
From 7b274fc2931a10e64cd15c0f54a5828e5a34db60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:56 +0200
Subject: [PATCH 255/343] kcodecs: update to 5.98.0.
---
srcpkgs/kcodecs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 24b35e000a0c..7553ed4d89cc 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
# Template file for 'kcodecs'
pkgname=kcodecs
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kcodecs"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=63e6e517a80395faea285968fd13f5e477a7437cb28c7028e9e678fc068d2670
+checksum=9fc9403290f0f933b3f2e3bc182d008dce2048c481544ff7b9bd889cf4c92058
kcodecs-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From ac8eeeeecd1d9806b901e18fb00f4913ef73c209 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:57 +0200
Subject: [PATCH 256/343] kcompletion: update to 5.98.0.
---
srcpkgs/kcompletion/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0a421f359dd2..e7fd8144c919 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
# Template file for 'kcompletion'
pkgname=kcompletion
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kcompletion"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6ab1e04ed3cc83f28a88224a661e5cd6a097e1a7d305987320dd8bd0c37b9ea6
+checksum=4e33958a642764f91e32f8155ac6abacf1ed63fadec8d70c857bea0f408b3ba4
kcompletion-devel_package() {
short_desc+=" - development"
From a3210696889c2654e26fdcad114f4be744f983ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:15:59 +0200
Subject: [PATCH 257/343] kconfig: update to 5.98.0.
---
srcpkgs/kconfig/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 6fbb971aedb2..41487390b09e 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
# Template file for 'kconfig'
pkgname=kconfig
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kconfig"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90fe770c7f9c3a933b4e1f3576cf70c15d1db70b86bc9cfa9e4ad289e053f62d
+checksum=5ece35a8309a950c240f4dc9f8b3e2f7e0f377fdf654df90c10299ecde5ba296
do_check() {
cd build
From 5010873d48ddc18d0d29b84069cfb03d5b8f0216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:01 +0200
Subject: [PATCH 258/343] kconfigwidgets: update to 5.98.0.
---
srcpkgs/kconfigwidgets/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 4f6020ae4e7d..695126c87cf5 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
# Template file for 'kconfigwidgets'
pkgname=kconfigwidgets
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kconfigwidgets"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20c6016c06a0d24a97af5cd36ed319eee918af051a62265f3f51c7c1c6c58428
+checksum=eb3420af0bab13f1a55fac3c796005d140a68b29c52fd9f5a7cdccc270a37c15
kconfigwidgets-devel_package() {
short_desc+=" - development"
From 2042dde0a1f1bbacface90a5db054788bd5d05a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:03 +0200
Subject: [PATCH 259/343] kcontacts: update to 5.98.0.
---
srcpkgs/kcontacts/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index aae8cb2d1b0a..b0ad96f48e4a 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
# Template file for 'kcontacts'
pkgname=kcontacts
reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kcontacts"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b8196901ec5febcbfe961eb7a57ba41f3a5ed99a74a674c0a8fb5113eb93d908
+checksum=0684e80bfd9a2b5674930c3efe6819be91e235122275d90f97f0bc9c6278743c
kcontacts-devel_package() {
short_desc+=" - development"
From 87595769921b687053258fdb9c21d1b5fd466bed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:04 +0200
Subject: [PATCH 260/343] kcoreaddons: update to 5.98.0.
---
srcpkgs/kcoreaddons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 526b99f8617e..03f4d517aa70 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
# Template file for 'kcoreaddons'
pkgname=kcoreaddons
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kcoreaddons"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=09403513873e4fc3d9d2d13fb486d9cce0bc6bd5fde0b1c7b2481e0a404202aa
+checksum=a2e42853ab12e7da4799287e62cfe4ed7846cc1ea6abfadac3811fae71f71553
post_install() {
vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
From 76a1e861558a9c98fe505390a7ae6b34787221bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:06 +0200
Subject: [PATCH 261/343] kcrash: update to 5.98.0.
---
srcpkgs/kcrash/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index b8c50876757f..c00989e6b1ce 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
# Template file for 'kcrash'
pkgname=kcrash
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kcrash"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef71248d1d30c1848ab5f553d38c3230f1fe7b0888b2ee8eebfba72d02a8f5c6
+checksum=6e9aee305e31fa89c38e905c66c917b11587922edbcac55f6f25dc27531f6a0d
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
From 3500e8132c07ebd257d607c4c066136a95e3503a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:08 +0200
Subject: [PATCH 262/343] kdav: update to 5.98.0.
---
srcpkgs/kdav/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index ede7f391bf15..3880b126a04c 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
# Template file for 'kdav'
pkgname=kdav
reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kdav"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d58d8435eef1f57f0e7d207d63e002e29e0067e2621c522dfcba6f5df4fca5db
+checksum=f137a1fbe9acd29ef0dc320c233c42162a46a8a976f5a5c3b20ffb3387228708
kdav-devel_package() {
depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
From 3fcbb0bd2f2ff5c96518f4e91c4a8ca05ed93b5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:09 +0200
Subject: [PATCH 263/343] kdbusaddons: update to 5.98.0.
---
srcpkgs/kdbusaddons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 64aca60142ed..595aa2bac14d 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
# Template file for 'kdbusaddons'
pkgname=kdbusaddons
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kdbusaddons"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=13c7e82914bf1e594fcaafe8a1cfdb4607bc75a58a10b5a04fead84fe412122d
+checksum=0a24e2c3fc8c1e8af70bfd76439f81fa0f35fb50f1711fe22db68bc82cad8d3b
do_check() {
cd build
From f96002025050eb53da29579c1a7a7ce9a41ccba6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:11 +0200
Subject: [PATCH 264/343] kdeclarative: update to 5.98.0.
---
srcpkgs/kdeclarative/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index e5ee36e8a8f1..ff152974c561 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
# Template file for 'kdeclarative'
pkgname=kdeclarative
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kdeclarative"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=be68d2983643616e257d7a4cc07f87e5e2219abc3ce9cf5500e0fc9e46185a70
+checksum=0672c0b57be19d1efa2b208f9836e2f0c1f67a2aab39d3cff29bc36f5965ba78
do_check() {
cd build
From 748d2541bf4816e25ae8e7cc82df88e4be98a937 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:12 +0200
Subject: [PATCH 265/343] kded: update to 5.98.0.
---
srcpkgs/kded/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index f8563ba7be12..a171f0b59c07 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
# Template file for 'kded'
pkgname=kded
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kded"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4bdc348378f794aef9bc4f5dcae5a5d5a781a43bae64fdb9c8a04717e15ff6a7
+checksum=e5b47670442798dfb1b4a771d6e4be30cc12b730add2c3ab6c7b3b186deb1ecd
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
From 6b1d93caaebb187cb8b74499da2a1ae48c222a8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:14 +0200
Subject: [PATCH 266/343] kdelibs4support: update to 5.98.0.
---
srcpkgs/kdelibs4support/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index 789f4f9356ff..3d331445bcbd 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
# Template file for 'kdelibs4support'
pkgname=kdelibs4support
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kdelibs4support"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1adfdd09e61dd183de1dfbd1cd24e26ef69ab6429a0cfc292992a7f240244111
+checksum=0ead944e9ada2adf8fde2724762dcb6ee265e6aa368b94b3147ce6c062cfde43
if [ "$CROSS_BUILD" ]; then
# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
From 3ffd13014e282d832e7ee595464cd984dd0eafb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:16 +0200
Subject: [PATCH 267/343] kdesignerplugin: update to 5.98.0.
---
srcpkgs/kdesignerplugin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 62c33ca3948c..0e9a6defb8ae 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
# Template file for 'kdesignerplugin'
pkgname=kdesignerplugin
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-only"
homepage="https://invent.kde.org/frameworks/kdesignerplugin"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=28077f1a1b416c2e19f7b8fae1a96d1bde6e4dd8c90905adbe87bb1f2df3fd20
+checksum=ef186dffa0ab9b77491dc074611cfc9bbf8607ac1f2b027a65bf4c43b792609d
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools kgendesignerplugin kdoctools"
From 011a5d15f0863ea5d8443606cae92e34d322e542 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:18 +0200
Subject: [PATCH 268/343] kdesu: update to 5.98.0.
---
srcpkgs/kdesu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index ce413df2ff2d..fcea7128c0fb 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
# Template file for 'kdesu'
pkgname=kdesu
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only"
homepage="https://invent.kde.org/frameworks/kdesu"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=652eb62f3a1f5600b15b1e42ff4d2542ccc9786244b58b73baa4511964d64fb3
+checksum=629fe9bce7c106a6ad9379fd0174e518a0f5b74e1ae2cda985944c17ff59cb95
kdesu-devel_package() {
short_desc+=" - development"
From d753e8cbe81cd7b768a62af7994b2120d5539789 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:20 +0200
Subject: [PATCH 269/343] kdewebkit: update to 5.98.0.
---
srcpkgs/kdewebkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index b0c5cb0bc424..b52f766dca3f 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
# Template file for 'kdewebkit'
pkgname=kdewebkit
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kdewebkit"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ee24fa1f7ef215d34110e10f3f27470f25f926a00c4d37024db69af3165332b6
+checksum=c404acf67d89acc6aeff0f4f0c71724f662fc2397933810f27d2f500ffe37c0d
kdewebkit-devel_package() {
short_desc+=" - development"
From eed8208714cf4bed9bec5dc996cbc6f149cd089e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:22 +0200
Subject: [PATCH 270/343] kdnssd: update to 5.98.0.
---
srcpkgs/kdnssd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index fa9db95b23dd..f3021fb4cd0a 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
# Template file for 'kdnssd'
pkgname=kdnssd
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kdnssd"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4d04d691c813217abc26c15654f8068687487ad6e644b57d45de19b0c8e2b452
+checksum=8f6ced2da202755461552a1c5e822b4915d417ce2486e1af4d5f36161ec09271
kdnssd-devel_package() {
short_desc+=" - development"
From 22f41725bdfcd98ee157e1e434c642d23ee598be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:24 +0200
Subject: [PATCH 271/343] kdoctools: update to 5.98.0.
---
srcpkgs/kdoctools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index ed7b968be6d6..2331720ca669 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
# Template file for 'kdoctools'
pkgname=kdoctools
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kdoctools"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61ac72b2d338cddc6da57b9097287303117e0d49ccd1c717f69f38ac01150af6
+checksum=1a32f311d63d0cf4a286d1e2cac87085da58656196b78cd858555bdfb492f779
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
From d4174fbcfcf5b5fcf2ccc25bbe97aaeb5b0d4a78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:26 +0200
Subject: [PATCH 272/343] kemoticons: update to 5.98.0.
---
srcpkgs/kemoticons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index e2ae26dfc2b9..9c66065c29b0 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
# Template file for 'kemoticons'
pkgname=kemoticons
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later, CC-BY-4.0"
homepage="https://invent.kde.org/frameworks/kemoticons"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e25afceabb2cd35ae6f38b9e2d40c88d6ec20077b700971cec08147a6041310a
+checksum=0276363b5d0bb45f2f2a93b44ef36b2e0f9154fb722f5d929579627bab046d38
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
From cd753437e7bf6adc1a4197e8fe41c0ce39312fb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:27 +0200
Subject: [PATCH 273/343] kfilemetadata5: update to 5.98.0.
---
srcpkgs/kfilemetadata5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 067d698448a2..a8a6b4d6a5cf 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
-version=5.97.0
+version=5.98.0
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kfilemetadata"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3f2fd85176d7550de8f0af31ba90976b6b50ed277f7c881d1666e082edd07021
+checksum=7666c30cc99a1c09344bdbf2fdbfdc591b48c3481f4559f2702e4ea121d55bdb
kfilemetadata5-devel_package() {
short_desc+=" - development"
From 9f79d7e9fcd351c42f79983b0a02ba6186e7b036 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:29 +0200
Subject: [PATCH 274/343] kglobalaccel: update to 5.98.0.
---
srcpkgs/kglobalaccel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 507caacb3b3f..b9cee14320cd 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
# Template file for 'kglobalaccel'
pkgname=kglobalaccel
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kglobalaccel"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5c4d3538228279aae7a6f3183e2a24c0c1ccabd95cdb0693eaa343599e7ab31
+checksum=949d71f6359da0927d1f95d7f57ab14a5d871be3a251606c34aaeb7ee99926ef
kglobalaccel-devel_package() {
short_desc+=" - development"
From 28b15d38f56bea36ced0318167e86004a2ae5f3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:30 +0200
Subject: [PATCH 275/343] kguiaddons: update to 5.98.0.
---
srcpkgs/kguiaddons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 96ccc9d6801f..186a64814b06 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
# Template file for 'kguiaddons'
pkgname=kguiaddons
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kguiaddons"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb78595f0f98435f87047d662b1e124ea2cd5edd279dbccb857d4d8f06967582
+checksum=12dbee2c4e9b095b3167c83ab658db15f10be310229e10309db8c1890a725808
build_options="wayland x11"
build_options_default="wayland x11"
From 66b5ac301f4080954e461077653ea62501da9b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:32 +0200
Subject: [PATCH 276/343] kholidays: update to 5.98.0.
---
srcpkgs/kholidays/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index eb47fae5893e..ad0a788a3654 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
# Template file for 'kholidays'
pkgname=kholidays
reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kholidays"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=728f7a777c49b2748eac98a82fb8532a806804064bad0e1f2c17ea5cf7c9b82c
+checksum=e0fe8bbd4dfabcea9a31310d4256e381ba0baf2d48c7076cbe33771fb9285c7b
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"
From b0c8a3e2338bd02b8f2a517298d9e61cc2b94629 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:33 +0200
Subject: [PATCH 277/343] khtml: update to 5.98.0.
---
srcpkgs/khtml/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 3d95b82425e6..c63efbb91759 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
# Template file for 'khtml'
pkgname=khtml
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/khtml"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6c16493749a28bb76fdd2d31158a60fc02016ac3a45316581ea5824fc619bb91
+checksum=25a6e60d6bd6fd165ce0a7325cb5bdb924528a714d5481dd50868b686ee6d42d
khtml-devel_package() {
short_desc+=" - development"
From ab6ebced8b5c152dc2dbffdebb8a6293f28e2ca4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:35 +0200
Subject: [PATCH 278/343] ki18n: update to 5.98.0.
---
srcpkgs/ki18n/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79c1cf0e9186..3c78fa8c5101 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
# Template file for 'ki18n'
pkgname=ki18n
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/ki18n"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=032f6d6f78c815ab2630a559ebf4c4a3737147fb35f327d213a171acf6f81e1e
+checksum=87d00d09befed44a985f1fa7d931f689e0c4c56e286d392ff6142e2ff628792c
ki18n-devel_package() {
short_desc+=" - development"
From e8386894608548f2a77974958a105a658bd4e27d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:37 +0200
Subject: [PATCH 279/343] kiconthemes: update to 5.98.0.
---
srcpkgs/kiconthemes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 0c30efab5a79..66d07b15a6d1 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
# Template file for 'kiconthemes'
pkgname=kiconthemes
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, GPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kiconthemes"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94f1c6a8aeabfe5b3f2db4bb308546e4941afbc3ba8743c00ed746b360aa9a11
+checksum=1d4feb37254f9a03af321b2f0a7b8e4f020528bd258d029be8bc2ef53a6ab4e2
kiconthemes-devel_package() {
short_desc+=" - development"
From c38fd6b6bb06c336bf44a6f55ab4068be06ca7fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:39 +0200
Subject: [PATCH 280/343] kidletime: update to 5.98.0.
---
srcpkgs/kidletime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index bb6d1fc5fc57..99d89d52f9c7 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
# Template file for 'kidletime'
pkgname=kidletime
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kidletime"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=35a10914c694a03e2f45b969edd87dc8dc72fb30c44947dd8dfa3b45efc5042b
+checksum=93b13854c97625a93efc00e6da12e2876a6abb48cfff8cc3ffd462a8e394abc9
kidletime-devel_package() {
short_desc+=" - development"
From 0b8d4528c1d1ff36d300682385c7503516ac143e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:41 +0200
Subject: [PATCH 281/343] kimageformats: update to 5.98.0.
---
srcpkgs/kimageformats/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 5c94e5e35022..8af5fe7f53e7 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
# Template file for 'kimageformats'
pkgname=kimageformats
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kimageformats"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eb83362fb98b2a9eba02c434fe5ab137a29f9a33101553adeb3e12d88bc05211
+checksum=de594d949a79ffd3729fc84e9f659d64a2d41849ff5684472153620169c8926c
From 897df0cb1888c8ca6aeaf84f1e9827da611c996a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:43 +0200
Subject: [PATCH 282/343] kinit: update to 5.98.0.
---
srcpkgs/kinit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 6d5e7dd3dc78..e4a25319abbc 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
# Template file for 'kinit'
pkgname=kinit
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only"
homepage="https://invent.kde.org/frameworks/kinit"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5856ac46acb27be6e5dba041d2cc24b6f430c49379cc97b116d8c0dd40444ca5
+checksum=81048855d7cbe2a23a990898b369a08e3984129c6bfc573ca4f6463f3e24c510
kinit-devel_package() {
short_desc+=" - development"
From 596d2a60f964cf8fe04410181200d660fe7ed7bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:45 +0200
Subject: [PATCH 283/343] kio: update to 5.98.0.
---
srcpkgs/kio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 44fdfe1a47c2..f027629821a7 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
# Template file for 'kio'
pkgname=kio
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kio"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cc9b80507a8eb49470b9352c4171ab194cc6ab3cb6e80793d6c7a05181675887
+checksum=2dd4b9c96da113b6b9b2a48b1083805706defb44640b6844ab785835d49d317c
do_check() {
: # Pain to get working in limited enviroment, excpects e.g. real disks
From 284c8a51c16794be311e8dbc85b766cafcfd259b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:47 +0200
Subject: [PATCH 284/343] kirigami2: update to 5.98.0.
---
srcpkgs/kirigami2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 3ad1ef903748..3a51e75441fd 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
# Template file for 'kirigami2'
pkgname=kirigami2
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://techbase.kde.org/Kirigami"
distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=449edf327ecce026443bbf30552ba86b4fe94806d2f5ce3fa19491e1aef0d604
+checksum=46cf0701de6ace010c186e76654f3be8b9910a8167f7377cb1e5d57c337f0fd0
kirigami2-devel_package() {
short_desc+=" - development"
From f5d2b9a9a0fc03a7b1babf732c34af453081ca41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:48 +0200
Subject: [PATCH 285/343] kitemmodels: update to 5.98.0.
---
srcpkgs/kitemmodels/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index a5338e062362..36641cc598af 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
# Template file for 'kitemmodels'
pkgname=kitemmodels
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kitemmodels"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7c5d1bab28b864dd4f9a9cdecfbc35d90ca94965ed0f6c79eead6d8aa854b46f
+checksum=26e8a55d252debaf71b3d7bf9a4ea388ee14dfffc3542f7c9763204aabe43afd
kitemmodels-devel_package() {
short_desc+=" - development"
From b5f14025e576c4bbb942d303b51644108ef873c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:50 +0200
Subject: [PATCH 286/343] kitemviews: update to 5.98.0.
---
srcpkgs/kitemviews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 9146eabd5925..19d6a5b4b057 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
# Template file for 'kitemviews'
pkgname=kitemviews
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kitemviews"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c59916d5f181aa5ff44f4cf4f6bf18a0f179056f00cf33d03328951f1c1dfbbd
+checksum=b221a958ffb89c0acd9b49b399ab5f966d5b4f6a98e479de9aaf6d6d23c5cf9c
kitemviews-devel_package() {
short_desc+=" - development"
From a91239da6865685b1f5128fe515cd90158551746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:51 +0200
Subject: [PATCH 287/343] kjobwidgets: update to 5.98.0.
---
srcpkgs/kjobwidgets/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 590b2e9f83db..719bb90c9d7f 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
# Template file for 'kjobwidgets'
pkgname=kjobwidgets
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only, LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kjobwidgets"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c9cd2ec18416a7b70dd2e480298bbec55c419446afa66eeb0cddfc5e97cc429b
+checksum=8c93ee321559fd515898e4b5f33a5b1c8190a404cdd5287ef0c909385ab10739
kjobwidgets-devel_package() {
short_desc+=" - development"
From 1d1a3f666b143063cecd210f317a86dd160511eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:53 +0200
Subject: [PATCH 288/343] kjs: update to 5.98.0.
---
srcpkgs/kjs/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 30455a710134..89d5edcd4133 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,16 +1,17 @@
# Template file for 'kjs'
pkgname=kjs
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
-makedepends="qt5-devel qt5-script-devel qt5-declarative-devel kdoctools-devel"
+makedepends="qt5-devel qt5-script-devel qt5-declarative-devel
+ kdoctools-devel pcre-devel"
short_desc="KDE Javascript engine"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kjs"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0e59e1d757819943d76e1df8af3f2cbf586b0104aafa8ee7b8b4ea82987bdcf8
+checksum=339ec922b07a837f7c7a341ad0d5e63edb94e3838c86009a0dd0e9b08a0a3a0e
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
From 60b8b2dde4d58567d81afa3ffc1f340ad1b3a376 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:55 +0200
Subject: [PATCH 289/343] kjsembed: update to 5.98.0.
---
srcpkgs/kjsembed/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 638d0447349f..8a2dfeced078 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
# Template file for 'kjsembed'
pkgname=kjsembed
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/kjsembed"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=bd4f24188691631d4d42d11bd58322afd8780a149f46f3cdf496eabed9ed401f
+checksum=c2a9258d4d50e24d7af3c37185aeddedd2caf30bf85af702fb749c0b41de647d
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
From c550ac10591cdf90a982caf2a921672ebe4ea8ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:56 +0200
Subject: [PATCH 290/343] kmediaplayer: update to 5.98.0.
---
srcpkgs/kmediaplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 51034408dcf9..e72fe3f3df12 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
# Template file for 'kmediaplayer'
pkgname=kmediaplayer
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="X11"
homepage="https://invent.kde.org/frameworks/kmediaplayer"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7a4abbf691db541fbaa058c9d3235db6235e4d2c8f16672d85b16a94fe2c0c92
+checksum=3d81b6d754564c188bf6a371a3721c092d7eebd395112a978cfda6f77a4a9b71
kmediaplayer-devel_package() {
short_desc+=" - development"
From 93e8cef1a6d5a286fe4f3f414aa5b4782c39dacc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:16:58 +0200
Subject: [PATCH 291/343] knewstuff: update to 5.98.0.
---
srcpkgs/knewstuff/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 2ee87b48f611..8918f8ad446c 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
# Template file for 'knewstuff'
pkgname=knewstuff
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/knewstuff"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d727bbddcebd49a29c2d2e8a8315e40092bf044e85c1ba6c3a0bf07efdfa894c
+checksum=fe39443e0092cd158dcde442e0c442b14e9d5194b6bd6112ad25060af6fdbd26
knewstuff-devel_package() {
short_desc+=" - development"
From bc4375997394963c3eb88d23910a1c198c3b0af5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:00 +0200
Subject: [PATCH 292/343] knotifications: update to 5.98.0.
---
srcpkgs/knotifications/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 7e7bc42d38c1..02c485b769ca 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
# Template file for 'knotifications'
pkgname=knotifications
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/knotifications"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e36364141e715b2b06e583f3f991fa4dcd627822d2887b76b9cc98653dc0d41f
+checksum=8d6145cf77c18553d4f44149038c0d5578fd7006454423d76e5d352af9c89083
knotifications-devel_package() {
short_desc+=" - development"
From 05043e42bb8f3f639c1a8aeccf236d8aa6501cec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:02 +0200
Subject: [PATCH 293/343] knotifyconfig: update to 5.98.0.
---
srcpkgs/knotifyconfig/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 5070493d0ea8..81409510caf6 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
# Template file for 'knotifyconfig'
pkgname=knotifyconfig
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/knotifyconfig"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1bda7bb052c6316058cf93d2d6f0a79da0f71aa8ed633f5cd0e7874908738dfa
+checksum=07d4f5f8888ea6a284e77843d391f46e8a334de5d261343fbacfbb984b7e95e2
knotifyconfig-devel_package() {
short_desc+=" - development"
From c622ef7b1544a8b7d833940252632364715cc167 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:03 +0200
Subject: [PATCH 294/343] kpackage: update to 5.98.0.
---
srcpkgs/kpackage/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 2e4e42e35bcb..9f20a9fec9b1 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
# Template file for 'kpackage'
pkgname=kpackage
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kpackage"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c1dd7b2ecf54a5356e89037977703f9d15970dab0e3ac455f969e6d1741410e
+checksum=fe9261b0fc16019fd8c055f1d4494e4b055db8f9d1cee954f902438c13966488
post_install() {
vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \
From c44abf16b4dacb73aaf69380376d9a9be2472fa5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:05 +0200
Subject: [PATCH 295/343] kparts: update to 5.98.0.
---
srcpkgs/kparts/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 077722d115c8..f136614a2276 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
# Template file for 'kparts'
pkgname=kparts
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kparts"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef833d4a5165445c148186da0d7c977a72d1606cf07fcf6ff8e9d4c48e532551
+checksum=f9ed944817efb4298753812ae70310b9a49c46c85968cec8a4fce5bfb8b7ec05
do_check() {
: # test can not find packages assets?!
From a14e34e7421ea58ae7c88c72d9b104d4c0249df9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:06 +0200
Subject: [PATCH 296/343] kpeople: update to 5.98.0.
---
srcpkgs/kpeople/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index f775f8ca45fe..cf3263256568 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
# Template file for 'kpeople'
pkgname=kpeople
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kpeople"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7b201ab2f1dabce12d4a97041ad20b35891fc65ad7cc88c006b132b8dc6dc2bb
+checksum=0ee89b53c502a9cd215d43e56ee63265b20fb508098f9d22590bbb35fb45be73
do_check() {
cd build
From eb1ad80b61721ee673e7a5ee9db6ce1052af1a25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:08 +0200
Subject: [PATCH 297/343] kplotting: update to 5.98.0.
---
srcpkgs/kplotting/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index a59d1bd137f0..34db43401ddb 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
# Template file for 'kplotting'
pkgname=kplotting
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kplotting"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ed2e16b632ac1dc99a1f278de3ef76f4a2e4bc8989b6876621a9b7a1716ea0e
+checksum=4208fecb5e893ab0825edc70d3c3912254bb6fbe49e9d7f40d9b29d303f5df42
kplotting-devel_package() {
short_desc+=" - development"
From cc9e06f5252b1f1387fda3ddd1e2b2ed07d4e100 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:09 +0200
Subject: [PATCH 298/343] kpty: update to 5.98.0.
---
srcpkgs/kpty/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 0e708bf378f8..5b283ee9dfdb 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
# Template file for 'kpty'
pkgname=kpty
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kpty"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=87c5a63d9d2984fa9ab439d89e5d6f51744185a3e3f5e33b5d84cc18e8280ac4
+checksum=9c0b54024c9aac7fb2f91201bbf1cd5e41d21a9ffbeed0cb63d9f2467b5b3d2b
kpty-devel_package() {
short_desc+=" - development"
From c66bfdc6edd9fa9f80e7e9870c1f1ff95198e455 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:11 +0200
Subject: [PATCH 299/343] kquickcharts: update to 5.98.0.
---
srcpkgs/kquickcharts/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 06d17b78f224..973aa5e1b2f6 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
# Template file for 'kquickcharts'
pkgname=kquickcharts
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-only OR LGPL-3.0-only"
homepage="https://community.kde.org/Frameworks"
distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=c12a245bfe92b92be4a8af4c12234ee55270b3b148720097c58b6f388a9f5fec
+checksum=13caf8ad428fd96fb9c57815b8eba32586a72d65b02effbacaf14b869c2f94f6
do_check() {
cd build
From d96efc41e76f957ef87066159e8db8c7d96f992f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:13 +0200
Subject: [PATCH 300/343] kross: update to 5.98.0.
---
srcpkgs/kross/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 69026683b406..e0376bf89ff2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
# Template file for 'kross'
pkgname=kross
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kross"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ba60156428496628046d99d5fe33bfdfbb4d29cb1ae82dd9014202dceda18304
+checksum=c068880493c486f5580d1f5f9955a587b3498c46ce86bf49cdb44b42b231567a
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From f490c36eabc6a7b6c6c49b6e6386f64173edf9e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:14 +0200
Subject: [PATCH 301/343] krunner: update to 5.98.0.
---
srcpkgs/krunner/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index fb0f49a09f34..12d8fc8ce3b8 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
# Template file for 'krunner'
pkgname=krunner
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/krunner"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=295fb5f03c7c806bed68b358f4de517ad8a8758c9abd10f5761f3f0b39d8ad29
+checksum=52430b0c3d562b0653eaec7bdf78513f1b1c2d77ac3ddc1a0d3001ded340904d
do_check() {
cd build
From ed58a10d2dff250130590adb468b94a83bbea837 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:16 +0200
Subject: [PATCH 302/343] kservice: update to 5.98.0.
---
srcpkgs/kservice/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 85710aad6c38..ee7776146864 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
# Template file for 'kservice'
pkgname=kservice
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kservice"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6d0016a801edbd2989a13a3cf460b1164663c9b205ced8f9242f256a1b3e202e
+checksum=6150e8995aa0b2ea6f426cb2f23b662a02cf5bae5e95fb09c2bcaf391bbbfc51
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
From bab284032e02296bf20ecbfaa3aa12841fc34659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:18 +0200
Subject: [PATCH 303/343] ksolid: update to 5.98.0.
---
srcpkgs/ksolid/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 20123967ddf3..529ab9206c28 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
# Template file for 'ksolid'
pkgname=ksolid
-version=5.97.0
+version=5.98.0
revision=1
wrksrc="${pkgname#k}-${version}"
build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/solid"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=84c0ad4678c2ef6563db8a1dd907a8b9c4a2e8db7afc691a24b27189d6a24c9d
+checksum=066427b9b2504a4e6bbc26994f1c9d4885aaef794c7bff6a861e4e0dc8146e91
libksolid_package() {
short_desc+=" - runtime library"
From 8034bf833fec368f97eea9c1335925b8bea9e569 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:20 +0200
Subject: [PATCH 304/343] ktexteditor: update to 5.98.0.
---
srcpkgs/ktexteditor/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 581b4c90ea92..e9b72138d080 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
# Template file for 'ktexteditor'
pkgname=ktexteditor
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/ktexteditor"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b728bf715ce19725e63fa8a19171f9b61ee85425f0fd4e64669d16fc6811c0a
+checksum=7c1f6b11eb4a73af156b955604da6360b18c14f546b4a3c378256df2738a5fdd
do_check() {
cd build
From 5ea276f7c798c07888c4ea09ac8b87f6acf88e07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:21 +0200
Subject: [PATCH 305/343] ktextwidgets: update to 5.98.0.
---
srcpkgs/ktextwidgets/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d107cb032690..575749b0f93c 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
# Template file for 'ktextwidgets'
pkgname=ktextwidgets
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/ktextwidgets"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd42fb15833fcfb4f739999d525b27b55c16eec8e5dec8a6ec2d7a1b9c288acf
+checksum=93521275dc96294e488d41d5dc987c1dffa5a441cd4fd3c7d439f5f3ecad3b92
ktextwidgets-devel_package() {
short_desc+=" - development"
From e06961711217b28a6438728d2c21f2202e1bc0f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:23 +0200
Subject: [PATCH 306/343] kunitconversion: update to 5.98.0.
---
srcpkgs/kunitconversion/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 6bb215e23c14..ac52567e4da9 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
# Template file for 'kunitconversion'
pkgname=kunitconversion
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kunitconversion"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbf85e140736132f89f01b939627aa40c40ef2f7913addd63d7e7ba3e6a957df
+checksum=0564c3b2845b76ab6d8e3fb35a233d81916bc0aac87f4ad2c4b388195a781e52
kunitconversion-devel_package() {
short_desc+=" - development"
From a4e38ace552898ce8932d9a9fe635166c494d1d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:25 +0200
Subject: [PATCH 307/343] kwallet: update to 5.98.0.
---
srcpkgs/kwallet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 8449862ea282..0aafb2f71022 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
# Template file for 'kwallet'
pkgname=kwallet
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kwallet"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab9b78b0c6aba461de6247974b7e60239cd2a52a1c2c6d67b92e466c7597d821
+checksum=4b699303b2b253fe09ef94acea2fb43051415d07645d799f9c9d7630699f9d4f
kwallet-devel_package() {
short_desc+=" - development"
From c806f3f1aa93d5ef55fa7a7facf424885e6cc4bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:26 +0200
Subject: [PATCH 308/343] kwayland: update to 5.98.0.
---
srcpkgs/kwayland/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 223a54c10db2..9b53d7af8f7b 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,18 +1,19 @@
# Template file for 'kwayland'
pkgname=kwayland
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel
plasma-wayland-protocols qt5-wayland-devel wayland-devel"
-makedepends="qt5-tools-devel MesaLib-devel wayland-devel wayland-protocols qt5-wayland-devel"
+makedepends="qt5-tools-devel MesaLib-devel wayland-devel wayland-protocols qt5-wayland-devel
+ libxkbcommon-devel"
short_desc="Qt-style client and server library wrapper for Wayland libraries"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kwayland"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e571016c89cccd5ae1a455c8f2abe59f8edab787e3cd7a165059bf365130ca3c
+checksum=1c171ddf9af0e257781ba245f5720da39fc89170fb6a7516ceb00f53df280930
kwayland-devel_package() {
short_desc+=" - development"
From 7a83900991ced1493dcfdf30cafd94ea81a70de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:28 +0200
Subject: [PATCH 309/343] kwidgetsaddons: update to 5.98.0.
---
srcpkgs/kwidgetsaddons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 1570a0f9f685..d2033365d8d3 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
# Template file for 'kwidgetsaddons'
pkgname=kwidgetsaddons
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7ac0c7e429036829fb430bc762ee58cb54f35c5ef955371f74fdd42376b6ac17
+checksum=d9ab562740c92c57d49af125ec8cda10e2b1c4bab84428af68412fc1499cfc84
do_check() {
cd build
From 6108474ac64146d2b1c026e5e51e6ef78e6bec2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:30 +0200
Subject: [PATCH 310/343] kwindowsystem: update to 5.98.0.
---
srcpkgs/kwindowsystem/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index da4451cb39f1..db0b9312a62b 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
# Template file for 'kwindowsystem'
pkgname=kwindowsystem
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
# Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kwindowsystem"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b822a796379a1ce03a4a9fad64aa6289ba7abd84e3b137af31d8043b9c5efef1
+checksum=814a0e5506f794373840b2f0cb1fae1e3540b34e95b438e7edb9d2c87aed870a
kwindowsystem-devel_package() {
short_desc+=" - development"
From e36adfbd0b0b1dbc443287b02404cac307183970 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:31 +0200
Subject: [PATCH 311/343] kxmlgui: update to 5.98.0.
---
srcpkgs/kxmlgui/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 89f48bac1348..2905a4995dbb 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
# Template file for 'kxmlgui'
pkgname=kxmlgui
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kxmlgui"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=baf17929d6aabc11f6c9f8ac5402388846bf7c1d65d6896008c60d953218adf5
+checksum=857440cf53774786433967b47e27f509f322c9aca5bbccb1ea0ec0f9fea0c522
do_check() {
cd build
From 15792a6cbbdcd69c52a77f438285b2ba5e40f309 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:33 +0200
Subject: [PATCH 312/343] kxmlrpcclient: update to 5.98.0.
---
srcpkgs/kxmlrpcclient/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index e0bf24cda5d1..f2c611703f3b 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
# Template file for 'kxmlrpcclient'
pkgname=kxmlrpcclient
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=495a886b6bd134be578f37c0ad169a178f95dcbfd073e95d1579a0f493fbd309
+checksum=eb528dddf50fea450ee95680992357491512162e7149dff947fbeffd66765725
post_install() {
vlicense LICENSES/BSD-2-Clause.txt
From 7f96c64ee05902629cdf8d8cc49492884c368725 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:35 +0200
Subject: [PATCH 313/343] modemmanager-qt5: update to 5.98.0.
---
srcpkgs/modemmanager-qt5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index 5e8d28160e07..6f0685c615db 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
# Template file for 'modemmanager-qt5'
pkgname=modemmanager-qt5
-version=5.97.0
+version=5.98.0
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/modemmanager-qt"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=938001d0d28c9d51cbc8fcdf45aefb2028c227e33037f98fb89ed6214936e561
+checksum=73049850238a0d528f3db7d38609e3ca51622335df42a99a50a190908797643e
do_check() {
cd build
From 57a41d0a377154e46f3da49cb7b6e242a1e95fb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:17:36 +0200
Subject: [PATCH 314/343] networkmanager-qt5: update to 5.98.0.
---
srcpkgs/networkmanager-qt5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 14c34f80b8ae..fa3a4f7a751c 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
# Template file for 'networkmanager-qt5'
pkgname=networkmanager-qt5
-version=5.97.0
+version=5.98.0
revision=1
wrksrc="${pkgname%5}-${version}"
build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/networkmanager-qt"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=8556ad0ee255ce2947aad623db90848f7cfb0034368b0193f86af40499fa6c81
+checksum=bcc5b47b16c0e5e3f3c58e6596eeff76a175f7f7ea1d5ec1a0dea299b6003068
do_check() {
cd build
From 5bc8a4eb0573544a36232a7ea6ac1abca582a71a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:16 +0200
Subject: [PATCH 315/343] oxygen-icons5: update to 5.98.0.
---
srcpkgs/oxygen-icons5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 218d151d88bf..61d1da5eee94 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
# Template file for 'oxygen-icons5'
pkgname=oxygen-icons5
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later, LGPL-3.0-or-later"
homepage="https://invent.kde.org/frameworks/oxygen-icons5"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=554b6df8204654aee941f378c941277f81998522c6c67659625f16200225f9fa
+checksum=782d7e72e193baf1d66f6cc8fc71cec4b66af3c1d19365c7c940be8ca128930f
conflicts="oxygen-icons>=0"
oxygen-icons_package() {
From 53c30decc243d31012e17017921beb04a56cf1f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:19 +0200
Subject: [PATCH 316/343] plasma-framework: update to 5.98.0.
---
srcpkgs/plasma-framework/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 945aa01b537d..b2f1d10834e7 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-framework'
pkgname=plasma-framework
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/plasma-framework"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73987d498bd231d984dbaad9fb94e38e32441635464ffeacbfcd089a7695b527
+checksum=e4e1585d949533dea69bf57f7aa0d1d40e9305fa0b5006315a760179c1dcbcae
do_check() {
cd build
From 999c3fe2454c61089fccb59fef264aec0576161e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:20 +0200
Subject: [PATCH 317/343] prison: update to 5.98.0.
---
srcpkgs/prison/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 1baf8bc7c9ed..8a5870dc4f28 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
# Template file for 'prison'
pkgname=prison
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="MIT"
homepage="https://community.kde.org/Frameworks"
distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=a6f04ff1b9823c43881da38091a87970dba6d79a0f3a8103146fc2b03aaf531b
+checksum=dc307532430a5463f95d7bbf8e03a4bb5e3b4650c9fecd6c600e61035ca8f8de
post_install() {
vlicense LICENSES/BSD-3-Clause.txt
From 815cd3747e6e0486e535969e9b6b9571757ee035 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:22 +0200
Subject: [PATCH 318/343] purpose: update to 5.98.0.
---
srcpkgs/purpose/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 914b06ed4110..d6f89b35210d 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
# Template file for 'purpose'
pkgname=purpose
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/purpose"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=83fed8d56231a11fc1e39a04aef8caf84408c51a5806b633bf18895d5481519f
+checksum=d97a2914526b746c84e2e198b7584df4c236d7c9a37272f1f083b664359c3e3d
do_check() {
cd build
From d0ac7979c76b8d29f0de3a9e5e05ad83699a3ee8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:23 +0200
Subject: [PATCH 319/343] qqc2-desktop-style: update to 5.98.0.
---
srcpkgs/qqc2-desktop-style/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index b32064b3c181..721fce5ac5b1 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
# Template file for 'qqc2-desktop-style'
pkgname=qqc2-desktop-style
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=466967eec3b10a3e0eb0c2e1f09b9c23ff0f08399563d112c7bec26061f134a6
+checksum=edf4460e9431a7eb52c3595e2acea1fbc405387bdc06f7ec6f408849da8fc7a9
qqc2-desktop-style-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 6dd0546e4df869fa57937c5a4e5582eff2346fe2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:25 +0200
Subject: [PATCH 320/343] sonnet: update to 5.98.0.
---
srcpkgs/sonnet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 90550fc18872..5ad5fc512eba 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
# Template file for 'sonnet'
pkgname=sonnet
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/sonnet"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a392739767e7f56cc3d951f0e55f1fa1d36a9f48e1b601b825212b50a1941193
+checksum=a3ae0141e11e2bb3fc0ace9b339d82b17ce9f83a751abcab1c8fe9d07b489748
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" sonnet"
From 01dbfd48eced909daef10ea76369703177b51f68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:29 +0200
Subject: [PATCH 321/343] syndication: update to 5.98.0.
---
srcpkgs/syndication/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 0063d79b983a..0db7ade23d65 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
# Template file for 'syndication'
pkgname=syndication
reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://community.kde.org/KDE_PIM"
distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=560262fe64af2891e457b4b123330be03bbf2bbb3b3fc29b657ee19fa3ae9d61
+checksum=5de59a9d77bf3a72dc6b73ebd304b92c6d0ef05cd233ac9b6f71cf0e0142fe12
syndication-devel_package() {
short_desc+=" - development"
From c2499112b7c15891edd17e34ed055ff7ee475a78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:31 +0200
Subject: [PATCH 322/343] syntax-highlighting: update to 5.98.0.
---
srcpkgs/syntax-highlighting/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index ef6a8f5f5be0..46dd74889e92 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
# Template file for 'syntax-highlighting'
pkgname=syntax-highlighting
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/syntax-highlighting"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e88b9691ffead9cbfb11ae43c497114c7695e1e455e78dad30743c90ab50a99d
+checksum=02c7a76cb8c21cf279084052f4bff278ff76959e3df0c4e8c2aa230de1a25124
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" syntax-highlighting"
From 695833d06a3818d57243fb21017c642bba7c33ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 2 Oct 2022 14:18:32 +0200
Subject: [PATCH 323/343] threadweaver: update to 5.98.0.
---
srcpkgs/threadweaver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 7d4429aa9d9a..26022a6ad0d3 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
# Template file for 'threadweaver'
pkgname=threadweaver
-version=5.97.0
+version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/threadweaver"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=46975d03feea09c41ac369fd076d7b2c92ad4468a81f48c2eeff622eabfc408f
+checksum=5acc0d34e83568a18444537e91eeef93986a8ec3c4b6c326319de959feb591df
threadweaver-devel_package() {
short_desc+=" - development"
From 9c1aa2f745f38963a2aeed3a04bb1cd488944f50 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 13 Sep 2022 11:27:34 -0700
Subject: [PATCH 324/343] gdm: create env.d
---
srcpkgs/gdm/template | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b7404..e2b2fcfc2eb9 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
version=42.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="
@@ -10,7 +10,8 @@ configure_args="
-Dplymouth=enabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid
-Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true
-Dselinux=disabled -Dlibaudit=disabled
- -Dsystemdsystemunitdir=/tmp -Dsystemduserunitdir=/tmp"
+ -Dsystemdsystemunitdir=/usr/lib/systemd/system
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="dconf gettext itstool pkg-config"
makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel
iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel
@@ -32,6 +33,9 @@ conf_files="
/etc/pam.d/gdm-launch-environment
/etc/pam.d/gdm-password
/etc/pam.d/gdm-smartcard"
+make_dirs="
+ /usr/share/gdm/env.d 0755 root root
+ /etc/gdm/env.d 0755 root root"
# Create the 'gdm' system user/group.
system_accounts="gdm"
gdm_homedir="/var/lib/gdm"
@@ -52,7 +56,6 @@ post_install() {
vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f"
fi
done
- rm -rf ${DESTDIR}/tmp
# runit service
vsv gdm
From 11deac9555d066401680b43e757f897c87cfa4a9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 13 Sep 2022 11:28:55 -0700
Subject: [PATCH 325/343] flatpak: fix setting environment variables on gdm
---
srcpkgs/flatpak/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 778ab0e681d8..e9fefbf33925 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,7 +1,7 @@
# Template file for 'flatpak'
pkgname=flatpak
version=1.14.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="
@@ -9,6 +9,7 @@ configure_args="
--with-system-dbus-proxy
--with-system-helper-user=_flatpak
--enable-selinux-module=no
+ --enable-gdm-env-file
$(vopt_enable gir introspection)"
hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
python3-parsing xmlto docbook-xml docbook-xsl xdg-dbus-proxy"
From 8d44f3a564bf378ddf9e881b2c05d1e886b19af4 Mon Sep 17 00:00:00 2001
From: Dustin Marquess <jailbird@fdf.net>
Date: Sun, 2 Oct 2022 15:35:21 -0500
Subject: [PATCH 326/343] chrony: update to 4.3
---
srcpkgs/chrony/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template
index 54ebbcf9e6c1..f99544f543ba 100644
--- a/srcpkgs/chrony/template
+++ b/srcpkgs/chrony/template
@@ -1,7 +1,7 @@
# Template file for 'chrony'
# When Updating: Please confirm the upstream config still refers to make_dirs
pkgname=chrony
-version=4.2
+version=4.3
revision=1
build_style=gnu-configure
configure_args="--without-nss --enable-scfilter
@@ -15,7 +15,7 @@ license="GPL-2.0-only"
homepage="https://chrony.tuxfamily.org/"
changelog="https://chrony.tuxfamily.org/news.html"
distfiles="https://download.tuxfamily.org/chrony/${pkgname}-${version}.tar.gz"
-checksum=273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a
+checksum=9d0da889a865f089a5a21610ffb6713e3c9438ce303a63b49c2fb6eaff5b8804
system_accounts="chrony"
chrony_homedir="/var/lib/chrony"
From babfe1f74912c4a1406e4818cd3fbdc289a840ad Mon Sep 17 00:00:00 2001
From: Noah Huppert <contact@noahh.io>
Date: Sat, 24 Sep 2022 14:42:22 -0400
Subject: [PATCH 327/343] salt: updated to 3005
---
srcpkgs/salt/patches/requirements.patch | 6 ------
srcpkgs/salt/patches/zeromq-transport.patch | 13 -------------
srcpkgs/salt/template | 6 +++---
3 files changed, 3 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/salt/patches/requirements.patch
delete mode 100644 srcpkgs/salt/patches/zeromq-transport.patch
diff --git a/srcpkgs/salt/patches/requirements.patch b/srcpkgs/salt/patches/requirements.patch
deleted file mode 100644
index 8b1217a30c44..000000000000
--- a/srcpkgs/salt/patches/requirements.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- a/requirements/base.txt
-+++ b/requirements/base.txt
-@@ -6,2 +6,2 @@
- distro>=1.0.1
--contextvars
-+contextvars; python_version < "3.7"
diff --git a/srcpkgs/salt/patches/zeromq-transport.patch b/srcpkgs/salt/patches/zeromq-transport.patch
deleted file mode 100644
index f77dec599503..000000000000
--- a/srcpkgs/salt/patches/zeromq-transport.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Code taken from https://github.com/saltstack/salt/pull/62119/
---- a/salt/transport/zeromq.py 2021-08-24 14:17:07.000000000 -0500
-+++ b/salt/transport/zeromq.py 2022-05-31 09:50:44.113967910 -0500
-@@ -977,7 +977,7 @@
- try:
- pub_sock.setsockopt(zmq.HWM, self.opts.get("pub_hwm", 1000))
- # in zmq >= 3.0, there are separate send and receive HWM settings
-- except AttributeError:
-+ except (AttributeError, zmq.error.ZMQError):
- # Set the High Water Marks. For more information on HWM, see:
- # http://api.zeromq.org/4-1:zmq-setsockopt
- pub_sock.setsockopt(zmq.SNDHWM, self.opts.get("pub_hwm", 1000))
-
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 07a6fbb004a0..d56ad6547cde 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,7 +1,7 @@
# Template file for 'salt'
pkgname=salt
-version=3003.3
-revision=4
+version=3005
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
@@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="http://saltstack.org/"
changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
-checksum=a6f9c8c8b5e2600ea8620b4a67371de17611beb4f8d97e4bb9b0b308a37ed1e2
+checksum=1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4
conf_files="
/etc/salt/cloud.providers.d/digitalocean.conf
/etc/salt/cloud.providers.d/vsphere.conf
From da307816b8f0aa97afc2826138ceb77ef1861118 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 23:40:57 +0200
Subject: [PATCH 328/343] kglobalaccel: fix build
---
srcpkgs/kglobalaccel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index b9cee14320cd..af62a4b9b406 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -4,7 +4,7 @@ version=5.98.0
revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
-makedepends="kservice-devel"
+makedepends="kservice-devel kcrash-devel"
short_desc="KDE Global desktop keyboard shortcuts"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
From 320a319c5a1467f8b56b23f70f1d05fba6b6f8d6 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 2 Oct 2022 16:53:49 -0500
Subject: [PATCH 329/343] NetAuth-ldap: update to 0.3.0.
---
srcpkgs/NetAuth-ldap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index 299cbb22ae47..ed1572ad1642 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,6 +1,6 @@
# Template file for 'NetAuth-ldap'
pkgname=NetAuth-ldap
-version=0.2.3
+version=0.3.0
revision=1
wrksrc=ldap-$version
build_style=go
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://www.netauth.org/ecosystem/ldap"
distfiles="https://github.com/netauth/ldap/archive/v$version.tar.gz"
-checksum=1d75f23197ea869207e8895cfaadde2c536f279eb26ddb8256642f5babece7e7
+checksum=44e8470215c4c5879c597e1a779d1ba6ae5658b4ef2df9edcd74b1326a404f24
system_accounts="_netauth_ldap"
post_install() {
From 5663b1aee60bcb9b62d34da4282fa91aa957cbbb Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 2 Oct 2022 17:44:55 -0400
Subject: [PATCH 330/343] hooktftp: update to 1.1.1.
---
srcpkgs/hooktftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index d9482c378c75..33889c2e7866 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,6 +1,6 @@
# Template file for 'hooktftp'
pkgname=hooktftp
-version=1.1.0
+version=1.1.1
revision=1
build_style=go
go_import_path="github.com/tftp-go-team/hooktftp"
@@ -10,7 +10,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://github.com/tftp-go-team/hooktftp"
distfiles="https://github.com/tftp-go-team/hooktftp/archive/${version}.tar.gz"
-checksum=74a29947509a4a718091a5571cc2b2bdbfae807499f06beae124e78afdc56cf9
+checksum=ae50cd4a9b703365388de6301c9d97e0c417160fad8131c0f0727c08e67bcbc2
post_install() {
vlicense LICENSE
From 9f96df50e4fc59c6ad0f807a76874914817e0a64 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 2 Oct 2022 17:40:42 -0400
Subject: [PATCH 331/343] wander: update to 0.8.0.
---
srcpkgs/wander/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index c80c78c143f1..945934d6ac01 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,6 +1,6 @@
# Template file for 'wander'
pkgname=wander
-version=0.3.0
+version=0.8.0
revision=1
build_style=go
go_import_path="github.com/robinovitch61/wander"
@@ -9,7 +9,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://github.com/robinovitch61/wander"
distfiles="https://github.com/robinovitch61/wander/archive/refs/tags/v${version}.tar.gz"
-checksum=456a74eeebb25a39f9b8c57ccb186e6fc4ea8fbea6fb9623a7eb7180fff346fa
+checksum=66cc5af222bb9c413e60223652645bbf1c99aa50edd4cb9a3eb88e79e518f776
post_install() {
vlicense LICENSE
From 65fe90f5cb5d34fa0344d26e6b35ffb457cf9175 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 2 Oct 2022 17:44:09 -0400
Subject: [PATCH 332/343] links: update to 2.28.
---
srcpkgs/links/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index 63c9e1be0b0b..41cbdec8cb11 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,6 +1,6 @@
# Template file for 'links'
pkgname=links
-version=2.27
+version=2.28
revision=1
build_style=gnu-configure
configure_args="--with-ssl --enable-graphics"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://links.twibright.com/"
distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=d8ddcbfcede7cdde80abeb0a236358f57fa6beb2bcf92e109624e9b896f9ebb4
+checksum=2fd5499b13dee59457c132c167b8495c40deda75389489c6cccb683193f454b4
post_install() {
mkdir -p ${DESTDIR}/usr/share/doc/
From fb4d5503699eedb712e62377df0efda11cbfc822 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 2 Oct 2022 15:41:00 -0700
Subject: [PATCH 333/343] gdm: use official Xsession
Fixes loading the profile on X11 sessions.
---
srcpkgs/gdm/files/Xsession | 2 --
srcpkgs/gdm/template | 6 ++----
2 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100755 srcpkgs/gdm/files/Xsession
diff --git a/srcpkgs/gdm/files/Xsession b/srcpkgs/gdm/files/Xsession
deleted file mode 100755
index d5726cfcd265..000000000000
--- a/srcpkgs/gdm/files/Xsession
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec $@
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e2b2fcfc2eb9..b504f4ba2adf 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
version=42.0
-revision=2
+revision=3
build_helper="gir"
build_style=meson
configure_args="
@@ -9,7 +9,7 @@ configure_args="
-Dtcp-wrappers=false -Dscreenshot-dir=/var/lib/gdm/greeter
-Dplymouth=enabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid
-Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true
- -Dselinux=disabled -Dlibaudit=disabled
+ -Dselinux=disabled -Dlibaudit=disabled -Dgdm-xsession=true
-Dsystemdsystemunitdir=/usr/lib/systemd/system
-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="dconf gettext itstool pkg-config"
@@ -49,8 +49,6 @@ if [ "$CROSS_BUILD" ]; then
fi
post_install() {
- vinstall $FILESDIR/Xsession 755 etc/gdm
-
for f in $DESTDIR/etc/pam.d/*; do
if grep -q "pam_systemd.so" "$f"; then
vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f"
From b19fd43ccf8464fc3d2e8d834b98883bc26c07a2 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 1 Oct 2022 08:03:07 -0400
Subject: [PATCH 334/343] libpwquality: update to 1.4.4, adopt.
---
srcpkgs/libpwquality/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index e89a8a0c5cf7..cd1eefc76180 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -1,7 +1,7 @@
# Template file for 'libpwquality'
pkgname=libpwquality
-version=1.4.2
-revision=6
+version=1.4.4
+revision=1
build_style=gnu-configure
build_helper=python3
configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security"
@@ -10,12 +10,12 @@ makedepends="cracklib-devel pam-devel python3-devel"
depends="cracklib"
conf_files="/etc/security/pwquality.conf"
short_desc="Library for password quality checking and generating random passwords"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="0x5c <dev@0x5c.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/libpwquality/libpwquality"
changelog="https://raw.githubusercontent.com/libpwquality/libpwquality/master/NEWS"
distfiles="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2"
-checksum=5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e
+checksum=d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545
pre_configure() {
autoreconf -fi
From 59e2da32197182440a7038d6e41356eb3b3500ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 3 Oct 2022 17:51:18 +0700
Subject: [PATCH 335/343] kinit: add missing makedepends
---
srcpkgs/kinit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index e4a25319abbc..93ff77d01697 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -5,7 +5,7 @@ revision=1
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
gettext qt5-host-tools qt5-qmake kdoctools"
-makedepends="kio-devel kdoctools-devel libcap-devel"
+makedepends="kio-devel kdoctools-devel libcap-devel kbookmarks-devel"
short_desc="Helper library to speed up start of applications on KDE workspaces"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-only"
From ac79a1c7db3f549214331a161f9cb11fc499fb1e Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 3 Oct 2022 01:37:20 -0400
Subject: [PATCH 336/343] f3: update to 8.0, adopt.
---
srcpkgs/f3/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/f3/template b/srcpkgs/f3/template
index cb95e071e453..9f1937400aea 100644
--- a/srcpkgs/f3/template
+++ b/srcpkgs/f3/template
@@ -1,18 +1,18 @@
# Template file for 'f3'
pkgname=f3
-version=7.2
-revision=2
+version=8.0
+revision=1
build_style=gnu-makefile
make_build_target="all extra"
make_install_target="install install-extra"
makedepends="eudev-libudev-devel libparted-devel"
short_desc="Test real flash memory capacity"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="0x5c <dev@0x5c.io>"
license="GPL-3.0-or-later"
homepage="https://github.com/AltraMayor/f3"
changelog="https://raw.githubusercontent.com/AltraMayor/f3/master/changelog"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ba9210a0fc3a42c2595fe19bf13b8114bb089c4f274b4813c8f525a695467f64
+distfiles="https://github.com/AltraMayor/f3/archive/v${version}.tar.gz"
+checksum=fb5e0f3b0e0b0bff2089a4ea6af53278804dfe0b87992499131445732e311ab4
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone"
@@ -21,5 +21,5 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- sed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
+ vsed -e 's/^\(CFLAGS *+=\)/override \1/' -i Makefile
}
From 05c4353d105b8dc1ba0da8c6beca83d7677efd0c Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 3 Oct 2022 09:28:49 +0200
Subject: [PATCH 337/343] s: update to 0.6.7.
---
srcpkgs/s/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 18c984fc28b3..2da27d1d5607 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,6 +1,6 @@
# Template file for 's'
pkgname=s
-version=0.6.6
+version=0.6.7
revision=1
build_helper=qemu
build_style=go
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/zquestz/s"
distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d91c8d2935f55dc6f241b7abc0325863846bdeac07a8f3bfa99b4a932d20ace3
+checksum=a175e53e2d9c3b990a963b86b285a258ca5533c78fc930cd01b82f4d9dccfec0
post_build() {
s_cli=$(find $GOPATH/bin -name s)
From 4c30b901298d996ee75c79463d18755ae8495fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 3 Oct 2022 11:18:46 +0200
Subject: [PATCH 338/343] rusty-diceware: update to 0.5.3.
---
srcpkgs/rusty-diceware/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rusty-diceware/template b/srcpkgs/rusty-diceware/template
index cbb66ac36354..2f7a8d1d6e06 100644
--- a/srcpkgs/rusty-diceware/template
+++ b/srcpkgs/rusty-diceware/template
@@ -1,6 +1,6 @@
# Template file for 'rusty-diceware'
pkgname=rusty-diceware
-version=0.3.9
+version=0.5.3
revision=1
wrksrc="${pkgname}-v${version}"
build_style=cargo
@@ -10,7 +10,7 @@ license="AGPL-3.0-only"
homepage="https://gitlab.com/yuvallanger/rusty-diceware"
changelog="https://gitlab.com/yuvallanger/rusty-diceware/-/raw/master/CHANGELOG.md"
distfiles="https://gitlab.com/yuvallanger/rusty-diceware/-/archive/v${version}/rusty-diceware-v${version}.tar.gz"
-checksum=46303f5e0194ca2e064135a36c3d85bd4cf52152614e700cd3aa564f4af9a0ed
+checksum=88f921c304eced0c5b8b4ce535695d45b0b298b0f7fbb9b6da5f1c67e6acea1d
post_install() {
vlicense LICENSE
From 56f9852f642de08049ac410561eb5fbcae318271 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 3 Oct 2022 11:04:19 +0200
Subject: [PATCH 339/343] links-x11: update to 2.28.
---
srcpkgs/links-x11/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 36e99cf1d104..f8301133a1a2 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,6 +1,6 @@
# Template file for 'links-x11'
pkgname=links-x11
-version=2.27
+version=2.28
revision=1
wrksrc="${pkgname%-x11}-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="http://links.twibright.com/"
distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=d8ddcbfcede7cdde80abeb0a236358f57fa6beb2bcf92e109624e9b896f9ebb4
+checksum=2fd5499b13dee59457c132c167b8495c40deda75389489c6cccb683193f454b4
conflicts="links"
post_install() {
From 12b5f8072fec6238023296578722ec94b990a8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 3 Oct 2022 11:43:17 +0200
Subject: [PATCH 340/343] git-cliff: update to 0.9.2.
---
srcpkgs/git-cliff/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 03e99e136092..38a649495362 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
-version=0.9.0
-revision=2
+version=0.9.2
+revision=1
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
homepage="https://github.com/orhun/git-cliff"
changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=0d7390ff23ee16efc93e8d7f2061cfa16c079ed609bcee045e67590c62eccd07
+checksum=86ed2b9e84d062a880f431aec2d7550cedfab4232e76af4398f4cc3b3a487cb9
post_install() {
vdoc README.md
From 77731b558298f873e13dc0716405260b4ee8cbe8 Mon Sep 17 00:00:00 2001
From: Barbaross <cullen.ross@proton.me>
Date: Sun, 2 Oct 2022 23:05:57 -0400
Subject: [PATCH 341/343] font-cozette: update to 1.18.0
---
srcpkgs/font-cozette/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index ad6b3acd0d12..20bbdcff11e7 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,6 +1,6 @@
# Template file for 'font-cozette'
pkgname=font-cozette
-version=1.13.0
+version=1.18.0
revision=1
create_wrksrc=yes
hostmakedepends="font-util bdftopcf"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/slavfox/Cozette"
changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=11590b29856d9ffb2dc6c606009168ea87a3ecde7bcbe9fe542bc34b406c868d
+checksum=710966cb1d310c1af2340bfe77e67741d92ac38d4060d284e0090495c1534b8b
font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
do_install() {
From 8c1b64ae3f4289ab34ad77d6157ea57d7bd8cfe3 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 3 Oct 2022 16:51:20 +1100
Subject: [PATCH 342/343] singular: updated distfiles with new location
---
srcpkgs/singular/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index 2d279f6c5385..f23659ef5d83 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -18,7 +18,7 @@ short_desc="Computer algebra system for polynomial computations"
maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://www.singular.uni-kl.de"
-distfiles="https://service.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version//./-}/singular-${version}.tar.gz"
+distfiles="https://www.singular.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version//./-}/singular-${version}.tar.gz"
checksum=74f38288203720e3f280256f2f8deb94030dd032b4237d844652aff0faab36e7
if [ -z "$CROSS_BUILD" ]; then
From 93397021832fccdbe5e4b7c3ab0e84e3c8173877 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Sun, 25 Sep 2022 17:55:18 +0100
Subject: [PATCH 343/343] fluidsynth: update to 2.3.0
---
srcpkgs/fluidsynth/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 3f65b393d92b..eab2facc39a7 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,19 +1,19 @@
# Template file for 'fluidsynth'
pkgname=fluidsynth
-version=2.2.6
+version=2.3.0
revision=1
build_style=cmake
make_check_target=check
configure_args="-DLIB_SUFFIX=
-DDEFAULT_SOUNDFONT:STRING=/usr/share/soundfonts/default.sf2"
hostmakedepends="pkg-config"
-makedepends="glib-devel jack-devel libsndfile-devel pulseaudio-devel readline-devel"
+makedepends="SDL2-devel glib-devel jack-devel libsndfile-devel pipewire-devel pulseaudio-devel readline-devel"
short_desc="Real-time software synthesizer based on the SoundFont 2 specifications"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://www.fluidsynth.org/"
distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=ca90fe675cacd9a7b442662783c4e7fa0e1fd638b28d64105a4e3fe0f618d20f
+checksum=1df5a1afb91acf3b945b7fdb89ac0d99877622161d9b5155533da59113eaaa20
libfluidsynth_package() {
short_desc+=" - runtime library"
@@ -26,6 +26,7 @@ fluidsynth-devel_package() {
depends="libfluidsynth>=${version} $makedepends"
short_desc+=" - development files"
pkg_install() {
+ vmove usr/lib/cmake
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (14 preceding siblings ...)
2022-10-03 12:25 ` cultab
@ 2022-10-03 12:27 ` cultab
2022-10-03 12:27 ` [PR PATCH] [Closed]: " cultab
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-10-03 12:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by cultab on void-packages repository
https://github.com/void-linux/void-packages/pull/37671#issuecomment-1265367434
Comment:
I'm gonna remake this on a later date cause I fucked up with pulling/pushing/rebasing haha
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PR PATCH] [Closed]: New package: Junction-1.5.0
2022-06-24 18:46 [PR PATCH] New package: Junction-1.5.0 cultab
` (15 preceding siblings ...)
2022-10-03 12:27 ` cultab
@ 2022-10-03 12:27 ` cultab
16 siblings, 0 replies; 18+ messages in thread
From: cultab @ 2022-10-03 12:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There's a closed pull request on the void-packages repository
New package: Junction-1.5.0
https://github.com/void-linux/void-packages/pull/37671
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- Also successfully cross-compiled for i686 and armv7l (both glibc)
~# This is a work in progress.~
~As of now it builds correctly but when run it seems to be missing a dependency.~
```
$ re.sonny.Junction
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: JS ERROR: Error: Requiring Xdp, version none: Typelib file for namespace 'Xdp' (any version) not found
require@resource:///org/gnome/gjs/modules/esm/gi.js:14:24
@gi://Xdp:3:25
(gjs:14669): Gjs-CRITICAL **: 21:42:42.931: Module file:///bin/re.sonny.Junction threw an exception
```
~From what I understand it requires something related to xdg-desktop-portal but I have tested with xdg-desktop-portal-gtk and libportal and it still seems to not work.~
#### Made in response to issue #37352.
^ permalink raw reply [flat|nested] 18+ messages in thread