diff --git a/Manual.md b/Manual.md
index 507a1872945..f0f479411e2 100644
--- a/Manual.md
+++ b/Manual.md
@@ -778,6 +778,9 @@ A special value `noarch` used to be available, but has since been removed.
- `nofixperms` If set, xbps-src will not fix common permission errors (executable manpages, etc.)
+- `no_generic_pkgconfig_link` If set, xbps-src will not create a symlink from `$XBPS_CROSS_TRIPLET-pkg-config`
+ to `$XBPS_WRAPPERDIR/pkg-config` before building the template.
+
#### About the many types of `depends` variables
@@ -1044,7 +1047,7 @@ Additional install arguments can be specified via `make_install_args`.
- `slashpackage` For packages that use the /package hierarchy and package/compile to build,
such as `daemontools` or any `djb` software.
-- `qmake` For packages that use Qt4/Qt5 qmake profiles (`*.pro`), qmake arguments
+- `qmake` For packages that use Qt5/Qt6 qmake profiles (`*.pro`), qmake arguments
for the configure phase can be passed in via `configure_args`, make build arguments can
be passed in via `make_build_args` and install arguments via `make_install_args`. The build
target can be overridden via `make_build_target` and the install target
@@ -1127,7 +1130,9 @@ It also creates the `vtargetrun` function to wrap commands in a call to
needed for cross builds and a qmake-wrapper to make `qmake` use this configuration.
This aims to fix cross-builds for when the build-style is mixed: e.g. when in a
`gnu-configure` style the configure script calls `qmake` or a `Makefile` in
-`gnu-makefile` style, respectively.
+`gnu-makefile` style, respectively. This is for Qt5 packages.
+
+- `qmake6` is like `qmake` but for Qt6.
- `rust` specifies environment variables required for cross-compiling crates via cargo and
for compiling cargo -sys crates. This helper is added by default for packages that use the
@@ -1801,8 +1806,19 @@ executable binary formats, know as binfmts.
During installation/removal it uses `update-binfmts` from the `binfmt-support` package
to register/remove entries from the arbitrary executable binary formats database.
-To include the trigger use the `binfmts` variable, as the trigger won't do anything unless
-it is defined.
+It is automatically added to packages that contain files in `usr/share/binfmts`.
+These files should be `update-binfmts` format files and will be imported with
+`update-binfmts --import`.
+
+While it is not preferred, the trigger can also be added by using the `binfmts` variable,
+which should contain lines defining binfmts to register:
+
+```
+/path/to/interpreter [update-binfmts binary format specification arguments ...]
+...
+```
+
+See [`update-binfmts(8)`](https://man.voidlinux.org/man8/update-binfmts.8) for more details.
#### dkms
diff --git a/common/build-helper/qmake6.sh b/common/build-helper/qmake6.sh
new file mode 100644
index 00000000000..945110b94ea
--- /dev/null
+++ b/common/build-helper/qmake6.sh
@@ -0,0 +1,97 @@
+# This build-helper sets up qmake’s cross environment
+# in cases the build-style is mixed,
+# e.g. when in a gnu-configure style the configure
+# script calls qmake or a makefile in a gnu-makefile style,
+# respectively.
+
+if [ "$CROSS_BUILD" ]; then
+ mkdir -p "${XBPS_WRAPPERDIR}/target-spec/linux-g++"
+ cat > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/usr/lib/qt6/mkspecs/common/linux.conf)
+include(/usr/lib/qt6/mkspecs/common/gcc-base-unix.conf)
+include(/usr/lib/qt6/mkspecs/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qconfig.pri
+QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qmodule.pri
+QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/modules
+QMAKE_CC = ${CC}
+QMAKE_CXX = ${CXX}
+QMAKE_LINK = ${CXX}
+QMAKE_LINK_C = ${CC}
+QMAKE_LINK_SHLIB = ${CXX}
+
+QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
+QMAKE_OBJCOPY = ${OBJCOPY}
+QMAKE_NM = ${NM} -P
+QMAKE_STRIP = ${STRIP}
+
+QMAKE_CFLAGS = ${CFLAGS}
+QMAKE_CXXFLAGS = ${CXXFLAGS}
+QMAKE_LFLAGS = ${LDFLAGS}
+load(qt_config)
+_EOF
+ echo "#include \"${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/linux-g++/qplatformdefs.h\"" > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qplatformdefs.h"
+
+ cat > "${XBPS_WRAPPERDIR}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt6
+Data=${XBPS_CROSS_BASE}/usr/share/qt6
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt6
+Headers=${XBPS_CROSS_BASE}/usr/include/qt6
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt6/libexec
+Binaries=/usr/lib/qt6/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt6/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt6/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/lib/qt6/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt6
+HostBinaries=/usr/lib/qt6/bin
+HostLibraries=/usr/lib
+HostLibraryExecutables=/usr/lib/qt6/libexec
+Spec=linux-g++
+TargetSpec=$XBPS_WRAPPERDIR/target-spec/linux-g++
+_EOF
+
+ # create the qmake-wrapper here because it only
+ # makes sense together with the qmake build-helper
+ # and not to interfere with e.g. the qmake build-style
+ #
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # + hardening flags will be picked up from environment variables
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+ QMAKE_CFLAGS+="\${CFLAGS}" \\
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+ QMAKE_LFLAGS+="\${LDFLAGS}"
+_EOF
+else
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake \
+ "\$@" \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC="$CC" QMAKE_CXX="$CXX" \
+ QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \
+ QMAKE_CFLAGS+="\${CFLAGS}" \
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
+ QMAKE_LFLAGS+="\${LDFLAGS}" \
+ CONFIG+=no_qt_rpath
+_EOF
+fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt6}
+cp -p ${XBPS_WRAPPERDIR}/qmake{,6}
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index ba0845bba5d..3d2fde7d2b1 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -8,13 +8,15 @@ unalias -a
# disable wildcards helper
_noglob_helper() {
- set +f
- "$@"
+ set +f
+ IFS= "$@"
}
# Apply _noglob to v* commands
for cmd in vinstall vcopy vcompletion vmove vmkdir vbin vman vdoc vconf vsconf vlicense vsv; do
- alias ${cmd}="set -f; _noglob_helper _${cmd}"
+ # intentionally expanded when defined
+ # shellcheck disable=SC2139
+ alias ${cmd}="set -f; _noglob_helper _${cmd}"
done
_vsv() {
@@ -24,6 +26,8 @@ _vsv() {
local svdir="${PKGDESTDIR}/etc/sv/${service}"
if [ $# -lt 1 ] || [ $# -gt 2 ]; then
+ # pkgver is defined in common/xbps-src/shutils/commmon.sh
+ # shellcheck disable=SC2154
msg_red "$pkgver: vsv: up to 2 arguments expected: []\n"
return 1
fi
@@ -34,26 +38,26 @@ _vsv() {
vmkdir etc/sv
vcopy "${FILESDIR}/$service" etc/sv
- if [ ! -L $svdir/run ]; then
- grep -Fq 'exec 2>&1' $svdir/run || msg_warn "$pkgver: vsv: service '$service' does not contain 'exec 2>&1' to log stderr\n"
- chmod 755 $svdir/run
+ if [ ! -L "$svdir/run" ]; then
+ grep -Fq 'exec 2>&1' "$svdir/run" || msg_warn "$pkgver: vsv: service '$service' does not contain 'exec 2>&1' to log stderr\n"
+ chmod 755 "$svdir/run"
fi
- if [ -e $svdir/finish ] && [ ! -L $svdir/finish ]; then
- chmod 755 $svdir/finish
+ if [ -e "$svdir/finish" ] && [ ! -L "$svdir/finish" ]; then
+ chmod 755 "$svdir/finish"
fi
- ln ${LN_OPTS} /run/runit/supervise.${service} $svdir/supervise
- if [ -d $svdir/log ] || [ -L $svdir/log ]; then
+ ln ${LN_OPTS} "/run/runit/supervise.${service}" "$svdir/supervise"
+ if [ -d "$svdir/log" ] || [ -L "$svdir/log" ]; then
msg_warn "$pkgver: vsv: overriding default log service\n"
else
- mkdir $svdir/log
- cat <<-EOF > $svdir/log/run
+ mkdir "$svdir/log"
+ cat <<-EOF > "$svdir/log/run"
#!/bin/sh
exec vlogger -t $service -p $facility
EOF
fi
- ln ${LN_OPTS} /run/runit/supervise.${service}-log $svdir/log/supervise
- if [ -e $svdir/log/run ] && [ ! -L $svdir/log/run ]; then
- chmod 755 ${PKGDESTDIR}/etc/sv/${service}/log/run
+ ln ${LN_OPTS} "/run/runit/supervise.${service}-log" "$svdir/log/supervise"
+ if [ -e "$svdir/log/run" ] && [ ! -L "$svdir/log/run" ]; then
+ chmod 755 "${PKGDESTDIR}/etc/sv/${service}/log/run"
fi
}
@@ -120,6 +124,8 @@ _vdoc() {
return 1
fi
+ # pkgname is defined in the package
+ # shellcheck disable=SC2154
vinstall "$file" 644 "usr/share/doc/${pkgname}" "$targetfile"
}
@@ -175,9 +181,9 @@ _vinstall() {
fi
if [ -z "$targetfile" ]; then
- install -Dm${mode} "${file}" "${PKGDESTDIR}/${targetdir}/${file##*/}"
+ install -Dm"${mode}" "${file}" "${PKGDESTDIR}/${targetdir}/${file##*/}"
else
- install -Dm${mode} "${file}" "${PKGDESTDIR}/${targetdir}/${targetfile##*/}"
+ install -Dm"${mode}" "${file}" "${PKGDESTDIR}/${targetdir}/${targetfile##*/}"
fi
}
@@ -193,7 +199,9 @@ _vcopy() {
return 1
fi
- cp -a $files ${PKGDESTDIR}/${targetdir}
+ # intentionally unquoted for globbing
+ # shellcheck disable=SC2086
+ cp -a $files "${PKGDESTDIR}/${targetdir}"
}
_vmove() {
@@ -219,13 +227,17 @@ _vmove() {
done
if [ -z "${_targetdir}" ]; then
- [ ! -d ${PKGDESTDIR} ] && install -d ${PKGDESTDIR}
- mv ${DESTDIR}/$files ${PKGDESTDIR}
+ [ ! -d "${PKGDESTDIR}" ] && install -d "${PKGDESTDIR}"
+ # intentionally unquoted for globbing
+ # shellcheck disable=SC2086
+ mv "${DESTDIR}"/$files "${PKGDESTDIR}"
else
- if [ ! -d ${PKGDESTDIR}/${_targetdir} ]; then
- install -d ${PKGDESTDIR}/${_targetdir}
+ if [ ! -d "${PKGDESTDIR}/${_targetdir}" ]; then
+ install -d "${PKGDESTDIR}/${_targetdir}"
fi
- mv ${DESTDIR}/$files ${PKGDESTDIR}/${_targetdir}
+ # intentionally unquoted for globbing
+ # shellcheck disable=SC2086
+ mv "${DESTDIR}"/$files "${PKGDESTDIR}/${_targetdir}"
fi
}
@@ -243,9 +255,9 @@ _vmkdir() {
fi
if [ -z "$mode" ]; then
- install -d ${PKGDESTDIR}/${dir}
+ install -d "${PKGDESTDIR}/${dir}"
else
- install -dm${mode} ${PKGDESTDIR}/${dir}
+ install -dm"${mode}" "${PKGDESTDIR}/${dir}"
fi
}
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index f21017f8361..70152bad55f 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -119,10 +119,16 @@ _EOF
#
# Handle binfmts trigger
#
- if [ -n "${binfmts}" ]; then
+ if [ -n "${binfmts}" ] || [ -d "${PKGDESTDIR}/usr/share/binfmts" ]; then
_add_trigger binfmts
+ fi
+ if [ -n "${binfmts}" ]; then
echo "export binfmts=\"${binfmts}\"" >> $tmpf
fi
+ if [ -d "${PKGDESTDIR}/usr/share/binfmts" ]; then
+ _import_binfmts="$(find "${PKGDESTDIR}/usr/share/binfmts" -type f -printf '%f\n')"
+ echo "export import_binfmts=\"${_import_binfmts}\"" >> $tmpf
+ fi
#
# Handle GNU Info files.
#
diff --git a/common/hooks/post-install/15-qt-private-api.sh b/common/hooks/post-install/15-qt-private-api.sh
new file mode 100644
index 00000000000..18f3576e703
--- /dev/null
+++ b/common/hooks/post-install/15-qt-private-api.sh
@@ -0,0 +1,60 @@
+# vim: set ts=4 sw=4 et ft=bash :
+#
+# This hook execute the following tasks:
+# - warn if packages uses private Qt API but makedepends doesn't have
+# qt6-*-private-devel
+#
+# This hook only really target qt6-base-private-devel, a lot of packages
+# linked with Qt6::CorePrivate and Qt6::GuiPrivate, yet don't need its
+# headers.
+
+get_qt_private() {
+ local _elf _fn _lf
+ find ${PKGDESTDIR} -type f |
+ while read -r _fn; do
+ trap - ERR
+ _lf=${_fn#${PKGDESTDIR}}
+ if [ "${skiprdeps/${_lf}/}" != "${skiprdeps}" ]; then
+ continue
+ fi
+ read -n4 _elf < "$_fn"
+ if [ "$_elf" = $'\177ELF' ]; then
+ $OBJDUMP -p "$_fn" |
+ sed -n '
+ /required from /{s/.*required from \(.*\):/\1/;h;}
+ /Qt_[0-9]*_PRIVATE_API/{g;p;}
+ '
+ fi
+ done |
+ sort -u
+}
+
+
+hook() {
+ local _list _shlib _version _md _v _ok
+
+ if [ -n "$noverifyrdeps" ]; then
+ return 0
+ fi
+
+ _list=$(get_qt_private)
+ for _shlib in $_list; do
+ msg_normal "${pkgver}: requires PRIVATE_API from $_shlib\n"
+ done
+ _version=$(printf '%s\n' $_list | sed 's/^libQt\([0-9]*\).*/\1/' | grep -v '^5$' | uniq)
+ for _v in $_version; do
+ _ok=
+ for _md in ${makedepends}; do
+ case "${_md}" in
+ # Anything will works, because they're updated together
+ qt${_v}-*-private-devel)
+ _ok=yes
+ break
+ ;;
+ esac
+ done
+ if [ -z "$_ok" ]; then
+ msg_warn "${pkgver}: using Qt${_v}_PRIVATE_API but doesn't use qt${_v}-*-private-devel\n"
+ fi
+ done
+}
diff --git a/common/shlibs b/common/shlibs
index 6289c6b8576..4131964398e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -209,6 +209,7 @@ libpsx.so.2 libcap-2.45_1
liblzma.so.5 liblzma-5.0.0_1
libuuid.so.1 libuuid-2.18_1
libblkid.so.1 libblkid-2.18_1
+liblastlog2.so.2 liblastlog2-2.40.1_1
libidn.so.12 libidn-1.35_1
libusb-1.0.so.0 libusb-1.0.0_1
libusb-0.1.so.4 libusb-compat-0.1.0_1
@@ -426,7 +427,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.9.2 mtxclient-0.9.2_1
+libmatrix_client.so.0.10.0 mtxclient-0.10.0_1
libebml.so.5 libebml-1.4.0_1
libdvdread.so.8 libdvdread-6.1.1_1
libdvdnav.so.4 libdvdnav-4.1.3_1
@@ -472,7 +473,6 @@ libfsimage.so.1.0 xen-libs-4.10.0_1
libxenstat.so.4.14 xen-libs-4.14.0_1
libfam.so.0 gamin-0.1.10_1
libgamin-1.so.0 gamin-0.1.10_1
-libkateprivate.so.24.02.2 libkate-24.02.2_1
libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
libKPim6Libkleo.so.6 libkleo-24.02.0_1
libKPim5GrantleeTheme.so.5 grantleetheme-23.04.0_1
@@ -565,7 +565,7 @@ libKF5Holidays.so.5 kholidays-5.47.0_1
libPhabricatorHelpers.so.5 purpose-5.48.0_1
libKF5PurposeWidgets.so.5 purpose-5.48.0_1
libKF5Purpose.so.5 purpose-5.48.0_1
-libKF6PulseAudioQt.so.4 pulseaudio-qt-1.4_1
+libKF6PulseAudioQt.so.5 pulseaudio-qt-1.5_1
libReviewboardHelpers.so.5 purpose-5.48.0_1
libecpg_compat.so.3 postgresql-libs-16.1_1
libecpg.so.6 postgresql-libs-16.1_1
@@ -587,7 +587,6 @@ libverto-k5ev.so.0 mit-krb5-libs-1.8_1
libmenu-cache.so.3 menu-cache-1.0.0_1
libupower-glib.so.3 libupower-glib3-0.99.3_1
libcanberra.so.0 libcanberra-0.23_1
-libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
libgtop-2.0.so.11 libgtop-2.38.0_1
librarian.so.0 rarian-0.8.1_1
@@ -882,7 +881,7 @@ libp11-kit.so.0 p11-kit-0.7_1
librest-1.0.so.0 rest-0.9.1_1
librest-extras-1.0.so.0 rest-0.9.1_1
libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
-libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
+libgoa-backend-1.0.so.2 gnome-online-accounts-3.50.0_1
liboauth.so.0 liboauth-0.9.4_1
liblcms2.so.2 lcms2-2.2_1
libcolord.so.2 libcolord-1.1.7_1
@@ -977,19 +976,23 @@ 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.17 lldb17-17.0.6_1
+liblldb.so.18.1 liblldb18-18.1.8_1
+liblldb.so.17 liblldb17-17.0.6_3
liblldb.so.15 lldb15-15.0.7_4
+libclang.so.18.1 libclang18-18.1.8_1
libclang.so.17 libclang17-17.0.6_1
libclang.so.15 libclang15-15.0.7_4
+libclang-cpp.so.18.1 libclang-cpp18-18.1.8_1
libclang-cpp.so.17 libclang-cpp17-17.0.6_1
libclang-cpp.so.15 libclang-cpp15-15.0.7_4
libLLVM-11.so libllvm11-11.0.0_1
libLLVM-12.so libllvm12-12.0.0_1
libLLVM-15.so libllvm15-15.0.7_4
libLLVM-17.so libllvm17-17.0.6_1
-libLLVMSPIRVLib.so.17 SPIRV-LLVM-Translator-17.0.0_1
+libLLVM.so.18.1 libllvm18-18.1.8_1
+libLLVMSPIRVLib.so.18.1 SPIRV-LLVM-Translator-18.1.2_1
libomp.so.5 libomp-17.0.6_1
-libomptarget.so.17 libomp-17.0.3_1
+libomptarget.so.18.1 libomp-18.1.8_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
@@ -1024,6 +1027,7 @@ libparserutils.so.0 libparserutils-0.1.1_1
libwapcaplet.so.0 libwapcaplet-0.1.0_1
libcss.so.0 libcss-0.1.1_1
libhubbub.so.0 libhubbub-0.1.1_1
+libhs.so.5 vectorscan-5.4.11_1
liblutok.so.3 lutok-0.4_1
libmtdev.so.1 mtdev-1.1.2_1
libcryptsetup.so.12 libcryptsetup-2.3.4_2
@@ -1112,9 +1116,9 @@ libmowgli-2.so.0 libmowgli-2.1.3_8
libgts-0.7.so.5 gts-0.7.6_1
libguess.so.1 libguess-1.1_1
libaudcore.so.5 audacious-base-4.3.1_1
-libaudgui.so.5 audacious-base-4.3.1_1
+libaudgui.so.6 audacious-base-4.3.1_1
libaudtag.so.3 audacious-base-4.3.1_1
-libaudqt.so.2 audacious-base-4.3.1_1
+libaudqt.so.3 audacious-base-4.3.1_1
libgstreamer-1.0.so.0 gstreamer1-1.0.0_1
libgstbase-1.0.so.0 gstreamer1-1.0.0_1
libgstcontroller-1.0.so.0 gstreamer1-1.0.0_1
@@ -1312,7 +1316,7 @@ librumpdev_audio.so.0 netbsd-rumpkernel-20140526_3
librumpclient.so.0 netbsd-rumpkernel-20140526_3
libdotconf.so.0 dotconf-1.3_1
libspeechd.so.2 speech-dispatcher-0.8_1
-libre2.so.10 re2-2023.03.01_1
+libre2.so.11 re2-2024.06.01_1
libminizip.so.1 minizip-1.2.7_1
libsrtp2.so.1 libsrtp-2.1.0_1
libjsoncpp.so.25 jsoncpp-1.9.5_1
@@ -1373,8 +1377,8 @@ libkdexoauth2.so.3 libkgapi-24.02.0_1
libqoauth.so.2 qoauth-qt5-2.0.0_1
libIrrlicht.so.1.8 irrlicht-1.8_1
libsnappy.so.1 snappy-1.1.0_1
-libbenchmark.so.1 benchmark-1.5.5_1
-libbenchmark_main.so.1 benchmark-1.5.5_1
+libbenchmark.so.0 benchmark-1.8.4_1
+libbenchmark_main.so.0 benchmark-1.8.4_1
libbemenu.so.0 bemenu-0.6.5_1
libKTorrent6.so.6 libktorrent-24.02.0_1
libvncserver.so.1 libvncserver-0.9.13_2
@@ -1587,6 +1591,14 @@ libuwac0.so.0 libfreerdp-2.2.0_3
libfreerdp-server2.so.2 libfreerdp-server-2.4.0_1
libfreerdp-shadow-subsystem2.so.2 libfreerdp-server-2.4.0_1
libfreerdp-shadow2.so.2 libfreerdp-server-2.4.0_1
+libfreerdp-client3.so.3 libfreerdp3-3.5.1_1
+libfreerdp-server-proxy3.so.3 libfreerdp3-server-3.5.1_1
+libfreerdp-server3.so.3 libfreerdp3-server-3.5.1_1
+libfreerdp-shadow-subsystem3.so.3 libfreerdp3-server-3.5.1_1
+libfreerdp-shadow3.so.3 libfreerdp3-server-3.5.1_1
+libfreerdp3.so.3 libfreerdp3-3.5.1_1
+libwinpr-tools3.so.3 libfreerdp3-3.5.1_1
+libwinpr3.so.3 libfreerdp3-3.5.1_1
libcppunit-1.15.so.1 libcppunit-1.15.1_1
libcalc.so.2.14.3.5 libcalc-2.14.3.5_1
libcustcalc.so.2.14.3.5 libcalc-2.14.3.5_1
@@ -1770,7 +1782,7 @@ libblas.so.3 blas-3.5.0_1
libcblas.so.3 cblas-3.6.0_1
liblapack.so.3 lapack-3.5.0_1
libcinnamon-menu-3.so.0 cinnamon-menus-2.2.0_1
-libmate-desktop-2.so.17 mate-desktop-1.8.0_1
+libmate-desktop-2.so.17 mate-desktop-1.8.2_1
libmarco-private.so.2 libmarco-1.22.2_1
libmate-menu.so.2 mate-menus-1.8.0_1
libcaja-extension.so.1 libcaja-1.8.1_1
@@ -1941,6 +1953,7 @@ libQt6Xdg.so.4 libqtxdg-4.0.0_1
libQt6XdgIconLoader.so.4 libqtxdg-4.0.0_1
libqwt-qt5.so.6.2 qwt-6.2.0_2
libqwt-qt6.so.6.2 qwt-qt6-6.2.0_2
+libKF6BreezeIcons.so.6 breeze-icons-6.3.0_1
libKF6Archive.so.6 kf6-karchive-6.0.0_1
libKF6Attica.so.6 kf6-attica-6.0.0_1
libKF6AuthCore.so.6 kf6-kauth-6.0.0_1
@@ -2168,7 +2181,7 @@ libopenjpeg.so.5 libopenjpeg-1.5.2_1
libopenpgl.so.0 openpgl-0.5.0_1
liboping.so.0 liboping-1.8.0_1
libloudmouth-1.so.0 loudmouth-1.5.3_12
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.18_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.19_1
libcapstone.so.5 capstone-5.0.1_1
libhavege.so.2 libhaveged-1.9.11_1
libnih.so.1 libnih-1.0.3_1
@@ -2480,7 +2493,7 @@ libCEGUISILLYImageCodec.so cegui-0.8.7_1
libct.so.4 freetds-0.95.19_1
libsybdb.so.5 freetds-0.95.19_1
libqqwing.so.2 qqwing-1.3.4_1
-libiniparser.so.1 iniparser-4.1_1
+libiniparser.so.4 iniparser-4.2.4_1
libzita-resampler.so.1 zita-resampler-1.3.0_1
libmlt.so.6 mlt-6.4.1_1
libmlt++.so.3 mlt-6.4.1_1
@@ -2560,9 +2573,9 @@ libcsound64.so.6.0 csound-6.05.0_1
libcsnd6.so.6.0 csound-6.05.0_1
libfko.so.3 libfko-2.6.9_1
libvterm.so.0 libvterm-0.3_1
-libboinc_opencl.so.7 boinc-7.16.16_2
-libboinc_api.so.7 boinc-7.16.16_2
-libboinc_graphics2.so.7 boinc-7.16.16_2
+libboinc_opencl.so.8 boinc-8.0.2_1
+libboinc_api.so.8 boinc-8.0.2_1
+libboinc_graphics2.so.8 boinc-8.0.2_1
libsynfig.so.0 synfig-1.0.1_1
libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
@@ -2674,7 +2687,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.43 libfilezilla-0.47.0_1
+libfilezilla.so.45 libfilezilla-0.48.1_1
libtommath.so.1 libtommath-1.0_1
libKF5ItemViews.so.5 kitemviews-5.26.0_1
libunicorn.so.1 unicorn-1.0_1
@@ -2724,22 +2737,22 @@ libxdo.so.3 xdotool-3.20150503.1_1
libabigail.so.4 libabigail-2.5_1
libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
libgnome-games-support-2.so.4 libgnome-games-support2-2.0.0_1
-libKDevCMakeCommon.so.512 kdevelop-23.08.2_1
-libKDevClangPrivate.so.512 kdevelop-23.08.2_1
-libKDevCompileAnalyzerCommon.so.512 kdevelop-23.08.2_1
-libKDevelopSessionsWatch.so.512 kdevelop-23.08.2_1
-libKDevPlatformDebugger.so.512 kdevelop-23.08.2_1
-libKDevPlatformDocumentation.so.512 kdevelop-23.08.2_1
-libKDevPlatformInterfaces.so.512 kdevelop-23.08.2_1
-libKDevPlatformLanguage.so.512 kdevelop-23.08.2_1
-libKDevPlatformOutputView.so.512 kdevelop-23.08.2_1
-libKDevPlatformProject.so.512 kdevelop-23.08.2_1
-libKDevPlatformSerialization.so.512 kdevelop-23.08.2_1
-libKDevPlatformShell.so.512 kdevelop-23.08.2_1
-libKDevPlatformSublime.so.512 kdevelop-23.08.2_1
-libKDevPlatformTests.so.512 kdevelop-23.08.2_1
-libKDevPlatformUtil.so.512 kdevelop-23.08.2_1
-libKDevPlatformVcs.so.512 kdevelop-23.08.2_1
+libKDevCMakeCommon.so.514 kdevelop-24.05.1_1
+libKDevClangPrivate.so.514 kdevelop-24.05.1_1
+libKDevCompileAnalyzerCommon.so.514 kdevelop-24.05.1_1
+libKDevelopSessionsWatch.so.514 kdevelop-24.05.1_1
+libKDevPlatformDebugger.so.514 kdevelop-24.05.1_1
+libKDevPlatformDocumentation.so.514 kdevelop-24.05.1_1
+libKDevPlatformInterfaces.so.514 kdevelop-24.05.1_1
+libKDevPlatformLanguage.so.514 kdevelop-24.05.1_1
+libKDevPlatformOutputView.so.514 kdevelop-24.05.1_1
+libKDevPlatformProject.so.514 kdevelop-24.05.1_1
+libKDevPlatformSerialization.so.514 kdevelop-24.05.1_1
+libKDevPlatformShell.so.514 kdevelop-24.05.1_1
+libKDevPlatformSublime.so.514 kdevelop-24.05.1_1
+libKDevPlatformTests.so.514 kdevelop-24.05.1_1
+libKDevPlatformUtil.so.514 kdevelop-24.05.1_1
+libKDevPlatformVcs.so.514 kdevelop-24.05.1_1
libts.so.0 tslib-1.6_1
libobs.so.0 obs-0.14.1_2
libobsglad.so.1 obs-28.0.1_1
@@ -3015,8 +3028,6 @@ libCGAL.so.13 cgal-4.10_1
libCGAL_Core.so.13 cgal-4.10_1
libCGAL_ImageIO.so.14 cgal-4.14_1
libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1
-libQtAVWidgets.so.1 qtav-1.12.0_1
-libQtAV.so.1 qtav-1.12.0_1
liblxpanel.so.0 lxpanel-0.9.3_1
libuim.so.8 uim-1.8.6_1
libuim-scm.so.0 uim-1.8.6_1
@@ -3026,11 +3037,11 @@ libdecoration.so.0 compiz-core-0.8.14_1
libcompizconfig.so.0 libcompizconfig-0.8.14_1
libemeraldengine.so.0 emerald-0.8.14_1
libhangul.so.1 libhangul-0.1.0_1
-libmutter-13.so.0 mutter-45.0_1
-libmutter-clutter-13.so.0 mutter-45.0_1
-libmutter-cogl-13.so.0 mutter-45.0_1
-libmutter-cogl-pango-13.so.0 mutter-45.0_1
-libmutter-mtk-13.so.0 mutter-45.0_1
+libmutter-14.so.0 mutter-46.0_1
+libmutter-clutter-14.so.0 mutter-46.0_1
+libmutter-cogl-14.so.0 mutter-46.0_1
+libmutter-cogl-pango-14.so.0 mutter-46.0_1
+libmutter-mtk-14.so.0 mutter-46.0_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.7.so.0 libgepub-0.7.1_1
libslopy.so.7.6 slop-7.6_1
@@ -3532,7 +3543,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
libcss_parser_pp.so.0 htmlcxx-0.86_1
libcss_parser.so.0 htmlcxx-0.86_1
libaom.so.3 libaom-3.4.0_1
-libre.so.18 re-3.6.0_1
+libre.so.23 re-3.11.0_1
libtpms.so.0 libtpms-0.9.0_1
libswtpm_libtpms.so.0 libswtpm-0.6.1_1
libspandsp.so.2 spandsp-0.0.6_1
@@ -3545,7 +3556,7 @@ libspa-jack.so libspa-jack-0.3.6_1
libspa-v4l2.so libspa-v4l2-0.3.6_1
libspa-videoconvert.so libspa-videoconvert-0.3.6_1
libspa-vulkan.so libspa-vulkan-0.3.6_1
-libshp.so.1 shapelib-1.4.1_1
+libshp.so.4 shapelib-1.6.0_1
libantlr3c.so libantlr3c-3.4_1
libbzrtp.so.0 bzrtp-1.0.6_1
libbellesip.so.1 belle-sip-4.4.0_1
@@ -3587,7 +3598,6 @@ libwx_gtk3u_richtext-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1
libwx_gtk3u_stc-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1
libwx_gtk3u_webview-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1
libwx_gtk3u_xrc-3.2.so.0 wxWidgets-gtk3-3.2.2.1_1
-libtepl-6.so.4 tepl-6.8.0_1
libnomacsCore.so.3 nomacs-3.10.2_4
libaudit.so.1 libaudit-2.8.4_1
libauparse.so.0 libauparse-2.8.4_1
@@ -3708,9 +3718,11 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
libqmdnsengine.so.0 qmdnsengine-0.1.0_1
libyang.so.1 libyang-1.0r5_1
libhtp.so.2 libhtp-0.5.30_1
-libgedit-46.so gedit-46.1_1
+libgedit-47.so gedit-47.0_1
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
-libgedit-gtksourceview-300.so.0 libgedit-gtksourceview-299.0.5_1
+libgedit-gtksourceview-300.so.1 libgedit-gtksourceview-299.2.1_1
+libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
+libgedit-tepl-6.so.0 libgedit-tepl-6.10.0_1
libchewing.so.3 libchewing-0.5.1_1
libdwarves.so.1 pahole-1.12_1
libdwarves_emit.so.1 pahole-1.12_1
@@ -4277,7 +4289,7 @@ libreadosm.so.1 readosm-1.1.0a_1
libSvtAv1Enc.so.1 libsvt-av1-1.3.0_1
libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
libyascreen.so.0 yascreen-1.96_1
-libyyjson.so.0 yyjson-0.9.0_1
+libyyjson.so.0 yyjson-0.10.0_1
librz_analysis.so.0.7 rizin-0.7.2_1
librz_asm.so.0.7 rizin-0.7.2_1
librz_bin.so.0.7 rizin-0.7.2_1
@@ -4333,9 +4345,9 @@ libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
libqtforkawesome.so.1 qtforkawesome-0.1.0_1
libqtquickforkawesome.so.1 qtforkawesome-0.1.0_1
-libsyncthingwidgets.so.14 syncthingtray-1.5.3_1
-libsyncthingmodel.so.14 syncthingtray-1.5.3_1
-libsyncthingconnector.so.14 syncthingtray-1.5.3_1
+libsyncthingwidgets.so.16 syncthingtray-1.5.5_1
+libsyncthingmodel.so.16 syncthingtray-1.5.5_1
+libsyncthingconnector.so.16 syncthingtray-1.5.5_1
libglibutil.so.1 libglibutil-1.0.64_1
libgbinder.so.1 libgbinder-1.1.20_1
libgxml-0.20.so.2.0.2 gxml-0.20.3_1
@@ -4429,7 +4441,7 @@ libabsl_throw_delegate.so.2401.0.0 abseil-cpp-20240116.1_1
libabsl_time.so.2401.0.0 abseil-cpp-20240116.1_1
libabsl_time_zone.so.2401.0.0 abseil-cpp-20240116.1_1
libabsl_vlog_config_internal.so.2401.0.0 abseil-cpp-20240116.1_1
-libzint.so.2.12 libzint-2.12.0_1
+libzint.so.2.13 libzint-2.13.0_1
libairspyhf.so.0 libairspyhf-1.6.8_1
libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
@@ -4502,3 +4514,6 @@ libcamera-base.so.0.2 libcamera-0.2.0_1
libKPim6MimeTreeParserCore.so.6 mimetreeparser-24.02.0_1
libKPim6MimeTreeParserWidgets.so.6 mimetreeparser-24.02.0_1
/usr/lib/lua/5.1/lpeg.so lua51-lpeg-1.1.0_2
+libopenrazer.so.0 libopenrazer-0.2.0_1
+libstaroffice-0.0.so.0 libstaroffice-0.0.7_1
+libbox2d.so.2 box2d-2.4.1_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index f0ac528417c..df32d789bff 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -1,5 +1,6 @@
0BSD
389-exception
+3D-Slicer-1.0
AAL
ADSL
AFL-1.1
@@ -11,7 +12,9 @@ AGPL-1.0-only
AGPL-1.0-or-later
AGPL-3.0-only
AGPL-3.0-or-later
+AMD-newlib
AMDPLPA
+AML-glslang
AML
AMPAS
ANTLR-PD-fallback
@@ -27,6 +30,7 @@ ASWF-Digital-Assets-1.1
Abstyles
AdaCore-doc
Adobe-2006
+Adobe-Display-PostScript
Adobe-Glyph
Adobe-Utopia
Afmparse
@@ -41,14 +45,17 @@ Artistic-1.0-cl8
Artistic-1.0
Artistic-2.0
Asterisk-exception
+Asterisk-linking-protocols-exception
Autoconf-exception-2.0
Autoconf-exception-3.0
Autoconf-exception-generic-3.0
Autoconf-exception-generic
Autoconf-exception-macro
BSD-1-Clause
+BSD-2-Clause-Darwin
BSD-2-Clause-Patent
BSD-2-Clause-Views
+BSD-2-Clause-first-lines
BSD-2-Clause
BSD-3-Clause-Attribution
BSD-3-Clause-Clear
@@ -61,6 +68,7 @@ BSD-3-Clause-No-Nuclear-License
BSD-3-Clause-No-Nuclear-Warranty
BSD-3-Clause-Open-MPI
BSD-3-Clause-Sun
+BSD-3-Clause-acpica
BSD-3-Clause-flex
BSD-3-Clause
BSD-4-Clause-Shortened
@@ -73,6 +81,8 @@ BSD-Attribution-HPND-disclaimer
BSD-Inferno-Nettverk
BSD-Protection
BSD-Source-Code
+BSD-Source-beginning-file
+BSD-Systemics-W3Works
BSD-Systemics
BSL-1.0
BUSL-1.1
@@ -80,6 +90,7 @@ Baekmuk
Bahyph
Barr
Beerware
+Bison-exception-1.24
Bison-exception-2.2
BitTorrent-1.0
BitTorrent-1.1
@@ -89,6 +100,7 @@ BlueOak-1.0.0
Boehm-GC
Bootloader-exception
Borceux
+Brian-Gladman-2-Clause
Brian-Gladman-3-Clause
C-UDA-1.0
CAL-1.0-Combined-Work-Exception
@@ -99,6 +111,7 @@ CC-BY-2.0
CC-BY-2.5-AU
CC-BY-2.5
CC-BY-3.0-AT
+CC-BY-3.0-AU
CC-BY-3.0-DE
CC-BY-3.0-IGO
CC-BY-3.0-NL
@@ -165,6 +178,7 @@ CERN-OHL-S-2.0
CERN-OHL-W-2.0
CFITSIO
CLISP-exception-2.0
+CMU-Mach-nodoc
CMU-Mach
CNRI-Jython
CNRI-Python-GPL-Compatible
@@ -174,7 +188,9 @@ CPAL-1.0
CPL-1.0
CPOL-1.02
CUA-OPL-1.0
+Caldera-no-preamble
Caldera
+Catharon
ClArtistic
Classpath-exception-2.0
Clips
@@ -186,10 +202,12 @@ Crossword
CrystalStacker
Cube
D-FSL-1.0
+DEC-3-Clause
DL-DE-BY-2.0
DL-DE-ZERO-2.0
DOC
DRL-1.0
+DRL-1.1
DSDP
DigiRule-FOSS-exception
Dotseqn
@@ -211,6 +229,7 @@ Eurosym
FBM
FDK-AAC
FLTK-exception
+FSFAP-no-warranty-disclaimer
FSFAP
FSFUL
FSFULLR
@@ -227,6 +246,7 @@ Furuseth
GCC-exception-2.0-note
GCC-exception-2.0
GCC-exception-3.1
+GCR-docs
GD
GFDL-1.1-invariants-only
GFDL-1.1-invariants-or-later
@@ -249,6 +269,7 @@ GFDL-1.3-or-later
GL2PS
GLWTPL
GNAT-exception
+GNOME-examples-exception
GNU-compiler-exception
GPL-1.0-only
GPL-1.0-or-later
@@ -265,18 +286,31 @@ GStreamer-exception-2008
Giftware
Glide
Glulxe
+Gmsh-exception
Graphics-Gems
+Gutmann
HP-1986
HP-1989
HPND-DEC
+HPND-Fenneberg-Livingston
+HPND-INRIA-IMAG
+HPND-Intel
+HPND-Kevlin-Henney
+HPND-MIT-disclaimer
HPND-Markus-Kuhn
HPND-Pbmplus
+HPND-UC-export-US
HPND-UC
HPND-doc-sell
HPND-doc
+HPND-export-US-acknowledgement
HPND-export-US-modify
HPND-export-US
+HPND-export2-US
+HPND-merchantability-variant
+HPND-sell-MIT-disclaimer-xserver
HPND-sell-regexpr
+HPND-sell-variant-MIT-disclaimer-rev
HPND-sell-variant-MIT-disclaimer
HPND-sell-variant
HPND
@@ -290,6 +324,7 @@ IJG-short
IJG
IPA
IPL-1.0
+ISC-Veillard
ISC
ImageMagick
Imlib2
@@ -320,6 +355,7 @@ LGPLLR
LLGPL
LLVM-exception
LOOP
+LPD-document
LPL-1.0
LPL-1.02
LPPL-1.0
@@ -348,6 +384,7 @@ Lucida-Bitmap-Fonts
MIT-0
MIT-CMU
MIT-Festival
+MIT-Khronos-old
MIT-Modern-Variant
MIT-Wu
MIT-advertising
@@ -367,6 +404,8 @@ MS-LPL
MS-PL
MS-RL
MTLL
+Mackerras-3-Clause-acknowledgment
+Mackerras-3-Clause
MakeIndex
Martin-Birgmeier
McPhee-slideshow
@@ -380,7 +419,9 @@ Mup
NAIST-2003
NASA-1.3
NBPL-1.0
+NCBI-PD
NCGL-UK-2.0
+NCL
NCSA
NGPL
NICTA-1.0
@@ -405,6 +446,7 @@ Nokia-Qt-exception-1.1
Nokia
Noweb
O-UDA-1.0
+OAR
OCCT-PL
OCCT-exception-1.0
OCLC-2.0
@@ -454,15 +496,20 @@ OSL-2.1
OSL-3.0
OpenJDK-assembly-exception-1.0
OpenPBS-2.3
+OpenSSL-standalone
OpenSSL
+OpenVision
PADL
+PCRE2-exception
PDDL-1.0
PHP-3.0
PHP-3.01
+PPL
PS-or-PDF-font-exception-20170817
PSF-2.0
Parity-6.0.0
Parity-7.0.0
+Pixar
Plexus
PolyForm-Noncommercial-1.0.0
PolyForm-Small-Business-1.0.0
@@ -480,11 +527,13 @@ RHeCos-1.1
RPL-1.1
RPL-1.5
RPSL-1.0
+RRDtool-FLOSS-exception-2.0
RSA-MD
RSCPL
Rdisc
Ruby
SANE-exception
+SAX-PD-2.0
SAX-PD
SCEA
SGI-B-1.0
@@ -505,6 +554,7 @@ SNIA
SPL-1.0
SSH-OpenSSH
SSH-short
+SSLeay-standalone
SSPL-1.0
SWI-exception
SWL
@@ -519,12 +569,15 @@ Spencer-86
Spencer-94
Spencer-99
SugarCRM-1.1.3
+Sun-PPP-2000
+Sun-PPP
SunPro
Swift-exception
Symlinks
TAPR-OHL-1.0
TCL
TCP-wrappers
+TGPPL-1.0
TMate
TORQUE-1.1
TOSL
@@ -539,8 +592,10 @@ Texinfo-exception
UBDL-exception
UCAR
UCL-1.0
+UMich-Merit
UPL-1.0
URT-RLE
+Unicode-3.0
Unicode-DFS-2015
Unicode-DFS-2016
Unicode-TOU
@@ -577,6 +632,8 @@ Zend-2.0
Zimbra-1.3
Zimbra-1.4
Zlib
+any-OSI
+bcrypt-Solar-Designer
blessing
bzip2-1.0.6
check-cvs
@@ -585,6 +642,7 @@ copyleft-next-0.3.0
copyleft-next-0.3.1
cryptsetup-OpenSSL-exception
curl
+cve-tou
deprecated_AGPL-1.0
deprecated_AGPL-3.0
deprecated_BSD-2-Clause-FreeBSD
@@ -622,11 +680,14 @@ dvipdfm
eCos-exception-2.0
eGenix
etalab-2.0
+fmt-exception
freertos-exception-2.0
fwlw
gSOAP-1.3b
gnu-javamail-exception
gnuplot
+gtkbook
+hdparm
i2p-gpl-java-exception
iMatix
libpng-2.0
@@ -636,26 +697,33 @@ libtiff
libutil-David-Nugent
lsof
magaz
+mailprio
metamail
mif-exception
mpi-permissive
mpich2
mplus
openvpn-openssl-exception
+pkgconf
pnmstitch
psfrag
psutils
python-ldap
+radvd
snprintf
+softSurfer
ssh-keyscan
stunnel-exception
swrule
+threeparttable
u-boot-exception-2.0
ulem
vsftpd-openssl-exception
w3m
x11vnc-openssl-exception
xinetd
+xkeyboard-config-Zinoviev
xlock
xpp
+xzoom
zlib-acknowledgement
diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 26c766f040c..9c84d98d634 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -1,4 +1,4 @@
-# vim: set ts=4 sw=4 et:
+# vim: set ts=4 sw=4 et ft=bash :
update_check() {
local i p url pkgurlname rx found_version consider
@@ -152,10 +152,10 @@ update_check() {
url="https://bitbucket.org/$pkgurlname/downloads"
rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar)';;
*ftp.gnome.org*|*download.gnome.org*)
- : ${pattern="(?<=LATEST-IS-)([0-24-9]|3\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=\")"}
+ rx='(?<=LATEST-IS-)([0-24-9]|3\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=\")'
url="https://download.gnome.org/sources/$pkgname/cache.json";;
*archive.xfce.org*)
- : ${pattern="\Q$pkgname\E-\K((([4-9]|([1-9][0-9]+))\.[0-9]*[02468]\.[0-9.]*[0-9])|([0-3]\.[0-9.]*))(?=.tar)"}
+ rx='\Q'"$pkgname"'\E-\K((([4-9]|([1-9][0-9]+))\.[0-9]*[02468]\.[0-9.]*[0-9])|([0-3]\.[0-9.]*))(?=.tar)'
url="https://archive.xfce.org/feeds/project/$pkgname" ;;
*kernel.org/pub/linux/kernel/*)
rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
diff --git a/srcpkgs/7zip/template b/srcpkgs/7zip/template
index 26241ed392b..8081edbd909 100644
--- a/srcpkgs/7zip/template
+++ b/srcpkgs/7zip/template
@@ -1,6 +1,6 @@
# Template file for '7zip'
pkgname=7zip
-version=24.06
+version=24.07
revision=1
short_desc="File archiver with a high compression ratio"
maintainer="Roberto Ricci "
@@ -8,11 +8,12 @@ license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.7-zip.org"
changelog="https://www.7-zip.org/history.txt"
distfiles="https://www.7-zip.org/a/7z${version//./}-src.tar.xz"
-checksum=2aa1660c773525b2ed84d6cd7ff0680c786ec0893b87e4db44654dcb7f5ac8b5
+checksum=d1b0874a3f1c26df21c761a4a30691dc1213e8577f18ee78326c14ca4d683e2b
alternatives="
7z:7z:/usr/bin/7zip
7z:7za:/usr/bin/7zip
- 7z:7zr:/usr/bin/7zip"
+ 7z:7zr:/usr/bin/7zip
+ 7z:7zz:/usr/bin/7zip"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
# missing pthread_attr_setaffinity_np()
@@ -49,7 +50,8 @@ do_install() {
alternatives="
7z:7z:/usr/bin/7zip-unrar
7z:7za:/usr/bin/7zip-unrar
- 7z:7zr:/usr/bin/7zip-unrar"
+ 7z:7zr:/usr/bin/7zip-unrar
+ 7z:7zz:/usr/bin/7zip-unrar"
pkg_install() {
vbin "${wrksrc}/CPP/7zip/Bundles/Alone2/b/rar/7zz" 7zip-unrar
diff --git a/srcpkgs/ClusterSSH/patches/15config.diff b/srcpkgs/ClusterSSH/patches/15config.diff
new file mode 100644
index 00000000000..95aa12681ac
--- /dev/null
+++ b/srcpkgs/ClusterSSH/patches/15config.diff
@@ -0,0 +1,30 @@
+This test fails because it doesn't account for running as root in the CI.
+
+--- a/t/15config.t
++++ b/t/15config.t
+@@ -535,25 +535,6 @@
+ chmod( 0755, $ENV{HOME} . '/.csshrc.DISABLED', $ENV{HOME} );
+ }
+
+-note('check failure to write default config is caught');
+-$ENV{HOME} = tempdir( CLEANUP => 1 );
+-mkdir( $ENV{HOME} . '/.clusterssh' );
+-mkdir( $ENV{HOME} . '/.clusterssh/config' );
+-$config = App::ClusterSSH::Config->new();
+-trap {
+- $config->load_configs();
+-};
+-is( $trap->leaveby, 'return', 'returned ok' );
+-isa_ok( $config, "App::ClusterSSH::Config" );
+-isa_ok( $config, "App::ClusterSSH::Config" );
+-is( $trap->stdout, q{}, 'Expecting no STDOUT' );
+-is( $trap->stderr,
+- q{Unable to write default $HOME/.clusterssh/config: Is a directory}
+- . $/
+- . $/,
+- 'Expecting no STDERR'
+-);
+-
+ note('Checking dump');
+ $config = App::ClusterSSH::Config->new(
+ send_menu_xml_file => $ENV{HOME} . '/.clusterssh/send_menu', );
diff --git a/srcpkgs/ClusterSSH/template b/srcpkgs/ClusterSSH/template
index 7e3b2c42b43..7cb23aeaea5 100644
--- a/srcpkgs/ClusterSSH/template
+++ b/srcpkgs/ClusterSSH/template
@@ -1,7 +1,7 @@
# Template file for 'ClusterSSH'
pkgname=ClusterSSH
-version=4.14
-revision=3
+version=4.16
+revision=1
build_style=perl-ModuleBuild
hostmakedepends="xterm openssh
perl-CPAN-Changes perl-Module-Build perl-Try-Tiny perl-Tk
@@ -16,7 +16,7 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://github.com/duncs/clusterssh"
changelog="https://raw.githubusercontent.com/duncs/clusterssh/master/Changes"
distfiles="https://github.com/duncs/clusterssh/archive/v${version}.tar.gz"
-checksum=179ac8a7c27ec9674d2aa3f65ebb097b4945646c71f83f52fe2b8b24c21cd629
+checksum=1540f42bd521066ab0a41504258ac1aa4c501c6f713057f8906bb896f3335b9f
pre_check() {
touch README
diff --git a/srcpkgs/DisplayCAL/patches/python-3-12.patch b/srcpkgs/DisplayCAL/patches/python-3-12.patch
new file mode 100644
index 00000000000..cf63082ae85
--- /dev/null
+++ b/srcpkgs/DisplayCAL/patches/python-3-12.patch
@@ -0,0 +1,103 @@
+From 0025940335eb1bd56f03f742aa095028d7ffa06f Mon Sep 17 00:00:00 2001
+From: Erkan Ozgur Yilmaz
+Date: Sun, 24 Mar 2024 10:24:36 +0000
+Subject: [PATCH] - Fixed #335
+
+---
+ .github/workflows/pytest.yml | 3 +++
+ DisplayCAL/meta.py | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
+index 02666a76..c9236a93 100644
+--- a/.github/workflows/pytest.yml
++++ b/.github/workflows/pytest.yml
+@@ -20,12 +20,15 @@ jobs:
+ - "3.9"
+ - "3.10"
+ - "3.11"
++ - "3.12"
+ wx-version:
+ - "4.1.1"
+ - "4.2.1"
+ exclude:
+ - python-version: "3.11"
+ wx-version: "4.1.1"
++ - python-version: "3.12"
++ wx-version: "4.1.1"
+
+ steps:
+
+diff --git a/DisplayCAL/meta.py b/DisplayCAL/meta.py
+index 30797cdf..fa52e733 100644
+--- a/DisplayCAL/meta.py
++++ b/DisplayCAL/meta.py
+@@ -62,7 +62,7 @@
+ name_html = 'DisplayCAL'
+
+ py_minversion = (3, 8)
+-py_maxversion = (3, 11)
++py_maxversion = (3, 12)
+
+ version = VERSION_STRING
+ version_lin = VERSION_STRING # Linux
+commit 64336cdc9af0eb858ceeab0522bb9747008a8466
+Author: Patrick Zwerschke
+Date: Sun Mar 24 14:47:01 2024 +0100
+
+ updated testing environment to python 3.12
+
+diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
+index c9236a93..16d19983 100644
+--- a/.github/workflows/pytest.yml
++++ b/.github/workflows/pytest.yml
+@@ -32,7 +32,7 @@ jobs:
+
+ steps:
+
+- - uses: actions/checkout@v3
++ - uses: actions/checkout@v4
+
+ - name: Set Environment Variables
+ run: |
+@@ -45,13 +45,10 @@ jobs:
+ echo "add_dir_str=cpython-310" >> $GITHUB_ENV
+ elif [ "${{ matrix.python-version }}" == "3.11" ]; then
+ echo "add_dir_str=cpython-311" >> $GITHUB_ENV
++ elif [ "${{ matrix.python-version }}" == "3.12" ]; then
++ echo "add_dir_str=cpython-312" >> $GITHUB_ENV
+ fi
+
+- - name: Setup timezone
+- uses: zcong1993/setup-timezone@master
+- with:
+- timezone: UTC
+-
+ - name: Setup xvfb
+ run: |
+ sudo apt-get update
+@@ -69,7 +66,7 @@ jobs:
+ sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &
+
+ - name: Setup Python ${{ matrix.python-version }}
+- uses: actions/setup-python@v4
++ uses: actions/setup-python@v5
+ with:
+ python-version: ${{ matrix.python-version }}
+
+diff --git a/DisplayCAL/RealDisplaySizeMM.py b/DisplayCAL/RealDisplaySizeMM.py
+index 25b730d0..e77dcb43 100644
+--- a/DisplayCAL/RealDisplaySizeMM.py
++++ b/DisplayCAL/RealDisplaySizeMM.py
+@@ -27,6 +27,8 @@ else:
+ from DisplayCAL.lib64.python310.RealDisplaySizeMM import *
+ elif sys.version_info[:2] == (3, 11):
+ from DisplayCAL.lib64.python311.RealDisplaySizeMM import *
++ elif sys.version_info[:2] == (3, 12):
++ from DisplayCAL.lib64.python312.RealDisplaySizeMM import *
+ # else:
+ # pass
+
+diff --git a/DisplayCAL/lib64/python312/__init__.py b/DisplayCAL/lib64/python312/__init__.py
+new file mode 100644
+index 00000000..e69de29b
diff --git a/srcpkgs/DisplayCAL/template b/srcpkgs/DisplayCAL/template
index 29dbf67f0c3..4c4da7e57e0 100644
--- a/srcpkgs/DisplayCAL/template
+++ b/srcpkgs/DisplayCAL/template
@@ -1,7 +1,7 @@
# Template file for 'DisplayCAL'
pkgname=DisplayCAL
-version=3.9.11
-revision=2
+version=3.9.12
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
@@ -12,7 +12,8 @@ maintainer="lemmi "
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=7769d19551c228d797fd98cb2469730cee84ff27bd0bf5d0463e191753921a5e
+checksum=6ea182a5992f316f6aa63d55333e5e9caa065807224b8840470d461bb30e9ff8
+make_check=no # checks fail to build
pre_configure() {
vsed -i misc/displaycal-vrml-to-x3d-converter.desktop \
diff --git a/srcpkgs/ETL/template b/srcpkgs/ETL/template
index a2dab21bc50..f13429b6750 100644
--- a/srcpkgs/ETL/template
+++ b/srcpkgs/ETL/template
@@ -1,7 +1,7 @@
# Template file for 'ETL'
# Should be kept in sync with 'synfig' and 'synfigstudio'
pkgname=ETL
-version=1.4.4
+version=1.4.5
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned "
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=cc87e478d8e808b1a2266f8f6a3eb54396ba54ff63abb30ea5b9b7bcfb85caca
+checksum=fbd0328296bfe12f52d53389740c0f3fea5005152b9da43f52ac1f5ab6e22c73
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index e8df22014de..c845a050880 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=45
+version=45.1
revision=1
build_helper="gir"
build_style=meson
@@ -18,7 +18,7 @@ license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=7cd310be252964033d1541fc4ab150f2cf5f046698e4a2728d481965f6e9b55f
+checksum=c982e81e7dffdb195e7c1784ae7c9d35f92fb49bdaf3ff5ff491e17ec7210694
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
diff --git a/srcpkgs/MangoHud/patches/0001-elfhacks-d_un.d_ptr-is-relative-on-non-glibc-systems.patch b/srcpkgs/MangoHud/patches/0001-elfhacks-d_un.d_ptr-is-relative-on-non-glibc-systems.patch
deleted file mode 100644
index 6abe3dfc73f..00000000000
--- a/srcpkgs/MangoHud/patches/0001-elfhacks-d_un.d_ptr-is-relative-on-non-glibc-systems.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From fc925300601098dc45241087626369843d6a2c66 Mon Sep 17 00:00:00 2001
-From: John Zimmermann
-Date: Thu, 28 Sep 2023 16:42:21 +0200
-Subject: [PATCH 1/2] elfhacks: d_un.d_ptr is relative on non glibc systems
-
-elf(5) documents it this way, GLIBC diverts from this documentation
-
-partial fix for #601
----
- src/elfhacks.cpp | 22 ++++++++++++++--------
- src/real_dlsym.cpp | 1 +
- 2 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/elfhacks.cpp b/src/elfhacks.cpp
-index 7cfc310..810a19d 100644
---- a/src/elfhacks.cpp
-+++ b/src/elfhacks.cpp
-@@ -29,6 +29,12 @@
- * \{
- */
-
-+#ifdef __GLIBC__
-+# define ABS_ADDR(obj, ptr) (ptr)
-+#else
-+# define ABS_ADDR(obj, ptr) ((obj->addr) + (ptr))
-+#endif
-+
- struct eh_iterate_callback_args {
- eh_iterate_obj_callback_func callback;
- void *arg;
-@@ -196,22 +202,22 @@ int eh_init_obj(eh_obj_t *obj)
- if (obj->strtab)
- return ENOTSUP;
-
-- obj->strtab = (const char *) obj->dynamic[p].d_un.d_ptr;
-+ obj->strtab = (const char *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr);
- } else if (obj->dynamic[p].d_tag == DT_HASH) {
- if (obj->hash)
- return ENOTSUP;
-
-- obj->hash = (ElfW(Word) *) obj->dynamic[p].d_un.d_ptr;
-+ obj->hash = (ElfW(Word) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr);
- } else if (obj->dynamic[p].d_tag == DT_GNU_HASH) {
- if (obj->gnu_hash)
- return ENOTSUP;
-
-- obj->gnu_hash = (Elf32_Word *) obj->dynamic[p].d_un.d_ptr;
-+ obj->gnu_hash = (Elf32_Word *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr);
- } else if (obj->dynamic[p].d_tag == DT_SYMTAB) {
- if (obj->symtab)
- return ENOTSUP;
-
-- obj->symtab = (ElfW(Sym) *) obj->dynamic[p].d_un.d_ptr;
-+ obj->symtab = (ElfW(Sym) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr);
- }
- p++;
- }
-@@ -449,7 +455,7 @@ int eh_find_next_dyn(eh_obj_t *obj, ElfW_Sword tag, int i, ElfW(Dyn) **next)
-
- int eh_set_rela_plt(eh_obj_t *obj, int p, const char *sym, void *val)
- {
-- ElfW(Rela) *rela = (ElfW(Rela) *) obj->dynamic[p].d_un.d_ptr;
-+ ElfW(Rela) *rela = (ElfW(Rela) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr);
- ElfW(Dyn) *relasize;
- unsigned int i;
-
-@@ -470,7 +476,7 @@ int eh_set_rela_plt(eh_obj_t *obj, int p, const char *sym, void *val)
-
- int eh_set_rel_plt(eh_obj_t *obj, int p, const char *sym, void *val)
- {
-- ElfW(Rel) *rel = (ElfW(Rel) *) obj->dynamic[p].d_un.d_ptr;
-+ ElfW(Rel) *rel = (ElfW(Rel) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr);
- ElfW(Dyn) *relsize;
- unsigned int i;
-
-@@ -520,7 +526,7 @@ int eh_set_rel(eh_obj_t *obj, const char *sym, void *val)
-
- int eh_iterate_rela_plt(eh_obj_t *obj, int p, eh_iterate_rel_callback_func callback, void *arg)
- {
-- ElfW(Rela) *rela = (ElfW(Rela) *) obj->dynamic[p].d_un.d_ptr;
-+ ElfW(Rela) *rela = (ElfW(Rela) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr);
- ElfW(Dyn) *relasize;
- eh_rel_t rel;
- eh_sym_t sym;
-@@ -550,7 +556,7 @@ int eh_iterate_rela_plt(eh_obj_t *obj, int p, eh_iterate_rel_callback_func callb
-
- int eh_iterate_rel_plt(eh_obj_t *obj, int p, eh_iterate_rel_callback_func callback, void *arg)
- {
-- ElfW(Rel) *relp = (ElfW(Rel) *) obj->dynamic[p].d_un.d_ptr;
-+ ElfW(Rel) *relp = (ElfW(Rel) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr);
- ElfW(Dyn) *relsize;
- eh_rel_t rel;
- eh_sym_t sym;
-diff --git a/src/real_dlsym.cpp b/src/real_dlsym.cpp
-index 173dc1b..3e5a77c 100644
---- a/src/real_dlsym.cpp
-+++ b/src/real_dlsym.cpp
-@@ -26,6 +26,7 @@ static void get_real_functions()
- #endif
- "*libc.so*",
- "*libc.*.so*",
-+ "*ld-musl-*.so*",
- };
-
- for (size_t i = 0; i < sizeof(libs) / sizeof(*libs); i++)
---
-2.42.0
-
diff --git a/srcpkgs/MangoHud/patches/0001-mangohud-fix-version-meson-build.patch b/srcpkgs/MangoHud/patches/0001-mangohud-fix-version-meson-build.patch
new file mode 100644
index 00000000000..666365ea099
--- /dev/null
+++ b/srcpkgs/MangoHud/patches/0001-mangohud-fix-version-meson-build.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index 76a0340..c624622 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('MangoHud',
+ ['c', 'cpp'],
+- version : 'v0.7.1',
++ version : 'v0.7.2',
+ license : 'MIT',
+ meson_version: '>=0.60.0',
+ default_options : ['buildtype=release', 'c_std=c99', 'cpp_std=c++14', 'warning_level=2']
diff --git a/srcpkgs/MangoHud/patches/0001-meson-fallback-to-project_version-without-git.patch b/srcpkgs/MangoHud/patches/0001-meson-fallback-to-project_version-without-git.patch
deleted file mode 100644
index d999df1bb00..00000000000
--- a/srcpkgs/MangoHud/patches/0001-meson-fallback-to-project_version-without-git.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c6e7c2da873cf2ada7cac9cc8953c3afda7f4cd1 Mon Sep 17 00:00:00 2001
-From: John Zimmermann
-Date: Thu, 28 Sep 2023 13:56:04 +0200
-Subject: [PATCH 1/2] meson: fallback to project_version() without git
-
-resolves #1131
----
- src/meson.build | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 537ce63..0729596 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -9,12 +9,22 @@ else
- ld_libdir_mangohud = get_option('prefix') + '/\$LIB/'
- endif
-
-+git = find_program('git', required: false)
-+if git.found()
-+ git_describe = run_command([git, 'describe', '--tags', '--dirty=+'], check: false)
-+endif
-+if git.found() and git_describe.returncode() == 0
-+ describe_ver = git_describe.stdout().strip()
-+else
-+ describe_ver = meson.project_version()
-+endif
-+
- conf_data = configuration_data()
-
- conf_data.set('ld_libdir_mangohud_abs', libdir_mangohud)
- conf_data.set('ld_libdir_mangohud', ld_libdir_mangohud)
- conf_data.set('cpu_family', host_machine.cpu_family())
--conf_data.set('version', run_command(['git', 'describe', '--tags', '--dirty=+']).stdout().strip())
-+conf_data.set('version', describe_ver)
-
- overlay_shaders = [
- 'overlay.frag',
---
-2.42.0
-
diff --git a/srcpkgs/MangoHud/patches/0002-meson-allow-setting-absolute-path-instead-of-Dynamic.patch b/srcpkgs/MangoHud/patches/0002-meson-allow-setting-absolute-path-instead-of-Dynamic.patch
deleted file mode 100644
index 19664a1829f..00000000000
--- a/srcpkgs/MangoHud/patches/0002-meson-allow-setting-absolute-path-instead-of-Dynamic.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 252f18e54d8a56ce4420c549fb48963cad3b91c0 Mon Sep 17 00:00:00 2001
-From: John Zimmermann
-Date: Thu, 28 Sep 2023 18:17:37 +0200
-Subject: [PATCH 2/2] meson: allow setting absolute path instead of 'Dynamic
- string tokens'
-
-resolves #601
----
- meson_options.txt | 1 +
- src/meson.build | 10 ++++++++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 5f7d11b..0173a54 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -12,3 +12,4 @@ option('mangoapp', type: 'boolean', value : false)
- option('mangohudctl', type: 'boolean', value : false)
- option('mangoapp_layer', type: 'boolean', value : false)
- option('tests', type: 'feature', value: 'auto', description: 'Run tests')
-+option('dynamic_string_tokens', type: 'boolean', value: true, description: 'Use dynamic string tokens in LD_PRELOAD')
-diff --git a/src/meson.build b/src/meson.build
-index 537ce63..034dce2 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,12 +1,18 @@
- glslang = find_program('glslang', 'glslangValidator')
-
-+if get_option('dynamic_string_tokens')
-+ ld_prefix = get_option('prefix') + '/\$LIB/'
-+else
-+ ld_prefix = join_paths(get_option('prefix') ,get_option('libdir')) + '/'
-+endif
-+
- # Needs prefix for configure_file()
- if get_option('append_libdir_mangohud')
- libdir_mangohud = join_paths(get_option('prefix'), get_option('libdir'), 'mangohud')
-- ld_libdir_mangohud = get_option('prefix') + '/\$LIB/mangohud/'
-+ ld_libdir_mangohud = ld_prefix + 'mangohud/'
- else
- libdir_mangohud = join_paths(get_option('prefix'), get_option('libdir'))
-- ld_libdir_mangohud = get_option('prefix') + '/\$LIB/'
-+ ld_libdir_mangohud = ld_prefix
- endif
-
- conf_data = configuration_data()
---
-2.42.0
-
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index ed2e2428f44..ad1334062d2 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,19 +1,21 @@
# Template file for 'MangoHud'
pkgname=MangoHud
-version=0.7.0
-revision=1
+version=0.7.2
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled"
-hostmakedepends="python3-Mako glslang pkg-config"
-makedepends="libglvnd-devel dbus-devel vulkan-loader-devel spdlog json-c++"
+hostmakedepends="Vulkan-Headers python3-Mako glslang pkg-config"
+makedepends="libglvnd-devel dbus-devel vulkan-loader spdlog json-c++
+ wayland-devel libxkbcommon-devel"
short_desc="Vulkan and OpenGL overlay for monitoring FPS, temperatures and more"
maintainer="John "
license="MIT"
homepage="https://github.com/flightlessmango/MangoHud"
distfiles="https://github.com/flightlessmango/MangoHud/releases/download/v${version}/MangoHud-v${version}-Source-DFSG.tar.xz"
-checksum=222e15d4f3e679937f7594e2e5615aaae41b97d487eb7938b96b26eeb1fbcf35
+checksum=39d41ff564cd46b99a8514d35ff0cc1cd4ec5ab093347ca552bd7f7572a4064f
python_version=3
+lib32files="/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Ddynamic_string_tokens=false"
diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index e2bf803ac0e..1fbd0f1e8c5 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -1,17 +1,17 @@
# Template file for 'NetworkManager-openconnect'
pkgname=NetworkManager-openconnect
-version=1.2.6
-revision=4
+version=1.2.10
+revision=1
build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
-makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- openssl-devel libsecret-devel libxml2-devel openconnect-devel"
+configure_args="--disable-static --with-gtk4"
+hostmakedepends="pkg-config intltool glib-devel"
+makedepends="gcr-devel gtk4-devel liblz4-devel libnma-devel
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel libwebkit2gtk41-devel"
depends="openconnect"
short_desc="NetworkManager VPN plugin for OpenConnect"
maintainer="Enno Boland "
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a
+checksum=844b6bf64ecadb97b4a68c776db89aa5e6ee7e59bd24b0180228406863136464
lib32disabled=yes
diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template
index 5f3a096c06d..4b64fad6ae0 100644
--- a/srcpkgs/OpenCPN/template
+++ b/srcpkgs/OpenCPN/template
@@ -38,7 +38,6 @@ if [ -n "$CROSS_BUILD" ]; then
configure_args+=" -DOCPN_BUILD_TEST=OFF"
fi
-CFLAGS="-fcommon"
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
post_install() {
diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index 889ea8e8466..5b70711ac74 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,6 +1,6 @@
# Template file for 'OpenLP'
pkgname=OpenLP
-version=3.1.1
+version=3.1.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools qt5-host-tools"
@@ -16,7 +16,7 @@ maintainer="Piotr Wójcik "
license="GPL-3.0-or-later"
homepage="https://openlp.org/"
distfiles="https://gitlab.com/openlp/openlp/-/archive/${version}/openlp-${version}.tar.gz"
-checksum=c464669a3661b3b23e917cb1508c1bfc8e8c8308ee24c86e7dde94789ea1797c
+checksum=3a86d9fad80af0005ede78b5fe48854b31ed4e17f874013918acf750672fcfaf
make_check_pre="env -u QT_QPA_PLATFORM xvfb-run"
post_install() {
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index e4077eaab9e..8f139acbe4e 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,10 +2,10 @@
# based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
# and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
pkgname=OpenRCT2
-version=0.4.11
+version=0.4.12
revision=1
# versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt
-_objects_version=1.4.4
+_objects_version=1.4.6
_titles_version=0.4.6
_replays_version=0.0.79
_opensfx_version=1.0.5
@@ -40,8 +40,8 @@ distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
https://github.com/OpenRCT2/OpenMusic/releases/download/v${_openmsx_version}/openmusic.zip>openmusic-${_openmsx_version}.zip
https://github.com/OpenRCT2/replays/releases/download/v${_replays_version}/replays.zip>replays-${_replays_version}.zip
https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip>title-sequences-${_titles_version}.zip"
-checksum="d6211dc9651b43315c5d22e30aa41e582bb861d2541b82bb65de8f4f95f0cdef
- da017b90a3870649cb4ff22e14edfc746259af048967311d1133cf4c836ae5a0
+checksum="7446a64a89d05c663c648fbb370b1682c39a7ba3438c603db366dfb1c5bc16e7
+ 5a8b54d021e167604051fd508da109d9ebc660638f57252bba729f76bb246387
a952148be164c128e4fd3aea96822e5f051edd9a0b1f2c84de7f7628ce3b2e18
c3fac4caa90398a2b4c5bb32e0dd0f44073086fe16121d3dc49b3ca120474068
045da1df8697e2d33ff33b34008f22e7698280aa4639afd1b1fc3c590d5e9956
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 27682d26532..9d35445bf46 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
-version=8.3
-revision=3
+version=8.4
+revision=1
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt6-tools qt6-base scdoc"
@@ -12,7 +12,7 @@ maintainer="Philipp David "
license="GPL-3.0-only"
homepage="https://prismlauncher.org/"
distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=4d587122f673ee4daea5aa098bd3da0f51989dbb600560146dd8a0375491cea0
+checksum=a4df9059559df2e410ddf933e05fe4bffaa01631c6eeb55e63af4a2d0d719726
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=0"
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 17657bf7ef0..88c6777af29 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -21,6 +21,10 @@ checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+if [ -z "${XBPS_CHECK_PKGS}" ]; then
+ configure_args+=" -DSLIC3R_BUILD_TESTS=OFF"
+fi
+
post_extract() {
# Mark tests that fail on certain targets
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index af4cf507721..054b7bad045 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
-version=24.05.23
+version=24.06.16
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -14,7 +14,7 @@ license="LGPL-3.0-only"
homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=4dd650b1b6507207ffcfcb57a454b2150b0e48a8efe649233ea2d5a16209a2be
+checksum=7b06be4b95cb15064015934b24e76e583b85398136fc28b622dc1118d07c55b4
QMPlay2-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 3dc8159f1d5..6ff99b11693 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -1,7 +1,7 @@
# Template file for 'Quaternion'
pkgname=Quaternion
version=0.0.96.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt6-base qt6-declarative-host-tools qt6-tools"
makedepends="qt6-declarative-devel libQuotient-devel qt6-multimedia-devel
diff --git a/srcpkgs/ReDoomEd.app/template b/srcpkgs/ReDoomEd.app/template
index 524158227e1..7f5f0ff2e4b 100644
--- a/srcpkgs/ReDoomEd.app/template
+++ b/srcpkgs/ReDoomEd.app/template
@@ -17,7 +17,6 @@ distfiles="http://twilightedge.com/downloads/ReDoomEd.Sources.${version%.*}-${ve
checksum=256e4e63a6f109281673fd6fb1a11d3872aea6064ae8e104cd1238c9a7c21fa5
repository=nonfree
restricted=yes
-make_build_args=OBJCFLAGS=-fcommon
if [ -e /usr/share/GNUstep/Makefiles/GNUstep.sh ]; then
. /usr/share/GNUstep/Makefiles/GNUstep.sh
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index e2b27ed4926..656cf7523be 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,7 +1,7 @@
# Template file for 'SDL2'
pkgname=SDL2
-version=2.30.1
-revision=2
+version=2.30.4
+revision=1
build_style=cmake
configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF
-DSDL_CLOCK_GETTIME=ON -DSDL_PULSEAUDIO_SHARED=OFF
@@ -15,7 +15,7 @@ license="Zlib"
homepage="https://www.libsdl.org/"
changelog="https://raw.githubusercontent.com/libsdl-org/SDL/SDL2/WhatsNew.txt"
distfiles="https://www.libsdl.org/release/SDL2-${version}.tar.gz"
-checksum=01215ffbc8cfc4ad165ba7573750f15ddda1f971d5a66e9dcaffd37c587f473a
+checksum=59c89d0ed40d4efb23b7318aa29fe7039dbbc098334b14f17f1e7e561da31a26
# Package build options
build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
diff --git a/srcpkgs/SDL2_ttf/template b/srcpkgs/SDL2_ttf/template
index b312d1825de..09a1fc1eac2 100644
--- a/srcpkgs/SDL2_ttf/template
+++ b/srcpkgs/SDL2_ttf/template
@@ -1,7 +1,7 @@
# Template file for 'SDL2_ttf'
pkgname=SDL2_ttf
version=2.20.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DSDL2TTF_HARFBUZZ=ON"
makedepends="SDL2-devel freetype-devel harfbuzz-devel"
@@ -24,5 +24,6 @@ SDL2_ttf-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.so
+ vmove usr/lib/cmake
}
}
diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 6527729b398..f43b3d8408d 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,15 +1,15 @@
# Template file for 'SPIRV-Headers'
pkgname=SPIRV-Headers
reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
-version=1.3.268.0
+version=1.3.283.0
revision=1
build_style=cmake
short_desc="Machine-readable files for the SPIR-V Registry"
-maintainer="Orphaned "
+maintainer="Daniel Martinez "
license="MIT"
homepage="https://github.com/KhronosGroup/SPIRV-Headers"
distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-${version}.tar.gz"
-checksum=1022379e5b920ae21ccfb5cb41e07b1c59352a18c3d3fdcbf38d6ae7733384d4
+checksum=a68a25996268841073c01514df7bab8f64e2db1945944b45087e5c40eed12cb9
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template
index 6f1cf2bd6e4..f3c0875c2bf 100644
--- a/srcpkgs/SPIRV-LLVM-Translator/template
+++ b/srcpkgs/SPIRV-LLVM-Translator/template
@@ -1,20 +1,20 @@
# Template file for 'SPIRV-LLVM-Translator'
pkgname=SPIRV-LLVM-Translator
-version=17.0.0
+version=18.1.2
revision=1
build_style=cmake
make_build_args="llvm-spirv"
configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
-DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON
-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr"
-hostmakedepends="clang llvm"
-makedepends="clang-tools-extra llvm17-devel SPIRV-Headers"
+hostmakedepends="clang18 llvm18"
+makedepends="llvm18-devel SPIRV-Headers"
short_desc="API and commands for processing SPIR-V modules"
-maintainer="Orphaned "
+maintainer="Daniel Martinez "
license="NCSA"
homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
-checksum=eba381e1dd99b4ff6c672a28f52755d1adf2d810a97b51e6074ad4fa67937fb2
+checksum=4724372934041c8feb8bcafea1c9d086ab2de9f323599068943ef61ddb0bca51
post_install() {
vlicense LICENSE.TXT
diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 283f80d34fd..51a9068836e 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
# Template file for 'SPIRV-Tools'
pkgname=SPIRV-Tools
-version=2023.5
+version=2024.2
revision=1
build_style=cmake
configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -8,12 +8,12 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
hostmakedepends="python3"
makedepends="SPIRV-Headers"
short_desc="API and commands for processing SPIR-V modules"
-maintainer="Orphaned "
+maintainer="Daniel Martinez "
license="Apache-2.0"
homepage="https://github.com/KhronosGroup/SPIRV-Tools"
changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES"
distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v${version}.rc1.tar.gz"
-checksum=aed90b51ce884ce3ac267acec75e785ee743a1e1fd294c25be33b49c5804d77c
+checksum=e433d40b5b4bf2bc3c819e34d7bf6194937df4d74e2f8dee8012bd8fd69e7f8a
LDFLAGS="-Wl,--no-undefined"
SPIRV-Tools-devel_package() {
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index cf0e06bcabb..b9b144e343b 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
# Template file for 'SuiteSparse'
pkgname=SuiteSparse
-version=7.6.1
+version=7.7.0
revision=1
build_style=cmake
hostmakedepends="cmake gcc-fortran"
@@ -12,7 +12,7 @@ license="custom:multiple"
homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=ab1992802723b09aca3cbb0f4dc9b2415a781b9ad984ed934c7d8a0dcc31bc42
+checksum=529b067f5d80981f45ddf6766627b8fc5af619822f068f342aab776e683df4f3
build_options="openblas"
diff --git a/srcpkgs/TheForceEngine/template b/srcpkgs/TheForceEngine/template
index 6805db0ff51..cf7b1d1114d 100644
--- a/srcpkgs/TheForceEngine/template
+++ b/srcpkgs/TheForceEngine/template
@@ -1,11 +1,11 @@
# Template file for 'TheForceEngine'
pkgname=TheForceEngine
version=1.09.540
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="SDL2-devel SDL2_image-devel rtmidi-devel jack-devel glew-devel MesaLib-devel"
-depends="zenity"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="Modern \"Jedi Engine\" replacement supporting Dark Forces and mods"
maintainer="Kenneth Dodrill "
license="GPL-2.0-only"
diff --git a/srcpkgs/Tuba/template b/srcpkgs/Tuba/template
index 5d2d3b8354f..24bf50c1532 100644
--- a/srcpkgs/Tuba/template
+++ b/srcpkgs/Tuba/template
@@ -1,6 +1,6 @@
# Template file for 'Tuba'
pkgname=Tuba
-version=0.7.2
+version=0.8.1
revision=1
build_style=meson
configure_args="-Ddistro=true"
@@ -14,4 +14,4 @@ maintainer="Bnyro "
license="GPL-3.0-only"
homepage="https://tuba.geopjr.dev/"
distfiles="https://github.com/GeopJr/Tuba/archive/refs/tags/v${version}.tar.gz"
-checksum=ffe81e9c1c45d1165327c61bf8fe7907695e94122bf3b72fc060f87f3611bdcf
+checksum=2c52448061bc82e2a7690faa2bd16e1d3cb506bd0b1a2b1ed32623051710ba06
diff --git a/srcpkgs/VVVVVV/patches/data-zip-path.diff b/srcpkgs/VVVVVV/patches/data-zip-path.diff
new file mode 100644
index 00000000000..90eb24a364e
--- /dev/null
+++ b/srcpkgs/VVVVVV/patches/data-zip-path.diff
@@ -0,0 +1,13 @@
+diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp
+index 5643182d..3a1a8c68 100644
+--- a/desktop_version/src/FileSystemUtils.cpp
++++ b/desktop_version/src/FileSystemUtils.cpp
+@@ -283,7 +283,7 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath, char* langD
+ mkdir(temp, 0777);
+ }
+
+- basePath = SDL_GetBasePath();
++ basePath = SDL_strdup("/usr/share/vvvvvv/");
+
+ if (basePath == NULL)
+ {
diff --git a/srcpkgs/VVVVVV/template b/srcpkgs/VVVVVV/template
new file mode 100644
index 00000000000..599bc71f9f5
--- /dev/null
+++ b/srcpkgs/VVVVVV/template
@@ -0,0 +1,37 @@
+# Template file for 'VVVVVV'
+pkgname=VVVVVV
+version=2.4.1
+revision=1
+build_wrksrc=desktop_version
+build_style=cmake
+configure_args="$(vopt_bool makeandplay MAKEANDPLAY)"
+makedepends="SDL2-devel SDL2_mixer-devel"
+short_desc="Platformer exploring what if you reversed gravity instead of jumping?"
+maintainer="Luca Matei Pintilie "
+license="custom:VVVVVV Source Code License v1.0"
+homepage="https://thelettervsixtim.es/"
+changelog="https://github.com/TerryCavanagh/VVVVVV/releases"
+distfiles="https://github.com/TerryCavanagh/VVVVVV/releases/download/$version/VVVVVV-$version.zip
+ https://thelettervsixtim.es/makeandplay/data.zip>data_${version}.zip"
+checksum="c453373cfa29456318c2ece7d452b2e971595004c1b353cd7073f6912b3c3d12
+ c767809594f6472da9f56136e76657e38640d584164a46112250ac6293ecc0ea"
+repository=nonfree
+skip_extraction="data_${version}.zip"
+
+build_options="makeandplay"
+desc_option_makeandplay="Disable official levels"
+build_options_default="makeandplay"
+
+if [ "$build_option_makeandplay" ]; then
+ short_desc+=" - Make and Play edition"
+fi
+
+do_install() {
+ vbin build/VVVVVV
+ vinstall "$XBPS_SRCDISTDIR/$pkgname-$version/data_${version}.zip" 644 usr/share/vvvvvv data.zip
+}
+
+post_install() {
+ vlicense ../LICENSE.md
+ vlicense "../License exceptions.md"
+}
diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 6b131db5a81..42ae9f00d57 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -3,8 +3,8 @@ pkgname=VirtualGL
version=2.6.2
revision=4
build_style=cmake
-configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
- -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so
+configure_args="-DTJPEG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -DVGL_SYSTEMGLX=ON
+ -DTJPEG_LIBRARY=${XBPS_CROSS_BASE}/usr/lib/libturbojpeg.so
-DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
libXtst-devel fltk-devel openssl-devel"
@@ -15,7 +15,7 @@ homepage="http://www.virtualgl.org/"
distfiles="${SOURCEFORGE_SITE}/virtualgl/${version}/${pkgname}-${version}.tar.gz"
checksum=79dff857862890215794509ac65826005625925d03bf0874a486d695aae6f859
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
post_install() {
mv ${DESTDIR}/usr/bin/{glxinfo,vglxinfo}
diff --git a/srcpkgs/afl++/patches/limits.patch b/srcpkgs/afl++/patches/limits.patch
deleted file mode 100644
index c8463b898a6..00000000000
--- a/srcpkgs/afl++/patches/limits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/afl-ld-lto.c
-+++ b/src/afl-ld-lto.c
-@@ -45,7 +45,7 @@
-
- #include
-
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
-+#if 1 || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
- defined(__DragonFly__)
- #include
- #endif
diff --git a/srcpkgs/afl++/template b/srcpkgs/afl++/template
index fff658acbe1..9b1dc05f81e 100644
--- a/srcpkgs/afl++/template
+++ b/srcpkgs/afl++/template
@@ -1,18 +1,18 @@
# Template file for 'afl++'
pkgname=afl++
-version=4.07c
-revision=2
+version=4.21c
+revision=1
# x86 only currently
archs="i686* x86_64*"
build_style=gnu-makefile
hostmakedepends="which"
-makedepends="clang gmp-devel lld llvm python3-devel"
+makedepends="clang gmp-devel lld llvm llvm17-devel python3-devel"
short_desc="American fuzzy lop Plus Plus - a brute-force fuzzer"
maintainer="Leah Neukirchen "
license="Apache-2.0"
homepage="https://aflplus.plus/"
-distfiles="https://github.com/AFLplusplus/AFLplusplus/archive/refs/tags/${version}.tar.gz"
-checksum=cdb42834359b17336047814d1c24845f606456dbe4e6aff5edac66c21aa577db
+distfiles="https://github.com/AFLplusplus/AFLplusplus/archive/refs/tags/v${version}.tar.gz"
+checksum=11f7c77d37cff6e7f65ac7cc55bab7901e0c6208e845a38764394d04ed567b30
conflicts="afl>=0"
replaces="afl>=0"
diff --git a/srcpkgs/afl++/update b/srcpkgs/afl++/update
index bb22392e733..36abde9ea88 100644
--- a/srcpkgs/afl++/update
+++ b/srcpkgs/afl++/update
@@ -1 +1 @@
-pattern='/\K\d+\.[\d.]+c'
+pattern='/v\K\d+\.[\d.]+c'
diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index 185333212a0..00f845af351 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
# Template file for 'age'
pkgname=age
-version=1.1.1
-revision=3
+version=1.2.0
+revision=1
build_style=go
go_import_path="filippo.io/age"
go_package="${go_import_path}/cmd/..."
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen "
license="BSD-3-Clause"
homepage="https://age-encryption.org/"
distfiles="https://github.com/FiloSottile/age/archive/v${version}.tar.gz"
-checksum=f1f3dbade631976701cd295aa89308681318d73118f5673cced13f127a91178c
+checksum=cefe9e956401939ad86a9c9d7dcf843a43b6bcdf4ee7d8e4508864f227a3f6f0
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 6449cf97e19..57a7fdc8a06 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
# Template file for 'aisleriot'
pkgname=aisleriot
-version=3.22.31
+version=3.22.33
revision=1
build_style=meson
# build requires assertions to be turned on -> n_debug=false
@@ -15,5 +15,5 @@ maintainer="Érico Nogueira "
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Aisleriot"
distfiles="https://gitlab.gnome.org/GNOME/aisleriot/-/archive/${version}/aisleriot-${version}.tar.gz"
-checksum=cef7ca844d782db65c66c557d51c4d5d008c42a22370a6f4319437bd6c9da134
+checksum=01fb7c1f1dfb5c53dbc1f6dbbd11523049d36da463edcf6ea367e24308729156
replaces="aisleriot-data>=0"
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 1ed6b863154..5caea170e9b 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-calendar'
pkgname=akonadi-calendar
-version=24.02.2
+version=24.05.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
@@ -18,7 +18,7 @@ maintainer="John "
license="LGPL-2.1-or-later"
homepage="https://community.kde.org/KDE_PIM"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=930195e722cf268c1465ae35366abefbe6f0d36a3f72708d0cb022e6288ae859
+checksum=3f56b4d3e59eb6eda49b9a19990e94e6f78ec76d2e2c9c2db10e81ae5cb6f1bd
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="Qt6 WebEngine"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 82d35baa388..fa85647e03d 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-contacts'
pkgname=akonadi-contacts
-version=24.02.2
+version=24.05.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
@@ -17,7 +17,7 @@ maintainer="John "
license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://community.kde.org/KDE_PIM/Akonadi"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=eff0bc2a7015804137d9c32f4c20100ca11e5f94a8b119153cd062ebb056f51f
+checksum=a62af3e9225ee6e91c0fff8f23e21819db2e594b4ca19fd7b8214f5101a16e43
akonadi-contacts-devel_package() {
depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index d5980f602ed..806ae02dfdf 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-import-wizard'
pkgname=akonadi-import-wizard
-version=24.02.2
+version=24.05.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
@@ -16,7 +16,7 @@ maintainer="John "
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://community.kde.org/KDE_PIM"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f9508a3da632485f663387cfd832ad6a767eaff2086ba63e010a30344f9d5f15
+checksum=dd28dc2dc7f19beeb40c9fac84d9074fc58f95fc8fb03832a4d40751b114a5da
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="Qt6 WebEngine"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 15aa84d766f..28d1b79f000 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-mime'
pkgname=akonadi-mime
-version=24.02.2
+version=24.05.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
@@ -8,18 +8,15 @@ configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QMLDIR=lib/qt6/qml
-DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs/modules"
hostmakedepends="extra-cmake-modules kf6-kcoreaddons kf6-kdoctools python3
- gettext"
-makedepends="kmime6-devel kf6-akonadi-devel"
+ gettext qt6-base qt6-tools kf6-kconfig"
+makedepends="kmime6-devel kf6-akonadi-devel kf6-kconfig-devel kf6-kdoctools-devel
+ kf6-kcoreaddons-devel"
short_desc="Libraries and daemons to implement basic email handling"
maintainer="John "
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://community.kde.org/KDE_PIM/Akonadi"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=b0651626bda53a0ba36c8044d1147239cc551ef00eed1dfff8388a166d1ce413
-
-if [ "$CROSS_BUILD" ];then
- hostmakedepends+=" qt6-base qt6-tools kf6-kconfig"
-fi
+checksum=524280cac966f9a4490af14c5186e6e107905be9f05be33430f525e8f0a60600
do_check() {
cd build
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 403c1666eb2..8ea86d881d6 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
# Template file for 'akonadi-notes'
pkgname=akonadi-notes
-version=24.02.2
+version=24.05.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
@@ -15,7 +15,7 @@ maintainer="John "
license="LGPL-2.1-or-later"
homepage="https://kontact.kde.org/"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0404d7ad8aec7b8838b3909d9cf222d267f4d6f3b51f26bd8ecca39a7d8b5855
+checksum=a8e01508fd1ecc88cffdb37fdd3f0d3fca90e8b31c18703aaad774a3e2ae4f1f
akonadi-notes-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 817f8ef682d..563c6370273 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,9 +1,9 @@
# Template file for 'akonadi-search'
pkgname=akonadi-search
-version=24.02.2
+version=24.05.1
revision=1
build_style=cmake
-build_helper="rust qemu"
+build_helper="rust"
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
-DKDE_INSTALL_QMLDIR=lib/qt6/qml
@@ -18,7 +18,7 @@ maintainer="John "
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://community.kde.org/KDE_PIM"
distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=6cfacca542f3173ad2f93baa08fbb775d13902a1ba50057e131f4866bea62b9e
+checksum=5d8573761eabad6a49a8eeae79021eafb22b506551a39fdb88b4eb44f9a49302
do_check() {
cd build
diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index b916981c3ee..1b47064abaa 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
# Template file for 'akregator'
pkgname=akregator
-version=24.02.2
+version=24.05.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
@@ -16,7 +16,7 @@ maintainer="Orphaned "
license="GPL-2.0-or-later, GFDL-1.2-only"
homepage="https://www.kde.org/applications/internet/akregator"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=946779e51ba9e0aae417a0d74c29855d67d461508a7a34b264ea58d7376aca6a
+checksum=3f09a17c3bb79ed19e21c628900786bd3eab73f482199a2dd09c865de83c8244
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="Qt6 WebEngine"
diff --git a/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch b/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch
deleted file mode 100644
index e1aec812a58..00000000000
--- a/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0339a33818adc6fc33e83336f9eea289d5e7e893 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?M=C4=81rti=C5=86=C5=A1=20Ma=C4=8Ds?=
-Date: Tue, 19 May 2020 13:48:17 +0300
-Subject: [PATCH] Fix mailcap rendering for e-mails without `Content-Type`
- header
-
-`get_params()` returns `None` when the header is missing. Use `failobj`
-argument to mitigate that.
-
-Fixes #1512
----
- alot/db/utils.py | 2 +-
- tests/db/test_utils.py | 10 ++++++++++
- tests/static/mail/basic.eml | 5 +++++
- 3 files changed, 16 insertions(+), 1 deletion(-)
- create mode 100644 tests/static/mail/basic.eml
-
-diff --git a/alot/db/utils.py b/alot/db/utils.py
-index 27c85942..e55768b1 100644
---- a/alot/db/utils.py
-+++ b/alot/db/utils.py
-@@ -365,7 +365,7 @@ def render_part(part, field_key='copiousoutput'):
- stdin = raw_payload
-
- # read parameter, create handler command
-- parms = tuple('='.join(p) for p in part.get_params())
-+ parms = tuple('='.join(p) for p in part.get_params(failobj=[]))
-
- # create and call external command
- cmd = mailcap.subst(entry['view'], ctype,
-diff --git a/tests/db/test_utils.py b/tests/db/test_utils.py
-index 36ce77cf..40c2fb91 100644
---- a/tests/db/test_utils.py
-+++ b/tests/db/test_utils.py
-@@ -762,6 +762,16 @@ class TestExtractBodyPart(unittest.TestCase):
-
- self.assertEqual(actual, expected)
-
-+ @mock.patch('alot.db.utils.settings.mailcap_find_match',
-+ mock.Mock(return_value=(None, {'view': 'cat'})))
-+ def test_plaintext_mailcap_wo_content_type(self):
-+ with open('tests/static/mail/basic.eml') as fp:
-+ mail = email.message_from_file(fp,
-+ _class=email.message.EmailMessage)
-+ body_part = utils.get_body_part(mail)
-+ actual = utils.extract_body_part(body_part)
-+ expected = 'test body\n'
-+ self.assertEqual(actual, expected)
-
- class TestRemoveCte(unittest.TestCase):
-
-diff --git a/tests/static/mail/basic.eml b/tests/static/mail/basic.eml
-new file mode 100644
-index 00000000..95f15693
---- /dev/null
-+++ b/tests/static/mail/basic.eml
-@@ -0,0 +1,5 @@
-+From: me@localhost
-+To: you@localhost
-+Subject: test subject
-+
-+test body
---
-2.29.2
-
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index 8538b71ad3f..1eb596387e3 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,10 +1,10 @@
# Template file for 'alot'
pkgname=alot
-version=0.9.1
-revision=8
+version=0.10
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Sphinx"
-depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
+hostmakedepends="python3-setuptools python3-Sphinx python3-notmuch2 python3-cffi"
+depends="python3-setuptools python3-Twisted python3-notmuch2 python3-configobj
gpgme-python3 python3-magic python3-urwidtrees"
checkdepends="$depends gnupg2 procps-ng python3-pytest"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
@@ -12,7 +12,7 @@ maintainer="Felix Van der Jeugt "
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
-checksum=ee2c1ab1b43d022a8fe2078820ed57d8d72aec260a7d750776dac4ee841d1de4
+checksum=71f382aa751fb90fde1a06a0a4ba43628ee6aa6d41b5cd53c8701fd7c5ab6e6e
do_check() {
pytest3 -k 'not test_no_spawn_no_stdin_attached'
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index a5708a7d82a..4c892ed730d 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'alsa-plugins'
pkgname=alsa-plugins
-version=1.2.7.1
-revision=2
+version=1.2.12
+revision=1
build_style=gnu-configure
configure_args="--disable-maemo-plugin"
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned "
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://www.alsa-project.org"
distfiles="https://www.alsa-project.org/files/pub/plugins/${pkgname}-${version}.tar.bz2"
-checksum=8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511
+checksum=7bd8a83d304e8e2d86a25895d8dcb0ef0245a8df32e271959cdbdc6af39b66f2
post_install() {
rm -rfv ${DESTDIR}/etc/alsa/conf.d
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index eb87d0cb874..ffeebdb6de5 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,15 +1,15 @@
# Template file for 'amdvlk'
pkgname=amdvlk
-version=2024.Q2.1
+version=2024.Q2.3
revision=1
-_xgl_commit=f6a447e31ae7c4583c765042071f48421269cfce
-_pal_commit=c789abc769d264f73e3dad3f21238b876918f594
-_llpc_commit=8252cfa83e03aa0a193c0f0cd6a9dba3e99e25d5
-_gpurt_commit=e0f12d951395cacd8ff117a0e82601e1ce5c4c02
-_llvm_project_commit=45cdb88c143dad74438a9a480b3b1d33305b9da4
+_xgl_commit=5dd432ade87244461b8cf357b5cb641e7ee7ff15
+_pal_commit=695337aa8131913d883ff15787cd75f6fcb11229
+_llpc_commit=f64d106c023e7bed59bfb441ffb258c127e500c1
+_gpurt_commit=6ca06bbba1c0e4bbb82f10e93423e607b2227985
+_llvm_project_commit=72a6d2843ca05fa8d18a789664a642b4d0c9e069
_MetroHash_commit=18893fb28601bb9af1154cd1a671a121fff6d8d3
_CWPack_commit=4f8cf0584442a91d829d269158567d7ed926f026
-_llvm_dialects_commit=55e176fb88bcfc4fae45bafaa3ff209ec4c0d4ee
+_llvm_dialects_commit=ed4b46e8425066a96a5e79afc29bce3d82eecf71
archs="i686* x86_64*"
create_wrksrc=yes
build_wrksrc="xgl"
@@ -34,15 +34,15 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz
https://github.com/GPUOpen-Drivers/llvm-dialects/archive/${_llvm_dialects_commit}.tar.gz"
-checksum="ede2ad261f68da64bb3a7ca47c6debfc42c171d3bd9bd91a01e3727ff5a7d4c8
- 4a609e8077ad27aa426b0a37ff52c615c10fd19520a83eaed9000b937f93ee16
- 8bce7f9b491d37ec6d1ca8fe440b145d6a26248278422f700f0beffb2f6f79d3
- 9c9a2da94c10c6108faf47e87a0db085799874a392bd0ead17881ab248c28874
- f74a3b15f230a134a86ee76964582dc0b4fb2990d26b77fe2b7be5f62adc0645
- 644b35c146a08af1474d7c030b15811f2480762741b5cef6d72299c1ec353ac4
- 141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a
- 87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484
- 996b27e2b9b1d40d038a8c8b741a398ae1dab06e5ef24d48b2f9d006871b9a2d"
+checksum="3dd43ce83bf3e9aa32f2d6d02817c8547092b46fc135e4c4e783750d77939c6e
+a7d101ca216cf3df1ba0eb428d9f490cf2fded068bbf9cdd15d02bead9dab8e4
+dabb381102aae721c48e8ec24e83504258f0009fa72bc4efaf0254a99ff9c531
+771d9b2006393ecbcae90edf6e197cc63056a4c935bafb87f4522a4b9ebe5c66
+b2cd8b047e15e90f13be9474dd024dca518979801dc8e77265ae49b25b954f77
+ba92d72d0a1298a683a8bb4e540bdea653f84559f735bb9ade9968e021f8b462
+141e6c156a834b8e0f90ba108664d7f35193df11acddefa117f394dbf2b7371a
+87ed9209c129f47d0b64c914fb99d6c69e59a257445ec3a394c3e00d5e2b4484
+a6d4a7aabfa887ee332c5136a1fc6d123ff9b5daf6d864a973978362cf011183"
nocross=yes
lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 8dd73f6e884..ec1ccc70bf0 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,7 +1,7 @@
# Template file for 'android-studio'
pkgname=android-studio
-version=2023.3.1.18
-revision=2
+version=2024.1.1.11
+revision=1
archs="x86_64"
hostmakedepends="tar"
short_desc="Official Android IDE"
@@ -10,7 +10,7 @@ license="Apache-2.0"
homepage="https://developer.android.com/studio/"
changelog="https://developer.android.com/studio/releases/"
distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-${version}-linux.tar.gz"
-checksum=46a9b4a311820b2c1841110affa286d65665ac9f8970fd9e9eb903c3d7aa436e
+checksum=d8fa8ecfe415b44513350901501e2a0f429ca033cf1805054b1c816c4a704565
repository=nonfree
restricted=yes
python_version=3
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 198be476480..1b02d213fce 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.4
-revision=2
+version=34.0.5
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
hostmakedepends="perl go protobuf pkg-config"
@@ -13,7 +13,7 @@ maintainer="John "
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=7a22ff9cea81ff4f38f560687858e8f8fb733624412597e3cc1ab0262f8da3a1
+checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
post_install() {
# zsh's built in works, while this one doesn't
diff --git a/srcpkgs/apl/patches/ppc.patch b/srcpkgs/apl/patches/ppc.patch
deleted file mode 100644
index 9db0e0d13a1..00000000000
--- a/srcpkgs/apl/patches/ppc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-This backports the relevant bit of svn revision 1177 to fix build on platforms
-where long double does not have extended range (larger than regular double),
-particularly PowerPC (32 and 64 bit).
-
-On those platforms, the build previously failed with:
-
-Tokenizer.cc:769:4: error: floating constant exceeds range of 'long double' [-Werror=overflow]
- exp_0_9(1E30)
- ^~~~~~~
-
---- a/src/Tokenizer.cc
-+++ b/src/Tokenizer.cc
-@@ -755,10 +755,10 @@
- MAX_TOKENIZE_DIGITS = MAX_TOKENIZE_DIGITS_1 - 1 // excl. rounding digit
- };
-
--#define exp_0_9(x) x ## 0L, x ## 1L, x ## 2L, x ## 3L, x ## 4L, \
-- x ## 5L, x ## 6L, x ## 7L, x ## 8L, x ## 9L,
-+#define exp_0_9(x) x ## 0, x ## 1, x ## 2, x ## 3, x ## 4, \
-+ x ## 5, x ## 6, x ## 7, x ## 8, x ## 9,
-
--static const long double expo_tab[310] =
-+static const long double expo_tab[309] =
- {
- exp_0_9(1E) exp_0_9(1E1) exp_0_9(1E2) exp_0_9(1E3) exp_0_9(1E4)
- exp_0_9(1E5) exp_0_9(1E6) exp_0_9(1E7) exp_0_9(1E8) exp_0_9(1E9)
-@@ -766,7 +766,7 @@
- exp_0_9(1E15) exp_0_9(1E16) exp_0_9(1E17) exp_0_9(1E18) exp_0_9(1E19)
- exp_0_9(1E20) exp_0_9(1E21) exp_0_9(1E22) exp_0_9(1E23) exp_0_9(1E24)
- exp_0_9(1E25) exp_0_9(1E26) exp_0_9(1E27) exp_0_9(1E28) exp_0_9(1E29)
-- exp_0_9(1E30)
-+ 1E300, 1E301, 1E302, 1E303, 1E304, 1E305, 1E306, 1E307, 1E308
- };
-
- static const long double nexpo_tab[310] =
-@@ -960,6 +960,7 @@
-
- if (expo > 0)
- {
-+ if (expo > 308) return false;
- if (negative) flt_val = - v * expo_tab[expo];
- else flt_val = v * expo_tab[expo];
- return true; // OK
diff --git a/srcpkgs/apl/template b/srcpkgs/apl/template
index 6fb1afb356b..4cbab3b604c 100644
--- a/srcpkgs/apl/template
+++ b/srcpkgs/apl/template
@@ -1,7 +1,7 @@
# Template file for 'apl'
pkgname=apl
-version=1.8
-revision=2
+version=1.9
+revision=1
build_style=gnu-configure
configure_args="CXX_WERROR=no"
hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen "
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/apl"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=144f4c858a0d430ce8f28be90a35920dd8e0951e56976cb80b55053fa0d8bbcb
+checksum=291867f1b1937693abb57be7d9a37618b0376e3e2709574854a7bbe52bb28eb8
nocross="execs target binary: ./Gtk_server --ev1 > Gtk_events1.asciidoc"
post_install() {
diff --git a/srcpkgs/apparmor/patches/libapparmor-basename.patch b/srcpkgs/apparmor/patches/libapparmor-basename.patch
new file mode 100644
index 00000000000..7977d2c2f85
--- /dev/null
+++ b/srcpkgs/apparmor/patches/libapparmor-basename.patch
@@ -0,0 +1,20 @@
+--- a/libraries/libapparmor/testsuite/test_multi.c
++++ b/libraries/libapparmor/testsuite/test_multi.c
+@@ -1,5 +1,3 @@
+-#define _GNU_SOURCE /* for glibc's basename version */
+-
+ #include
+ #include
+ #include
+@@ -7,6 +5,11 @@
+
+ #include
+
++static const char *basename(const char *path)
++{
++ return strrchr(path, '/') ? strrchr(path, '/')+1 : path;
++}
++
+ int print_results(aa_log_record *record);
+
+ int main(int argc, char **argv)
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index d3f4d35c393..0afe30b37d1 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,13 +1,15 @@
# Template file for 'apparmor'
pkgname=apparmor
-version=3.1.6
+version=3.1.7
revision=2
build_wrksrc=libraries/libapparmor
build_style=gnu-configure
conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
make_dirs="/etc/apparmor.d/disable 0755 root root"
+configure_args="$(vopt_with python) $(vopt_with perl)"
hostmakedepends="bison flex gettext python3 which python3-setuptools pkg-config
- perl"
+ perl $(vopt_if python swig)"
+makedepends="$(vopt_if python python3-devel)"
depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2
python3-psutil python3-dbus iproute2"
checkdepends="dejagnu"
@@ -17,13 +19,23 @@ license="GPL-2.0-only"
homepage="https://gitlab.com/apparmor/apparmor"
changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
-checksum=d5d699fd43faffd924dd51bfb5781a5a7cbabb55c1c9cb4abfb8c2840a9e8fcd
+checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
replaces="apparmor-vim>=0"
+# /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t';
+CFLAGS="-D_LARGEFILE64_SOURCE"
+CXXFLAGS="-D_LARGEFILE64_SOURCE"
+
+build_options="python perl"
+
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|aarch64*|i686*)
+ build_options_default+=" python"
+ ;;
+esac
+
if [ -z "$CROSS_BUILD" ]; then
- configure_args="--with-perl --with-python"
- hostmakedepends+=" swig"
- makedepends="python3-devel"
+ build_options_default+=" perl"
fi
pre_build() {
@@ -55,7 +67,7 @@ post_install() {
make DESTDIR="${DESTDIR}" install -C profiles
# requires perl bindings not generated when cross-compiling
- if [ "$CROSS_BUILD" ]; then
+ if [ -z "$build_option_perl" ]; then
rm -f ${DESTDIR}/usr/bin/aa-notify
fi
@@ -71,8 +83,10 @@ libapparmor_package() {
license="LGPL-2.1-only"
pkg_install() {
vmove "usr/lib/libapparmor.so*"
- if [ -z "$CROSS_BUILD" ]; then
+ if [ "$build_option_perl" ]; then
vmove usr/lib/perl5
+ fi
+ if [ "$build_option_python" ]; then
vmove "${py3_sitelib}/LibAppArmor*"
fi
vmove usr/share/man/man2
diff --git a/srcpkgs/appres/template b/srcpkgs/appres/template
index 83e4b39f1bb..6aa287fb799 100644
--- a/srcpkgs/appres/template
+++ b/srcpkgs/appres/template
@@ -1,16 +1,16 @@
-# Template build file for 'appres'.
+# Template file for 'appres'
pkgname=appres
-version=1.0.6
+version=1.0.7
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXt-devel"
short_desc="List X application resource database"
-homepage="http://xorg.freedesktop.org"
-license="MIT"
maintainer="Leah Neukirchen "
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
-checksum=8b2257e2a0a1ad8330323aec23f07c333075d7fe4e6efd88e0c18fba8223590b
+license="MIT"
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=1114b189239fd87a8d1db433edcb4486346d29912132b91eaeee5667f13b819f
post_install() {
vlicense COPYING
diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index 3297f4e2f36..698fe4ac5f6 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,6 +1,6 @@
# Template file for 'arduino-cli'
pkgname=arduino-cli
-version=0.35.3
+version=1.0.2
revision=1
build_style=go
build_helper="qemu"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford "
license="GPL-3.0-or-later"
homepage="https://github.com/arduino/arduino-cli"
distfiles="https://github.com/arduino/arduino-cli/archive/v${version}.tar.gz"
-checksum=b93bd201bef0790ccea3e8646f451e0e825bdcc1fab562a5e32dab4c90ee7fdb
+checksum=3741dee1cf63eecd0b8b42f51c8e1570ceb464a38ff3acdbbeb214a88645d930
case "$XBPS_TARGET_MACHINE" in
# the downloaded toolchains use glibc, this allows them to work on musl
diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index 88e18ed7ff8..34b1274cf77 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -17,8 +17,6 @@ lib32disabled=yes
# Build system look only under / for headers and libraries. Breaks cross.
nocross=yes
-CFLAGS="-fcommon"
-
do_configure() {
sed -i 's:^TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p":IMPORT{builtin}="hwdb --subsystem=usb":' usb/55-Argyll.rules
}
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1a5865e1e0f..8008e9aabee 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
# Template file for 'ark'
pkgname=ark
-version=24.02.2
+version=24.05.0
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
@@ -14,7 +14,7 @@ maintainer="John "
license="GPL-2.0-or-later"
homepage="https://kde.org/applications/en/utilities/org.kde.ark"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=06374f5c7c2aee7a93c04bfd7b6b3baaeab3962e8277c9087fea54ba9805bdce
+checksum=70b149f0226eb404c9d957971e86a94bc4c071c1aa1a4d233c491e5fdb63f9d7
do_check() {
cd build
diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index 49818784733..5d0f755d8ec 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,6 +1,6 @@
# Template file for 'arti'
pkgname=arti
-version=1.2.3
+version=1.2.5
revision=1
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0, MIT"
homepage="https://gitlab.torproject.org/tpo/core/arti"
changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=2cfbbc6aa203e0203f773158c4994ee0d55f7213c488281febeef9a15e25aec4
+checksum=0826cabc6a00f6564837ca1a6688566d0e54b399a4f8362b6297552f9167eeba
post_install() {
vlicense LICENSE-MIT
diff --git a/srcpkgs/ast-grep/template b/srcpkgs/ast-grep/template
index 66f86454ef2..89f0bff7bb8 100644
--- a/srcpkgs/ast-grep/template
+++ b/srcpkgs/ast-grep/template
@@ -1,6 +1,6 @@
# Template file for 'ast-grep'
pkgname=ast-grep
-version=0.22.3
+version=0.24.1
revision=1
build_style=cargo
make_check_args="-- --skip=test_unmatching_id skip=test_merge_with_globs"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://ast-grep.github.io"
changelog="https://raw.githubusercontent.com/ast-grep/ast-grep/main/CHANGELOG.md"
distfiles="https://static.crates.io/crates/ast-grep/ast-grep-${version}.crate"
-checksum=912a79177d5dc8175c1f2cd110682e91bb9795eef5afdbe7ef7a4104bbce2e19
+checksum=6537ce78e8fb5177368b92ecda84e29d93774ec63e5b9f038431df6cf22987ab
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/astroid/patches/webkit2gtk41.patch b/srcpkgs/astroid/patches/webkit2gtk41.patch
new file mode 100644
index 00000000000..49de01d36bf
--- /dev/null
+++ b/srcpkgs/astroid/patches/webkit2gtk41.patch
@@ -0,0 +1,468 @@
+From a98affc88b03b18aa8e52ffccddf12a81141821a Mon Sep 17 00:00:00 2001
+From: Johannes Rosenberger
+Date: Tue, 4 Jun 2024 22:37:00 +0200
+Subject: [PATCH] fix typo in CMakeLists.txt
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5dd70705..8613572e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -338,7 +338,7 @@ target_link_libraries (
+ ${GTKMM3_LDFLAGS}
+ ${GLIBMM2_LDFLAGS}
+ ${GIOMM2_LDFLAGS}
+- ${GIOUINX_LDFLAGS}
++ ${GIOUNIX_LDFLAGS}
+ ${LIBSOUP_LDFLAGS}
+ ${GMIME_LDFLAGS}
+ ${VTE2_LDFLAGS}
+@@ -368,7 +368,7 @@ target_link_libraries (
+ ${WEBKIT2GTK_LDFLAGS}
+ ${GLIBMM2_LDFLAGS}
+ ${GIOMM2_LDFLAGS}
+- ${GIOUINX_LDFLAGS}
++ ${GIOUNIX_LDFLAGS}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${PROTOBUF_LIBRARIES}
+ ${GTKMM3_LDFLAGS}
+From 4c76a4cf6226752f5270197ba8747c7c7550e35e Mon Sep 17 00:00:00 2001
+From: Johannes Rosenberger
+Date: Tue, 4 Jun 2024 22:43:06 +0200
+Subject: [PATCH 1/2] improve mailto uri handling
+
+1. This introduces consistent mailto uri handling, supporting passing a
+ body and all headers that can be given as agruments to EditMessage,
+ namely, To, From, Cc, Bcc and Subject.
+ Other headers are not dropped but prepended to the email body with a note.
+
+2. Positional (i.e., non-option) commandline arguments are now
+ interpreted as --mailto options.
+
+3. Multiple --mailto options on the commandline are now supported, and are
+ merged into one mailto argument before being passed to EditMessage.
+
+4. A consequence is that libsoup is not used any more, enabling
+ compatibility with webkit2gtk-4.1 while maintaining compatibility with
+ gio (glib) 2.16, and thus building on older and current distros.
+---
+ .github/workflows/ci-debian-build-test.yml | 1 -
+ CMakeLists.txt | 6 +-
+ src/astroid.cc | 91 ++++++++++------------
+ src/astroid.hh | 1 +
+ src/message_thread.cc | 3 +-
+ src/modes/edit_message.cc | 89 +++++++++++++++++++--
+ src/modes/edit_message.hh | 4 +-
+ src/modes/thread_view/thread_view.cc | 4 -
+ 8 files changed, 127 insertions(+), 72 deletions(-)
+
+diff --git a/.github/workflows/ci-debian-build-test.yml b/.github/workflows/ci-debian-build-test.yml
+index 3015b7f06..ddc33728f 100644
+--- a/.github/workflows/ci-debian-build-test.yml
++++ b/.github/workflows/ci-debian-build-test.yml
+@@ -59,7 +59,6 @@ jobs:
+ libpeas-dev \
+ libprotobuf-dev \
+ libsass-dev \
+- libsoup2.4-dev \
+ libvte-2.91-dev \
+ libwebkit2gtk-${WEBKITGTK_VERSION}-dev \
+ ninja-build \
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8613572ec..498e4a260 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,8 +98,7 @@ pkg_check_modules (GLIBMM2 REQUIRED glibmm-2.4)
+ pkg_check_modules (WEBKIT2GTK REQUIRED webkit2gtk-4.0>=2.22)
+ pkg_check_modules (SASS REQUIRED libsass)
+ pkg_check_modules (GIOMM2 REQUIRED giomm-2.4)
+-pkg_check_modules (GIOUNIX REQUIRED gio-unix-2.0)
+-pkg_check_modules (LIBSOUP REQUIRED libsoup-2.4)
++pkg_check_modules (GIOUNIX REQUIRED gio-unix-2.0>=2.16)
+
+ string (REGEX REPLACE "([0-9]+\.[0-9]+)\.[0-9]+" "\\1" GMIME_MAJOR_MINOR ${Notmuch_GMIME_VERSION})
+ pkg_check_modules (GMIME REQUIRED gmime-${GMIME_MAJOR_MINOR}>=${Notmuch_GMIME_VERSION})
+@@ -154,7 +153,6 @@ include_directories (
+ ${GLIBMM2_INCLUDE_DIRS}
+ ${GIOMM2_INCLUDE_DIRS}
+ ${GIOUNIX_INCLUDE_DIRS}
+- ${LIBSOUP_INCLUDE_DIRS}
+ ${GMIME_INCLUDE_DIRS}
+ ${WEBKIT2GTK_INCLUDE_DIRS}
+ ${VTE2_INCLUDE_DIRS}
+@@ -169,7 +167,6 @@ add_compile_options (
+ ${GLIBMM2_CFLAGS}
+ ${GIOMM2_CFLAGS}
+ ${GIOUNIX_CFLAGS}
+- ${LIBSOUP_CFLAGS}
+ ${GMIME_CFLAGS}
+ ${WEBKIT2GTK_CFLAGS}
+ ${VTE2_CFLAGS}
+@@ -339,7 +336,6 @@ target_link_libraries (
+ ${GLIBMM2_LDFLAGS}
+ ${GIOMM2_LDFLAGS}
+ ${GIOUNIX_LDFLAGS}
+- ${LIBSOUP_LDFLAGS}
+ ${GMIME_LDFLAGS}
+ ${VTE2_LDFLAGS}
+ ${SASS_LDFLAGS}
+diff --git a/src/astroid.cc b/src/astroid.cc
+index 3d5dc9f54..b23e8f6e6 100644
+--- a/src/astroid.cc
++++ b/src/astroid.cc
+@@ -53,8 +53,6 @@
+ # include
+ # include
+
+-# include
+-
+ using namespace std;
+ using namespace boost::filesystem;
+
+@@ -126,7 +124,7 @@ namespace Astroid {
+ # ifdef DEBUG
+ ( "test-config,t", "use test config (same as used when tests are run), only makes sense from the source root")
+ # endif
+- ( "mailto,m", po::value(), "compose mail with mailto url or address")
++ ( "mailto,m", po::value< vector >()->composing(), "compose mail with mailto url or address")
+ ( "no-auto-poll", "do not poll automatically")
+ ( "disable-log", "disable logging")
+ ( "log-stdout", "log to stdout regardless of configuration")
+@@ -139,6 +137,9 @@ namespace Astroid {
+ # else
+ ;
+ # endif
++
++ /* default option (without --