New package: q5go 2.1.1

.github/workflows/build.yaml

@@ -21,6 +21,8 @@ jobs:
       - run: common/travis/changed_templates.sh
       - run: common/travis/fetch-xtools.sh
       - run: common/travis/xlint.sh
+      # GitHub Action create a merge commit, ignore it
+      - run: common/scripts/lint-commits FETCH_HEAD HEAD^2
 
   # Build changed packages.
   build:

Manual.md

@@ -1531,7 +1531,8 @@ This sets some environment variables required to allow cross compilation. Suppor
 building a python module for multiple versions from a single template is also possible.
 The `python3-pep517` build style provides means to build python packages that provide a build-system
 definition compliant with [PEP 517](https://www.python.org/dev/peps/pep-0517/) without a traditional
-`setup.py` script.
+`setup.py` script. The `python3-pep517` build style does not provide a specific build backend, so
+packages will need to add an appropriate backend provider to `hostmakedepends`.
 
 Python packages that rely on `python3-setuptools` should generally map `setup_requires`
 dependencies in `setup.py` to `hostmakedepends` in the template and `install_requires`
@@ -2097,4 +2098,4 @@ to pull in new changes:
 ## Help
 
 If after reading this `manual` you still need some kind of help, please join
-us at `#xbps` via IRC at `irc.freenode.net`.
+us at `#xbps` via IRC at `irc.libera.chat`.

common/scripts/lint-commits

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+die() {
+	printf '%s\n' "$*" >&2
+	exit 1
+}
+
+GIT_CMD=$(command -v chroot-git 2>/dev/null) ||
+GIT_CMD=$(command -v git 2>/dev/null) ||
+die "neither chroot-git nor git could be found!"
+
+rev_parse() {
+	if [ -n "$1" ]; then
+		"$GIT_CMD" rev-parse --verify "$1"
+	else
+		shift
+		while test "$#" != 0
+		do
+			"$GIT_CMD" rev-parse --verify "$1" 2>/dev/null && return
+			shift
+		done
+		return 1
+	fi
+}
+
+base=$(rev_parse "$1" FETCH_HEAD ORIG_HEAD) || die "base commit not found"
+tip=$(rev_parse "$2" HEAD) || die "tip commit not found"
+status=0
+
+for cmt in $("$GIT_CMD" rev-list --abbrev-commit $base..$tip)
+do
+	"$GIT_CMD" cat-file commit "$cmt" |
+	awk -vC="$cmt" '
+	# skip header
+	/^$/ && !msg { msg = 1; next }
+	!msg { next }
+	# 3: long-line-is-banned-except-footnote-like-this-for-url
+	(NF > 2) && (length > 80) { print C ": long line: " $0; exit 1 }
+	!subject {
+		if (length > 50) { print C ": subject is a bit long" }
+		# Below check is too noisy?
+		# if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) {
+		# 	print C ": not new package/update/removal?"
+		# }
+		subject = 1; next
+	}
+	/^$/ { body = 1; next }
+	!body { print C ": second line must be blank"; exit 1 }
+	' || status=1
+done
+exit $status

common/shlibs

@@ -16,7 +16,7 @@
 # PLEASE NOTE: when multiple packages provide the same SONAME, the first
 # one (order top->bottom) is preferred over the next ones.
 #
-libc.so musl-1.1.21_1
+libc.so musl-1.1.24_7
 libc.so.6 glibc-2.32_1
 libm.so.6 glibc-2.32_1
 libpthread.so.0 glibc-2.32_1
@@ -883,8 +883,8 @@ libdiscid.so.0 libdiscid-0.2.2_1
 librhythmbox-core.so.10 librhythmbox-3.4.1_1
 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
-libraw.so.19 libraw-0.19.0_1
-libraw_r.so.19 libraw-0.19.0_1
+libraw.so.20 libraw-0.20.2_1
+libraw_r.so.20 libraw-0.20.2_1
 libkritaversion.so.20 krita-4.4.0_1
 libkritaglobal.so.20 krita-4.4.0_1
 libkritaplugin.so.20 krita-4.4.0_1
@@ -984,10 +984,11 @@ libuchardet.so.0 uchardet-0.0.6_1
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.2 confuse-3.2.1_1
-liblldb.so.11 lldb-11.0.0_1
-libclang.so.11 libclang-11.0.0_1
-libclang-cpp.so.11 libclang-cpp-11.0.0_1
+liblldb.so.12 lldb-12.0.0_1
+libclang.so.12 libclang-12.0.0_1
+libclang-cpp.so.12 libclang-cpp-12.0.0_1
 libLLVM-11.so libllvm11-11.0.0_1
+libLLVM-12.so libllvm12-12.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1
@@ -1329,7 +1330,7 @@ libunwind-ppc32.so.8 libunwind-1.5.0_3
 libunwind-ppc64.so.8 libunwind-1.5.0_3
 libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
-libmicrodns.so.0 libmicrodns-0.1.0_1
+libmicrodns.so.1 libmicrodns-0.2.0_1
 libgit2.so.1.0 libgit2-1.0.1_3
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
@@ -1599,7 +1600,7 @@ libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3
 libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3
 libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3
 libuwac0.so.0 libfreerdp-2.2.0_3
-libcppunit-1.14.so.0 libcppunit-1.14.0_1
+libcppunit-1.15.so.1 libcppunit-1.15.1_1
 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
 libOgreMain.so.1.12.9 libogre-1.12.9_1
@@ -3060,9 +3061,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.26 libprotobuf26-lite-3.15.0_1
-libprotoc.so.26 libprotoc26-3.15.0_1
-libprotobuf.so.26 libprotobuf26-3.15.0_1
+libprotobuf-lite.so.28 libprotobuf28-lite-3.17.0_1
+libprotoc.so.28 libprotoc28-3.17.0_1
+libprotobuf.so.28 libprotobuf28-3.17.0_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
@@ -3617,18 +3618,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.15 grpc-1.36.0_2
-libgpr.so.15 grpc-1.36.0_2
-libgrpc++.so.1.37 grpc-1.37.1_1
-libgrpc++_alts.so.1.37 grpc-1.37.1_1
-libgrpc++_error_details.so.1.37 grpc-1.37.1_1
-libgrpc++_reflection.so.1.37 grpc-1.37.1_1
-libgrpc++_unsecure.so.1.37 grpc-1.37.1_1
-libgrpc.so.15 grpc-1.36.0_2
-libgrpc_plugin_support.so.1.37 grpc-1.37.1_1
-libgrpc_unsecure.so.15 grpc-1.36.0_2
-libgrpcpp_channelz.so.1.37 grpc-1.37.1_1
-libupb.so.15 grpc-1.36.0_2
+libaddress_sorting.so.16 grpc-1.38.0_1
+libgpr.so.16 grpc-1.38.0_1
+libgrpc++.so.1.38 grpc-1.38.0_1
+libgrpc++_alts.so.1.38 grpc-1.38.0_1
+libgrpc++_error_details.so.1.38 grpc-1.38.0_1
+libgrpc++_reflection.so.1.38 grpc-1.38.0_1
+libgrpc++_unsecure.so.1.38 grpc-1.38.0_1
+libgrpc.so.16 grpc-1.38.0_1
+libgrpc_plugin_support.so.1.38 grpc-1.38.0_1
+libgrpc_unsecure.so.16 grpc-1.38.0_1
+libgrpcpp_channelz.so.1.38 grpc-1.38.0_1
+libupb.so.16 grpc-1.38.0_1
 libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1

common/travis/license.lst

@@ -44,6 +44,7 @@ BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
 BSD-3-Clause-LBNL
 BSD-3-Clause-Modification
+BSD-3-Clause-No-Military-License
 BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-Warranty
@@ -109,6 +110,7 @@ CC-PDDC
 CC0-1.0
 CDDL-1.0
 CDDL-1.1
+CDL-1.0
 CDLA-Permissive-1.0
 CDLA-Sharing-1.0
 CECILL-1.0

common/xbps-src/shutils/update_check.sh

@@ -121,15 +121,15 @@ update_check() {
             *github.com*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://github.com/$pkgurlname/tags"
-                rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *//gitlab.*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)"
                 url="$pkgurlname/tags"
-                rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
-                rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
+                rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar)';;
             *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
                 url="https://download.gnome.org/sources/$pkgname/cache.json";;
@@ -139,22 +139,22 @@ update_check() {
                 rx='\b\Q'"${pkgname#R-cran-}"'\E_\K\d+(\.\d+)*(-\d+)?(?=\.tar)';;
             *rubygems.org*)
                 url="https://rubygems.org/gems/${pkgname#ruby-}"
-                rx='href="/gems/'${pkgname#ruby-}'/versions/\K[\d\.]*(?=")' ;;
+                rx='href="/gems/'${pkgname#ruby-}'/versions/\K[\d.]*(?=")' ;;
             *crates.io*)
                 url="https://crates.io/api/v1/crates/${pkgname#rust-}"
                 rx='/crates/'${pkgname#rust-}'/\K[0-9.]*(?=/download)' ;;
             *codeberg.org*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://codeberg.org/$pkgurlname/releases"
-                rx='/archive/\K[\d\.]+(?=\.tar\.gz)' ;;
+                rx='/archive/\K[\d.]+(?=\.tar\.gz)' ;;
             *hg.sr.ht*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://hg.sr.ht/$pkgurlname/tags"
-                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *git.sr.ht*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://git.sr.ht/$pkgurlname/refs"
-                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             esac
         fi
 

srcpkgs/AppStream/template

@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.13.1
+version=0.14.3
 revision=1
 wrksrc="appstream-${version}"
 build_style=meson
@@ -9,14 +9,15 @@ configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)
  -Dstemming=false -Dapidocs=false -Dqt=true"
 hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config
  qt5-host-tools $(vopt_if vala vala)"
-makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel lmdb-devel libsoup-devel"
+makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel lmdb-devel
+ libsoup-devel libcurl-devel"
 short_desc="Tools and libraries to work with AppStream metadata"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=81cf7131961fb2995691f144b92e1c791d89b7c5add430c05e41b9e751728483
+checksum=316823fc366d5dd708727f29f8f7be509b3419604c3f03cf2efd103e5c85d87d
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

srcpkgs/CopyQ/template

@@ -1,15 +1,17 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=3.13.0
+version=4.1.0
 revision=1
 build_style=cmake
-hostmakedepends="qt5-tools-devel"
+hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
+ qt5-wayland-devel wayland-devel"
 makedepends="libXtst-devel qt5-script-devel qt5-svg-devel qt5-tools-devel
- qt5-x11extras-devel"
+ qt5-x11extras-devel knotifications-devel qt5-wayland-devel wayland-devel
+ qt5-declarative-devel"
 short_desc="Clipboard manager with searchable and editable history"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
-changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES"
+changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=bde0482f9d17010c430b530f1810ed6d222bd06447258799e25a75328e2745a1
+checksum=adc97a663c9d95a5cacc2e89ad46fc8ab2b3d1436eaf076772214895d3507921

srcpkgs/ETL/template

@@ -1,11 +1,13 @@
 # Template file for 'ETL'
 pkgname=ETL
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="glibmm-devel"
 short_desc="Extended Template Library"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.synfig.org/"
 distfiles="https://github.com/synfig/synfig/releases/download/v${version}/ETL-${version}.tar.gz"
-checksum=d43396c0ac356114713469216a9257247c2588d5475590a46db63cf201d1a011
+checksum=ecb61942da60dca8e623af8ad03656897d10b03296e8907dd3c6c296390a074c

srcpkgs/EmulationStation/template

@@ -1,6 +1,6 @@
 # Template file for 'EmulationStation'
 pkgname=EmulationStation
-version=2.9.3
+version=2.9.4
 revision=1
 _pugixml_version=1.10
 build_style=cmake
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/RetroPie/EmulationStation"
 distfiles="https://github.com/RetroPie/EmulationStation/archive/v${version}.tar.gz
  https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-${_pugixml_version}.tar.gz"
-checksum="ed5125611afd7f79453b8d634a2d3495ec775c4914eb90571a20b74ead54335c
+checksum="79452f6c1e8aaebe98c19708b3587a0a45330bf20b3301d556285d5cd756fa4a
  55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a"
 
 pre_configure() {

srcpkgs/EternalTerminal/template

@@ -1,7 +1,7 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
 version=6.0.13
-revision=2
+revision=3
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"

srcpkgs/ImageMagick/template

@@ -1,9 +1,9 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-_majorver=7.0.11
-_patchver=6
-version="${_majorver}.${_patchver}"
+version=7.0.11.12
 revision=1
+_majorver=${version%.*}
+_patchver=${version##*.}
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
 build_style=gnu-configure
 configure_args="--without-autotrace --with-wmf=yes
@@ -21,7 +21,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=8adc1605784653b078572b825e8cd1d3d54f8a1b4ba86b32ca253c038f7e4c37
+checksum=b4054e9f6b6692791f37fe6f2ab5819152210e6628e69a8dbd66a41320c3c9d3
 
 subpackages="libmagick libmagick-devel"
 

srcpkgs/ImageMagick6/template

@@ -1,9 +1,9 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
-_majorver=6.9.12
-_patchver=7
-version="${_majorver}.${_patchver}"
+version=6.9.12.12
 revision=1
+_majorver=${version%.*}
+_patchver=${version##*.}
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
 build_style=gnu-configure
 configure_args="--without-autotrace --with-wmf=yes
@@ -20,7 +20,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=6abbd6afe7130edba7652a49c03a699657d6a71cf631a3c82014a31c8f93996d
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"

srcpkgs/LuaJIT/template

@@ -13,6 +13,8 @@ homepage="http://www.luajit.org"
 distfiles="http://luajit.org/download/${pkgname}-${_dist_version}.tar.gz"
 checksum=1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3
 
+build_options="lua52compat"
+
 _cross_cc="cc"
 if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
 	if [ "${XBPS_MACHINE/-musl/}" = "x86_64" ]; then
@@ -48,10 +50,15 @@ do_build() {
 		local cross="CROSS=${XBPS_CROSS_TRIPLET}-"
 	fi
 
+	if [ "$build_option_lua52compat" ]; then
+		local _xcflags="XCFLAGS=-DLUAJIT_ENABLE_LUA52COMPAT"
+	fi
+
 	unset CFLAGS LDFLAGS
 	make ${makejobs} PREFIX=/usr HOST_LUA=lua5.2 HOST_CC="${_cross_cc}" \
 		HOST_CFLAGS="$XBPS_CFLAGS" HOST_LDFLAGS="$XBPS_LDFLAGS" \
-		TARGET_CFLAGS="${_cflags}" TARGET_LDFLAGS="${_ldflags}" ${cross}
+		TARGET_CFLAGS="${_cflags}" TARGET_LDFLAGS="${_ldflags}" \
+		${_xcflags} ${cross}
 }
 
 do_install() {