Merge branch 'void-linux:master' into dust

common/environment/setup/vsed.sh

@@ -57,8 +57,13 @@ vsed() {
 			newdigest="$($XBPS_DIGEST_CMD "$f")"
 			newdigest="${newdigest%% *}"
 
+			msgfunc=msg_warn
+			if [ -n "$XBPS_STRICT" ]; then
+				msgfunc=msg_error
+			fi
+
 			if [ "$olddigest" = "$newdigest" ]; then
-				msg_warn "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
+				$msgfunc "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
 			fi
 			olddigest="${newdigest}"
 		done

common/shlibs

@@ -224,7 +224,7 @@ libgpg-error.so.0 libgpg-error-1.6_1
 liblzo2.so.2 lzo-2.03_1
 libgcrypt.so.20 libgcrypt-1.6.1_1
 libgnutls.so.30 gnutls-3.4.13_1
-libgnutlsxx.so.28 gnutls-3.2.13_1
+libgnutlsxx.so.30 gnutls-3.7.4_1
 libgnutls-dane.so.0 gnutls-3.6.12_1
 libdevmapper.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event.so.1.02 device-mapper-2.02.110_1
@@ -3631,7 +3631,6 @@ libibverbs.so.1 rdma-core-22.1_1
 librdmacm.so.1 rdma-core-22.1_1
 libdvdcss.so.2 libdvdcss-1.4.2_1
 libvalapanel.so.0 vala-panel-0.4.87_1
-libappmenu-gtk2-parser.so.0 appmenu-gtk-module-0.7.1_1
 libappmenu-gtk3-parser.so.0 appmenu-gtk3-module-0.7.1_1
 libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
@@ -4040,7 +4039,7 @@ libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
-liblrcalc.so.1 lrcalc-1.2_1
+liblrcalc.so.2 lrcalc-2.1_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1

common/travis/build.sh

@@ -13,7 +13,7 @@ fi
 PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
 
 for pkg in ${PKGS}; do
-	/hostrepo/xbps-src -j$(nproc) -H "$HOME"/hostdir $arch $test pkg "$pkg"
+	/hostrepo/xbps-src -j$(nproc) -s -H "$HOME"/hostdir $arch $test pkg "$pkg"
 	[ $? -eq 1 ] && exit 1
 done
 

srcpkgs/Amass/template

@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.19.0
+version=3.19.1
 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=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6
+checksum=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426

srcpkgs/CopyQ/template

@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=6.0.1
+version=6.1.0
 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=8d0b0fa840993fa100e888a5a1098e2769e3c234cd44236d75039e5c6e517645
+checksum=d235b31224264e7fa463020f1a934143aa287a4d9cb9bbb6883563ad66e84099

srcpkgs/LimeSuite/template

@@ -28,7 +28,7 @@ makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglu
  fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)"
 depends="wget"
 short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="Apache-2.0"
 homepage="https://myriadrf.org/projects/lime-suite/"
 distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz"

srcpkgs/accountsservice/template

@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dsystemdsystemunitdir=no
  $(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit"
+hostmakedepends="glib-devel pkg-config polkit gettext"
 makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Enno Boland <gottox@voidlinux.org>"

srcpkgs/ansible/template

@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.4.0
+version=5.5.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc
+checksum=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518
 # 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

srcpkgs/apache-storm/template

@@ -1,14 +1,14 @@
 # Template file for 'apache-storm'
 pkgname=apache-storm
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 depends="virtual?java-runtime python3 bash"
 short_desc="Distributed realtime computation system"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://storm.apache.org/"
 distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
-checksum=f621163f349a8e85130bc3d2fbb34e3b08f9c039ccac5474f3724e47a3a38675
+checksum=54535c68848f05130647997f3fafe91a72bb9470a50d6d80997274d20cf1c0c6
 python_version=3
 system_accounts="storm"
 storm_homedir="/var/lib/apache-storm"

srcpkgs/apostrophe/template

@@ -1,6 +1,6 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.6.1
+version=2.6.2
 revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
@@ -9,9 +9,10 @@ hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
 depends="python3-gobject python3-chardet python3-setuptools python3-pypandoc
  gspell iso-codes libhandy1 webkit2gtk"
-short_desc="GTK+ based distraction free Markdown editor"
+short_desc="GTK based distraction free Markdown editor"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
+changelog="https://gitlab.gnome.org/World/apostrophe/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c
+checksum=b06ca4593ceb21bcd7f9734e41ba3fb69f632b5ab24afcdc66500d18d242c068

srcpkgs/appres/template

@@ -1,6 +1,6 @@
 # Template build file for 'appres'.
 pkgname=appres
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="List X application resource database"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=ffad893712c81943b919e3cbfe46fc65259cc0d9eb96d5e658670e3fbb265928
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=8b2257e2a0a1ad8330323aec23f07c333075d7fe4e6efd88e0c18fba8223590b
 
 post_install() {
 	vlicense COPYING