[pull] master from void-linux:master

common/environment/setup/python.sh

@@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}"
 py2_sitelib="${py2_lib}/site-packages"
 py2_inc="usr/include/python${py2_ver}"
 
-py3_ver="3.13"
+py3_ver="3.14"
 py3_abiver=""
 py3_lib="usr/lib/python${py3_ver}"
 py3_sitelib="${py3_lib}/site-packages"

common/hooks/pre-configure/02-script-wrapper.sh

@@ -251,7 +251,7 @@ hook() {
 	generic_wrapper3 libetpan-config
 	generic_wrapper3 giblib-config
 	python_wrapper python-config 2.7
-	python_wrapper python3-config 3.13
+	python_wrapper python3-config 3.14
 	apr_apu_wrapper apu-1-config
 	qemu_wrapper llvm-config
 }

common/hooks/pre-pkg/03-restrict-py3-version.sh

@@ -0,0 +1,31 @@
+# vim: set ts=4 sw=4 et:
+#
+# This hook performs the following task:
+# - Identifies any python3 runtime dependencies
+# - If any are found, ensures that the base python3 package is included
+# - Restricts the python3 version to the same minor specified in $py3_ver
+
+hook() {
+    [ -d "${PKGDESTDIR}/${py3_lib}" ] || return 0
+    [ "${pkgname}" = python3 ] && return 0
+
+    local dep rdeps
+    for dep in ${run_depends}; do
+        case "${dep}" in
+            python3 | "python3>"* | "python3<"* | "python3-${py3_ver}"* ) ;;
+            *) rdeps+=( "${dep}" ) ;;
+        esac
+    done
+
+    local minor next_minor
+
+    minor="${py3_ver#3.}"
+    next_minor="$(( "${minor}" + 1 ))" >/dev/null 2>&1 || next_minor=
+
+    if ! [ "${next_minor}" -gt "${minor}" ]; then
+        msg_error 'unable to determine python3 minor bounds from $py3_ver\n'
+    fi
+
+    rdeps+=( "python3>=3.${minor}.0_1<3.${next_minor}.0_1" )
+    run_depends="${rdeps[*]}"
+}

common/shlibs

@@ -622,7 +622,7 @@ libboost_type_erasure.so.1.89.0 libboost_type_erasure-1.89.0_1
 libboost_fiber.so.1.89.0 libboost_fiber-1.89.0_1
 libboost_mpi.so.1.89.0 libboost_mpi-1.89.0_1
 libboost_mpi_python313.so.1.89.0 libboost_mpi-python3-1.89.0_1
-libboost_python313.so.1.89.0 boost-python3-1.89.0_1
+libboost_python314.so.1.89.0 boost-python3-1.89.0_2
 libexempi.so.8 exempi-2.5.0_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2-1.45.so.2 libsgutils-1.45_1
@@ -1657,8 +1657,8 @@ libportaudio.so.2 portaudio-19.20140130_1
 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
-libpython3.so python3-3.13.0_1
-libpython3.13.so.1.0 python3-3.13.0_1
+libpython3.so python3-3.14.0_1
+libpython3.14.so.1.0 python3-3.14.0_1
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
 libxmlrpc++.so.8 xmlrpc-c-1.51.06_2

srcpkgs/Carla/template

@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.5.10
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

srcpkgs/DSView/template

@@ -1,7 +1,7 @@
 # Template file for 'DSView'
 pkgname=DSView
 version=1.3.2
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="boost-devel-minimal fftw-devel libglib-devel libusb-devel python3-devel qt5-devel"
@@ -12,3 +12,5 @@ homepage="https://github.com/DreamSourceLab/DSView"
 changelog="https://raw.githubusercontent.com/DreamSourceLab/DSView/master/NEWS31"
 distfiles="https://github.com/DreamSourceLab/DSView/archive/refs/tags/v${version}.tar.gz"
 checksum=da68674c32da7bd212883d599267a137ce152060d28796ea16cc3442695de7ab
+
+export CFLAGS="-fpermissive"

srcpkgs/DisplayCAL/template

@@ -1,7 +1,7 @@
 # Template file for 'DisplayCAL'
 pkgname=DisplayCAL
-version=3.9.12
-revision=2
+version=3.9.17
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/eoyilmaz/displaycal-py3"
 distfiles="https://github.com/eoyilmaz/displaycal-py3/archive/refs/tags/${version}.tar.gz"
-checksum=6ea182a5992f316f6aa63d55333e5e9caa065807224b8840470d461bb30e9ff8
+checksum=ddc84d7e2c6b4bbaf981d2a8fb99910d14fd39b89023de4fac824098eb567544
 make_check=no # checks fail to build
 
 pre_configure() {

srcpkgs/GCP-Guest-Environment/template

@@ -1,7 +1,7 @@
 # Template file for 'GCP-Guest-Environment'
 pkgname=GCP-Guest-Environment
 version=20191210
-revision=6
+revision=7
 build_wrksrc="packages/python-google-compute-engine"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-distro"

srcpkgs/Grammalecte/template

@@ -1,7 +1,7 @@
 # Template file for 'Grammalecte'
 pkgname=Grammalecte
 version=1.6.0
-revision=7
+revision=8
 create_wrksrc=yes
 build_style=python3-module
 hostmakedepends="python3-setuptools"

srcpkgs/Komikku/template

@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=1.85.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 hostmakedepends="gettext glib-devel pkg-config desktop-file-utils

srcpkgs/LabJackPython/template

@@ -1,7 +1,7 @@
 # Template file for 'LabJackPython'
 pkgname=LabJackPython
 version=2.0.4
-revision=6
+revision=7
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 exodriver"

srcpkgs/OpenLP/template

@@ -1,7 +1,7 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
 version=3.1.7
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools qt5-host-tools"
 depends="python3-alembic python3-platformdirs python3-BeautifulSoup4

srcpkgs/PackageKit/template

@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
 version=1.2.4
-revision=4
+revision=5
 build_style=meson
 build_helper="gir"
 configure_args="-Dgstreamer_plugin=false -Dgtk_module=false

srcpkgs/PhotoCollage/template

@@ -1,7 +1,7 @@
 # Template file for 'PhotoCollage'
 pkgname=PhotoCollage
 version=1.4.8
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-Pillow python3-gobject"

srcpkgs/PyInstaller/template

@@ -1,7 +1,7 @@
 # Template file for 'PyInstaller'
 pkgname=PyInstaller
 version=4.1
-revision=5
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="zlib-devel"

srcpkgs/ReText/template

@@ -1,7 +1,7 @@
 # Template file for 'ReText'
 pkgname=ReText
 version=7.2.3
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="ImageMagick python3 qt5-host-tools qt5-tools python3-setuptools"
 makedepends="python3-Markdown python3-Markups python3-PyQt5-webkit qt5-tools"

srcpkgs/SoapySDR/template

@@ -1,7 +1,7 @@
 # Template file for 'SoapySDR'
 pkgname=SoapySDR
 version=0.8.1
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3"
 hostmakedepends="doxygen swig python3 python3-setuptools"

srcpkgs/Solaar/template

@@ -1,7 +1,7 @@
 # Template file for 'Solaar'
 pkgname=Solaar
 version=1.1.14
-revision=2
+revision=3
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-evdev python3-pyudev python3-psutil python3-yaml python3-dbus

srcpkgs/Sunflower/template

@@ -1,7 +1,7 @@
 # Template file for 'Sunflower'
 pkgname=Sunflower
 version=0.5pl63
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="libnotify-devel vte3-devel python3-setuptools python3-chardet python3-gobject"
 depends="gtk+3 vte3 python3 python3-gobject python3-chardet

srcpkgs/Trimage/template

@@ -1,7 +1,7 @@
 # Template file for 'Trimage'
 pkgname=Trimage
 version=1.0.6
-revision=7
+revision=8
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 jpegoptim optipng advancecomp pngcrush python3-PyQt5"

srcpkgs/TwitchNotifier/template

@@ -1,7 +1,7 @@
 # Template file for 'TwitchNotifier'
 pkgname=TwitchNotifier
 version=0.5
-revision=8
+revision=9
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 makedepends="python3-devel"

srcpkgs/activityrelay/template

@@ -1,7 +1,7 @@
 # Template file for 'activityrelay'
 pkgname=activityrelay
 version=0.2.4
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-aiohttp python3-aputils python3-cachetools python3-click

srcpkgs/afew/template

@@ -1,7 +1,7 @@
 # Template file for 'afew'
 pkgname=afew
 version=3.0.1
-revision=8
+revision=9
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-Sphinx pkg-config"
 depends="notmuch-python3 python3-dkimpy python3-chardet notmuch"

srcpkgs/afl++/template

@@ -1,7 +1,7 @@
 # Template file for 'afl++'
 pkgname=afl++
 version=4.34c
-revision=2
+revision=3
 archs="i686* x86_64* aarch64*"
 build_helper="qemu"
 build_style=gnu-makefile

srcpkgs/aircrack-ng/template

@@ -1,7 +1,7 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.7
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake ethtool libtool pkg-config python3 python3-setuptools"
 makedepends="libhwloc-devel libnl3-devel libpcap-devel libpciaccess-devel

srcpkgs/alienfx/template

@@ -1,7 +1,7 @@
 # Template file for 'alienfx'
 pkgname=alienfx
 version=2.4.3
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-usb python3-cairo python3-gobject python3-setuptools

srcpkgs/alot/template

@@ -1,7 +1,7 @@
 # Template file for 'alot'
 pkgname=alot
 version=0.11
-revision=1
+revision=2
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-Sphinx
  python3-notmuch2 python3-cffi python3-importlib_metadata"