Merge branch 'void-linux:master' into pixi

Author: eunos-1128

.github/workflows/build.yaml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: 'ghcr.io/void-linux/void-musl-full:20250616R1'
+      image: ghcr.io/void-linux/void-musl-full
       env:
         LICENSE_LIST: common/travis/license.lst
 
@@ -61,7 +61,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: ghcr.io/void-linux/void-${{ matrix.config.libc }}-full:20250616R1
+      image: ghcr.io/void-linux/void-${{ matrix.config.libc }}-full
       options: --platform ${{ matrix.config.platform }} --privileged
       volumes:
         - /dev:/dev

.github/workflows/cycles.yaml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       issues: write
     container:
-      image: 'ghcr.io/void-linux/void-musl-full:20250616R1'
+      image: ghcr.io/void-linux/void-musl-full
     steps:
       - name: Prepare container
         run: |

common/hooks/pre-pkg/04-generate-provides.sh

@@ -27,7 +27,7 @@ generate_pkgconfig_provides() {
 }
 
 generate_cmd_provides() {
-    find "${PKGDESTDIR}/usr/bin" -maxdepth 1 -type f -printf "cmd:%f-${version}_${revision}\n" 2>/dev/null | sort -u
+    find -P "${PKGDESTDIR}/usr/bin" -maxdepth 1 -xtype f -printf "cmd:%f-${version}_${revision}\n" 2>/dev/null | sort -u
 }
 
 generate_alt_cmd_provides() {

common/hooks/pre-pkg/04-generate-runtime-deps.sh

@@ -69,7 +69,7 @@ hook() {
     local _shlib_dir="${XBPS_STATEDIR}/shlib-provides"
     local _shlibtmp
 
-    local Qt_6_PRIVATE_API=6.10.0
+    local Qt_6_PRIVATE_API=6.10.2
 
     # Disable trap on ERR, xbps-uhelper cmd might return error... but not something
     # to be worried about because if there are broken shlibs this hook returns

common/scripts/lint-commits

@@ -49,6 +49,8 @@ do
 	!subject {
 		if (length > 50) { print "::warning title=Commit Lint::" C ": subject is a bit long" }
 		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print "::error title=Commit Lint::" C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
+		if ($0 ~ "^fixup! ") { print "::error title=Commit Lint::" C ": fixup commit included, please squash commits"; exit 1 }
+		if ($0 ~ "^Merge ") { print "::error title=Commit Lint::" C ": merge commit included, please rebase and remove merge commits"; exit 1 }
 		# Below check is too noisy?
 		# if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) {
 		# 	print "::warning title=Commit Lint::" C ": not new package/update/removal?"