[pull] master from void-linux:master

srcpkgs/falkon/template

@@ -1,6 +1,6 @@
 # Template file for 'falkon'
 pkgname=falkon
-version=25.12.2
+version=25.12.3
 revision=1
 build_style=cmake
 _llvmver=21
@@ -25,7 +25,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="https://www.falkon.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fc84fd941b563fcc15f4827cc2a57249b549cf6a073df1925e85bd0fcedeca4c
+checksum=25f90957335058fff8536b511135e36d96e74c49fab45690be89b994015777b5
 
 LDFLAGS="-Wl,--no-fatal-warnings"
 

srcpkgs/fzf/template

@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.70.0
+version=0.71.0
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/junegunn/fzf"
 changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
 distfiles="https://github.com/junegunn/fzf/archive/refs/tags/v${version}.tar.gz"
-checksum=a99e0df4dfb6228c8af63a2f99f39f7476b7da614833141be30a6b3a3f9d440f
+checksum=2420f4df1e7c3207a5a74b30c32ff3f3fa88ab6e2eb9e0da92cb27905271a525
 
 post_install() {
 	cd ${wrksrc}

srcpkgs/gimp/patches/cross.patch

@@ -1,74 +1,14 @@
-horrible hack to allow for both building the splash image and generating gir in cross-builds
+gimp tries to use target binaries without any exec wrapper that would let
+them be run on cross-builds
 
 --- a/meson.build
 +++ b/meson.build
-@@ -1964,6 +1964,19 @@
+@@ -2028,7 +2028,7 @@
  endif
+ gimp_run_env.set('GIMP_PYTHON_WITH_GI', python.full_path())
 
- if meson.can_run_host_binaries() and have_gobject_introspection
-+  if meson.is_cross_build()
-+    native_gimp_exe = find_program([gimpconsole_exe_name, gimpmain_exe_name],
-+                                   native: true, required: false)
-+    native_gimp_run_env=environment()
-+    native_gimp_run_env.set('GIMP_GLOBAL_BUILD_ROOT',  meson.global_build_root())
-+    native_gimp_run_env.set('GIMP_GLOBAL_SOURCE_ROOT', meson.global_source_root())
-+    if get_option('debug-self-in-build')
-+     native_gimp_run_env.set('GIMP_DEBUG_SELF', '1')
-+    endif
-+    native_gimp_run_env.set('GIMP_SELF_IN_BUILD', native_gimp_exe.full_path())
-+    native_gimp_exe_depends = [native_gimp_exe]
-+  endif
-+
+-if meson.can_run_host_binaries() and have_gobject_introspection
++if not meson.is_cross_build() and have_gobject_introspection
    if enable_console_bin
      gimp_real_exe = gimpconsole_exe
    else
---- a/gimp-data/images/meson.build
-+++ b/gimp-data/images/meson.build
-@@ -1,18 +1,34 @@
- ## Splash Image and Welcome Dialog ##
-
--splash = custom_target('gimp-splash.png',
--                       input : [ 'export-splash.py' ],
--                       output: [ 'gimp-splash.png', ],
--                       depends: [ gimp_exe_depends ],
--                       command: [ gimp_exe, '-nidfs',
--                                  files('gimp-splash.xcf.xz'),
--                                  '--batch-interpreter', 'python-fu-eval',
--                                  '-b', '-', '--quit'],
--                       feed: true,
--                       build_by_default: true,
--                       env: gimp_run_env,
--                       install_dir: gimpdatadir / 'images',
--                       install: true)
-+if not meson.is_cross_build()
-+  splash = custom_target('gimp-splash.png',
-+                         input : [ 'export-splash.py' ],
-+                         output: [ 'gimp-splash.png', ],
-+                         depends: [ gimp_exe_depends ],
-+                         command: [ gimp_exe, '-nidfs',
-+                                    files('gimp-splash.xcf.xz'),
-+                                    '--batch-interpreter', 'python-fu-eval',
-+                                    '-b', '-', '--quit'],
-+                         feed: true,
-+                         build_by_default: true,
-+                         env: gimp_run_env,
-+                         install_dir: gimpdatadir / 'images',
-+                         install: true)
-+else
-+  splash = custom_target('gimp-splash.png',
-+                         input : [ 'export-splash.py' ],
-+                         output: [ 'gimp-splash.png', ],
-+                         depends: [],
-+                         command: [ gimp_exe, '-nidfs',
-+                                    files('gimp-splash.xcf.xz'),
-+                                    '--batch-interpreter', 'python-fu-eval',
-+                                    '-b', '-', '--quit'],
-+                         feed: true,
-+                         build_by_default: true,
-+                         env: native_gimp_run_env,
-+                         install_dir: gimpdatadir / 'images',
-+                         install: true)
-+endif
-
- ## Windows Installer's Splash Image and Intro Banner ##
-

srcpkgs/jujutsu/template

@@ -1,6 +1,6 @@
 # Template file for 'jujutsu'
 pkgname=jujutsu
-version=0.39.0
+version=0.40.0
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/martinvonz/jj"
 changelog="https://github.com/martinvonz/jj/blob/main/CHANGELOG.md"
 distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz"
-checksum=52a60f058cf66ba3dc0bf69f189e99763b33b6770b3068b2be4fe76ecd287282
+checksum=ca45f2b866ce2fa25c7fc485e6b168cf055a39b1eab0ea170738c0b7e86d3b33
 conflicts="jj>=0"
 
 do_install() {

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=11.13.03
+version=11.14.00
 revision=1
-_githash=65ff32d59710978e7de3e49f406ff3d48a008f5a
-_githash_guide=38459fe63adb350f0c18aafad10fc459a3fde332
+_githash=14e2fdf6541f3de847d56b09a704b71057a87f30
+_githash_guide=02e70ec65cc4161d4a5121a0cf5460a419401a75
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="flex perl pkg-config python3"
@@ -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="2e0705e9bd8b007cb1efcd4955088070e0b715169aa6c8691d425188fa69b507
- b846dc39074cb683f5ef84b8dab0fb5b005f9aeac58170eecbd74ba1e5a0de2e"
+checksum="508a618f4adaaa03b8a2fb94f7034a694f0707b7cfa9ffee19219a9e3d4bcf88
+ 42b1ce6597bc3e063e4010a4911d74775649421ccd9d28e66d32c2757909dd7d"
 
 post_extract() {
 	cd $build_wrksrc

srcpkgs/samurai/template

@@ -1,14 +1,15 @@
 # Template file for 'samurai'
 pkgname=samurai
-version=1.2
+version=1.3
 revision=1
 build_style=gnu-makefile
 short_desc="Ninja-compatible build tool written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="MIT AND Apache-2.0"
 homepage="https://github.com/michaelforney/samurai"
+changelog="https://github.com/michaelforney/samurai/releases"
 distfiles="https://github.com/michaelforney/samurai/archive/${version}.tar.gz"
-checksum=37a2d9f35f338c53387eba210bab7e5d8abe033492664984704ad84f91b71bac
+checksum=44ff119a27b343ec47a797fa8701c19b9e672230bc15f3c6a6cede9641ea6332
 
 post_install() {
 	vlicense LICENSE

srcpkgs/spectre-meltdown-checker/template

@@ -1,14 +1,14 @@
 # Template file for 'spectre-meltdown-checker'
 pkgname=spectre-meltdown-checker
-version=0.46
+version=26.26.0404682
 revision=1
 short_desc="Spectre & Meltdown vulnerability/mitigation checker for Linux"
 depends="binutils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/speed47/spectre-meltdown-checker"
 distfiles="https://github.com/speed47/spectre-meltdown-checker/archive/v${version}.tar.gz"
-checksum=3aad74e13db23da34c248f99fd87e9b193e00aad2b68bc9f578ce0241cb9db7f
+checksum=941cb4b38581b51d262328a04c81c8776c423325a0c03e486d30768e04483024
 
 do_install() {
 	vbin spectre-meltdown-checker.sh spectre-meltdown-checker

srcpkgs/stress-ng/template

@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.20.01
+version=0.21.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,7 +9,7 @@ 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=f974863d1861e7e7b5d19e381a17f22d653dcafa12096ac96d11b2e62a22ea77
+checksum=1339cbc6ccbff7e2ee2177bf0fd67e7b94e8ff7b07fe89bcfaec0280d800cf34
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

srcpkgs/vhba-module-dkms/template

@@ -1,14 +1,14 @@
 # Template file for 'vhba-module-dkms'
 pkgname=vhba-module-dkms
-version=20250329
+version=20260313
 revision=1
 conf_files="/usr/lib/udev/rules.d/40-vhba.rules"
 short_desc="Virtual (SCSI) HBA module used by cdemu"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.xz"
-checksum=a62a20d720ddf0cfe5a53228f4513d498d89c2ead9e9af0b1b6959ff8126075e
+checksum=293003bf5d9dc2b386db0d05f595c5548355a535d6dfc06fd379fd98bb190174
 
 dkms_modules="vhba-module ${version}"
 depends="dkms"

srcpkgs/victoria-logs/template

@@ -1,6 +1,6 @@
 # Template file for 'victoria-logs'
 pkgname=victoria-logs
-version=1.48.0
+version=1.49.0
 revision=1
 build_style=go
 go_import_path="github.com/VictoriaMetrics/VictoriaLogs"
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://victoriametrics.com/products/victorialogs/"
 changelog="https://docs.victoriametrics.com/victorialogs/changelog/"
 distfiles="https://github.com/VictoriaMetrics/VictoriaLogs/archive/v${version}.tar.gz"
-checksum=9b8c3250a1dd4c336753392baa9884301b741b3c37cab536cc4639b6117ad207
+checksum=750fd3a08ce229b20977229c83ac47af28fac94d577ff94f0df6cf61c02a0617
 
 system_accounts="_vlogs"
 _vlogs_homedir="/var/lib/victoria-logs"

srcpkgs/victoria-metrics/template

@@ -1,6 +1,6 @@
 # Template file for 'victoria-metrics'
 pkgname=victoria-metrics
-version=1.137.0
+version=1.139.0
 revision=1
 build_style=go
 go_import_path="github.com/VictoriaMetrics/VictoriaMetrics"
@@ -22,7 +22,7 @@ license="Apache-2.0"
 homepage="https://victoriametrics.com/"
 changelog="https://docs.victoriametrics.com/changelog/"
 distfiles="https://github.com/VictoriaMetrics/VictoriaMetrics/archive/v${version}.tar.gz"
-checksum=70a71f414dd83cfb97efe2ad819fc8707be4222ec8c11900d68da11de6456afc
+checksum=9e622fa1c59f89bc9b9c8e34cc8d9458eecc30b58961c8aa97012ef08b9bd293
 
 system_accounts="_vmetrics"
 _vmetrics_homedir="/var/lib/victoria-metrics"

srcpkgs/wine/template

@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=11.5
+version=11.6
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -17,8 +17,8 @@ distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar
 # For zero subversions
 #distfiles="https://dl.winehq.org/wine/source/${version%.*}.0/wine-${_pkgver}.tar.xz
 # https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="11370b57ea5d548a54d92c9cd65d0ba635f4f1c3eadace09ed1c419f705e19d1
- 1b3772b9ef0b736bc0d900f2a24d62674a8b9b4d7ad38e67cfac08dc8b68d85a"
+checksum="d49d166975478f609e6a9cdbda0a07c65a3b795e061fc454d3f1034c828d19e0
+ e5e4f56b10dfd5ba74848b51d19687091eeafaa338aa367bc8276c9ad2a8f5c1"
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine