Compare commits

..

2 Commits

Author SHA1 Message Date
Luca Bilke a63172e653
WIP 2024-10-31 11:12:50 +01:00
Luca Bilke 0be4c0f88e
untested floorp package with PGO 2024-10-22 19:08:42 +02:00
915 changed files with 5525 additions and 11721 deletions

View File

@ -15,7 +15,7 @@ jobs:
contents: write
steps:
- name: Checkout
uses: https://code.forgejo.org/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
uses: https://code.forgejo.org/actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- name: Get changed packages
id: changed

View File

@ -7,7 +7,7 @@ on:
jobs:
renovate:
runs-on: docker
container: renovate/renovate@sha256:3bb920c6ede5f504be5cbedef634b22ada34e816b4015c8cc548e61189137fde
container: renovate/renovate@sha256:6a4948c97e846bf1082f3956debde5a183917f7b608ccb1ff7971a9423a38a92
env:
LOG_LEVEL: debug
RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
@ -18,7 +18,7 @@ jobs:
RENOVATE_GIT_AUTHOR: "Johnny5 <bot@snaile.de>"
steps:
- uses: https://code.forgejo.org/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: https://code.forgejo.org/actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- name: Renovate
run: renovate ${{ github.repository }}

View File

@ -63,4 +63,3 @@ howtologinquickwiththirtyninecharacters <howtologinquickwiththirtyninecharacters
Érico Nogueira <erico.erc@gmail.com> Érico Rolim <erico.erc@gmail.com>
Adam Gausmann <adam@gaussian.dev> Adam Gausmann <agausmann@fastmail.com>
triallax <triallax@tutanota.com>

View File

@ -679,7 +679,7 @@ libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
libcpufreq.so.0 libcpufreq-007_1
libcpuid.so.17 libcpuid-0.7.0_1
libcpuid.so.16 libcpuid-0.6.2_1
libgucharmap_2_90.so.7 gucharmap-3.0.0_1
libgphoto2.so.6 libgphoto2-2.5.7_1
libgphoto2_port.so.12 libgphoto2-2.5.7_1
@ -987,20 +987,15 @@ 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.19.1 liblldb19-19.1.0_1
liblldb.so.18.1 liblldb18-18.1.8_1
liblldb.so.17 liblldb17-17.0.6_3
libclang.so.19.1 libclang19-19.1.0_1
libclang.so.18.1 libclang18-18.1.8_1
libclang.so.17 libclang17-17.0.6_1
libclang-cpp.so.19.1 libclang-cpp19-19.1.0_1
libclang-cpp.so.18.1 libclang-cpp18-18.1.8_1
libclang-cpp.so.17 libclang-cpp17-17.0.6_1
libLLVM-17.so libllvm17-17.0.6_1
libLLVM.so.18.1 libllvm18-18.1.8_1
libLLVM.so.19.1 libllvm19-19.1.0_1
libLLVMSPIRVLib.so.18.1 SPIRV-LLVM-Translator-18.1.2_1
libLLVMSPIRVLib.so.19.1 SPIRV-LLVM-Translator19-19.1.1_1
libomp.so.5 libomp-17.0.6_1
libomptarget.so.18.1 libomp-18.1.8_1
libisofs.so.6 libisofs-0.6.24_1
@ -1459,7 +1454,7 @@ libgfrpc.so.0 libglusterfs-8.3_2
libgfxdr.so.0 libglusterfs-8.3_2
libgfapi.so.0 libglusterfs-8.3_2
libglusterd.so.0 libglusterfs-8.3_2
libsnapper.so.7 libsnapper-0.11.2_1
libsnapper.so.6 libsnapper-0.10.2_1
libtsm.so.4 libtsm-4.0.2_1
libxine.so.2 libxine-1.2.4_1
libjbig2dec.so.0 libjbig2dec-0.11_1
@ -2066,7 +2061,7 @@ libpolkit-qt6-core-1.so.1 polkit-qt6-0.200.0_1
libpolkit-qt6-gui-1.so.1 polkit-qt6-0.200.0_1
libpolkit-qt6-agent-1.so.1 polkit-qt6-0.200.0_1
libfm-qt.so.14 libfm-qt5-1.4.0_1
libfm-qt6.so.15 libfm-qt-2.1.0_1
libfm-qt6.so.14 libfm-qt-2.0.2_1
libqtermwidget5.so.1 qtermwidget-1.0.0_1
libqtermwidget6.so.2 qtermwidget-qt6-2.0.0_1
libmd4c.so.0 libmd4c-0.4.8_1
@ -2748,7 +2743,7 @@ libdcadec.so.0 dcadec-0.2.0_1
libcmark.so.0 cmark-0.24.1_1
libvidstab.so.1.1 libvidstab-1.1.0_1
libxdo.so.3 xdotool-3.20150503.1_1
libabigail.so.5 libabigail-2.6_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.60 kdevelop-24.08.0_1
@ -3242,30 +3237,30 @@ libsqstdlib.so.0 squirrel-libs-3.1_1
libexecinfo.so.1 libexecinfo-1.1_1
libkpmcore.so.12 kpmcore-22.04.1_1
libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
libr_core.so.5.9.6 radare2-5.9.6_1
libr_config.so.5.9.6 radare2-5.9.6_1
libr_cons.so.5.9.6 radare2-5.9.6_1
libr_util.so.5.9.6 radare2-5.9.6_1
libr_flag.so.5.9.6 radare2-5.9.6_1
libr_arch.so.5.9.6 radare2-5.9.6_1
libr_asm.so.5.9.6 radare2-5.9.6_1
libr_bin.so.5.9.6 radare2-5.9.6_1
libr_anal.so.5.9.6 radare2-5.9.6_1
libr_lang.so.5.9.6 radare2-5.9.6_1
libr_debug.so.5.9.6 radare2-5.9.6_1
libr_egg.so.5.9.6 radare2-5.9.6_1
libr_bp.so.5.9.6 radare2-5.9.6_1
libr_search.so.5.9.6 radare2-5.9.6_1
libr_io.so.5.9.6 radare2-5.9.6_1
libr_hash.so.5.9.6 radare2-5.9.6_1
libr_socket.so.5.9.6 radare2-5.9.6_1
libr_parse.so.5.9.6 radare2-5.9.6_1
libr_syscall.so.5.9.6 radare2-5.9.6_1
libr_crypto.so.5.9.6 radare2-5.9.6_1
libr_fs.so.5.9.6 radare2-5.9.6_1
libr_magic.so.5.9.6 radare2-5.9.6_1
libr_reg.so.5.9.6 radare2-5.9.6_1
libr_main.so.5.9.6 radare2-5.9.6_1
libr_core.so.5.9.4 radare2-5.9.4_1
libr_config.so.5.9.4 radare2-5.9.4_1
libr_cons.so.5.9.4 radare2-5.9.4_1
libr_util.so.5.9.4 radare2-5.9.4_1
libr_flag.so.5.9.4 radare2-5.9.4_1
libr_arch.so.5.9.4 radare2-5.9.4_1
libr_asm.so.5.9.4 radare2-5.9.4_1
libr_bin.so.5.9.4 radare2-5.9.4_1
libr_anal.so.5.9.4 radare2-5.9.4_1
libr_lang.so.5.9.4 radare2-5.9.4_1
libr_debug.so.5.9.4 radare2-5.9.4_1
libr_egg.so.5.9.4 radare2-5.9.4_1
libr_bp.so.5.9.4 radare2-5.9.4_1
libr_search.so.5.9.4 radare2-5.9.4_1
libr_io.so.5.9.4 radare2-5.9.4_1
libr_hash.so.5.9.4 radare2-5.9.4_1
libr_socket.so.5.9.4 radare2-5.9.4_1
libr_parse.so.5.9.4 radare2-5.9.4_1
libr_syscall.so.5.9.4 radare2-5.9.4_1
libr_crypto.so.5.9.4 radare2-5.9.4_1
libr_fs.so.5.9.4 radare2-5.9.4_1
libr_magic.so.5.9.4 radare2-5.9.4_1
libr_reg.so.5.9.4 radare2-5.9.4_1
libr_main.so.5.9.4 radare2-5.9.4_1
libykpiv.so.2 libykpiv-2.3.0_1
libykcs11.so.2 libykcs11-2.3.0_1
libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
@ -3326,28 +3321,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
libgnuradio-runtime.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-pmt.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-blocks.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-audio.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-fec.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-fft.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-filter.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-analog.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-digital.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-dtv.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-channels.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-trellis.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-video-sdl.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-vocoder.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-wavelet.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-uhd.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-network.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-soapy.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-qtgui.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-zeromq.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-iio.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-pdu.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
@ -3584,9 +3579,9 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libsoci_core.so.4.0 soci-4.0.3_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so.15 glslang-15.0.0_1
libglslang-default-resource-limits.so.15 glslang-15.0.0_1
libSPIRV.so glslang-15.0.0_1
libglslang.so.11 glslang-11.11.0_1
libHLSL.so glslang-11.11.0_1
libSPIRV.so glslang-11.11.0_1
libSPIRV-Tools-shared.so SPIRV-Tools-2022.3_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
@ -3626,6 +3621,8 @@ libswitchboard-2.0.so.0 switchboard-2.3.2_1
libcodecore.so.0 libio.elementary.code-3.0_1
libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1
libwlroots.so.10 wlroots0.15-0.15.1_1
libwlroots.so.11 wlroots0.16-0.16.0_1
libwlroots.so.12 wlroots0.17-0.17.0_1
libwlroots-0.18.so wlroots0.18-0.18.0_1
libbaseencode.so.1 libbaseencode-1.0.9_1
@ -4331,7 +4328,7 @@ librz_type.so.0.7 rizin-0.7.2_1
librz_util.so.0.7 rizin-0.7.2_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
libnvme.so.1 libnvme-1.10_1
libnvme.so.1 libnvme-1.0_1
libnvme-mi.so.1 libnvme-1.2_1
libRInside.so R-cran-RInside-0.2.16_1
libXrdUtils.so.3 xrootd-5.4.0_1
@ -4488,7 +4485,7 @@ libtext-engine-0.1.so.0 text-engine-0.1.1_1
libvmaf.so.1 vmaf-2.3.1_1
liblc3.so.1 liblc3-1.0.3_1
libmimalloc.so.2 mimalloc-2.1.2_1
lib2geom.so.1.4.0 lib2geom-1.4_1
lib2geom.so.1.3.0 lib2geom-1.3_1
libdbi.so.1 libdbi-0.9.0_1
libchafa.so.0 libchafa-1.12.5_1
libcppdap.so cppdap-1.58.0+a_1
@ -4541,4 +4538,3 @@ libsfdo-desktop.so.0 libsfdo-0.1.3_1
libsfdo-desktop-file.so.0 libsfdo-0.1.3_1
libsfdo-icon.so.0 libsfdo-0.1.3_1
libKMahjongg6.so.6 libkmahjongg-24.08.2_1
libflashrom.so.1 flashrom-1.4.0_1

View File

@ -85,7 +85,7 @@ XBPS_SUCMD="sudo /bin/sh -c"
# [OPTIONAL]
# Enable building -dbg subpackages with debugging symbols. Please note
# that building with debugging symbols may take a long while in some
# that building with debugging symbols make take a long while in some
# packages even on computers with a fast CPU; as well as needs lots of
# RAM to properly build some packages.
#

View File

@ -1,17 +0,0 @@
*** a/CMakeLists.txt 2024-10-21 10:03:31.920419079 -0300
--- b/CMakeLists.txt 2024-10-21 10:13:21.248594699 -0300
*************** endif(EXISTS ${CMAKE_SOURCE_DIR}/.git)
*** 123,125 ****
! enable_testing()
find_package(PkgConfig REQUIRED)
--- 123,125 ----
!
find_package(PkgConfig REQUIRED)
*************** add_subdirectory(po)
*** 141,143 ****
add_subdirectory(src)
- add_subdirectory(tests)
--- 141,142 ----

View File

@ -1,11 +0,0 @@
*** a/src/daemon_client.cpp 2024-10-07 08:16:51.000000000 -0300
--- b/src/daemon_client.cpp 2024-10-21 11:43:37.561779747 -0300
***************
*** 22,24 ****
*/
!
#include <unistd.h>
--- 22,24 ----
*/
! #include <cstring>
#include <unistd.h>

View File

@ -1,19 +1,30 @@
# Template file for 'CPU-X'
pkgname=CPU-X
version=5.1.0
revision=2
version=4.5.3
revision=1
archs="x86_64* i686*"
build_style=cmake
hostmakedepends="pkg-config nasm gettext"
makedepends="ncurses-devel libcpuid-devel pciutils-devel glfw-devel
ocl-icd-devel procps-ng-devel libstatgrab gtkmm-devel vulkan-loader-devel"
hostmakedepends="pkg-config nasm"
makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
vulkan-loader-devel"
#checkdepends="mawk nawk grep"
short_desc="Free software that gathers information on CPU, motherboard and more"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
changelog="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/blob/master/ChangeLog.md"
distfiles="https://github.com/thetumultuousunicornofdarkness/CPU-X/archive/v${version}.tar.gz"
checksum=a99f963dd9cb982966fdfce9e9a9b569f852c1bfffb51e7b9f154abc8c0d40c5
checksum=aeef04fb5c2da85f8790ab74bd66e2e72c9595579d5f64d2d08f093ef69d81f9
# xbps-src will still install checkdepends even if the template says `make_check=no`.
# And breaking the build environment on the CI is also bad, if CPU-X would be part
# of revbumps due to shared libraries it would destroy the CI.
# if [ "$XBPS_BUILD_ENVIRONMENT" != void-packages-ci ]; then
# # Installing the packages in checkdepends causes base-chroot to break.
# # So, only run the checks in CI, where the chroot is ethereal anyway.
# make_check=no
# fi
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"

View File

@ -1 +0,0 @@
Carla

99
srcpkgs/Carla/template Executable file → Normal file
View File

@ -1,7 +1,7 @@
# Template file for 'Carla'
pkgname=Carla
version=2.5.8
revision=1
version=2.5.1
revision=4
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
pycompile_dirs="usr/share/carla"
@ -16,59 +16,19 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://kx.studio/Applications:Carla"
distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
checksum=4ec96d06342ff28da4b80d4a76bc08fcaa5703726f96e5174afcdc4f7fc6195d
checksum=c47eea999b2880bde035fbc30d7b42b49234a81327127048a56967ec884dfdba
python_version=3
build_options="win linux32"
desc_option_win="Enable building windows bridge"
desc_option_linux32="Enable building linux32 bridge"
subpackages="Carla-devel"
if [ -z "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
x86_64)
build_options_default=" win linux32"
subpackages+=" Carla-bridge-win"
;;
i686)
build_options_default=" win"
subpackages+=" Carla-bridge-win"
;;
esac
fi
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" Carla-devel qt5-host-tools"
fi
if [ "$build_option_win" ]; then
case $XBPS_TARGET_MACHINE in
x86_64)
hostmakedepends+=" cross-x86_64-w64-mingw32 wine-tools"
makedepends+=" wine-devel"
;;
i686)
hostmakedepends+=" cross-i686-w64-mingw32 wine-tools"
makedepends+=" wine-devel"
;;
esac
fi
if [ "$build_option_linux32" ]; then
case $XBPS_TARGET_MACHINE in
x86_64)
makedepends+=" gcc-multilib freetype-devel-32bit libX11-devel-32bit"
;;
esac
fi
case $XBPS_TARGET_MACHINE in
x86_64* | i686*);;
*) make_build_args+=" NOOPT=true"
make_install_args+=" NOOPT=true";;
esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" Carla-devel"
fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel musl-fts-devel"
export LDFLAGS="-lfts"
@ -85,27 +45,6 @@ pre_build() {
make ${make_build_args} features
}
post_build() {
if [ "$build_option_win" ]; then
case $XBPS_TARGET_MACHINE in
x86_64)
CXXFLAGS="" CFLAGS="" LDFLAGS="" \
make ${makejobs} ${make_build_args} win64 CC="x86_64-w64-mingw32-gcc" CXX="x86_64-w64-mingw32-g++"
make ${make_build_args} wine64
;;
i686)
CXXFLAGS="" CFLAGS="" LDFLAGS="" \
make ${makejobs} ${make_build_args} win32 CC="i686-w64-mingw32-gcc" CXX="i686-w64-mingw32-g++"
make ${make_build_args} wine32
;;
esac
fi
if [ "$build_option_linux32" ]; then
make posix32
fi
}
post_install() {
vbin bin/carla-lv2-export
}
@ -118,27 +57,3 @@ Carla-devel_package() {
vmove usr/include
}
}
Carla-bridge-win_package() {
lib32mode=full
lib32symlinks="carla/carla-bridge-win32.exe
carla/carla-discovery-win32.exe
carla/jackbridge-wine32.dll
vst/carla.vst/carla-bridge-win32.exe
vst/carla.vst/carla-carla-win32.exe
vst/carla.vst/jackbridge-wine32.dll
lv2/carla.lv2/carla-bridge-win32.exe
lv2/carla.lv2/carla-carla-win32.exe
lv2/carla.lv2/jackbridge-wine32.dll"
depends="Carla>=${version} wine"
short_desc+=" - windows bridge"
pkg_install() {
vmove usr/lib/carla/*.exe
vmove usr/lib/carla/*.dll
vmove usr/lib/vst/carla.vst/*.exe
vmove usr/lib/vst/carla.vst/*.dll
vmove usr/lib/lv2/carla.lv2/*.exe
vmove usr/lib/lv2/carla.lv2/*.dll
}
}

View File

@ -1,17 +1,17 @@
# Template file for 'Clipboard'
pkgname=Clipboard
version=0.9.1
version=0.9.0.1
revision=1
build_style=cmake
hostmakedepends="pkg-config wayland-devel"
makedepends="alsa-lib-devel openssl-devel libX11-devel wayland-devel wayland-protocols"
makedepends="alsa-lib-devel libX11-devel wayland-devel wayland-protocols"
short_desc="Cut, copy, and paste anything, anywhere, all from the terminal"
maintainer="icp <pangolin@vivaldi.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/Slackadays/Clipboard"
changelog="https://github.com/Slackadays/Clipboard/releases"
distfiles="https://github.com/Slackadays/Clipboard/archive/refs/tags/${version}.tar.gz"
checksum=b59f7111c2de0369d80a379503ac056e33c59be34596d72cda600e4115002b60
checksum=187eba2a2c72d32d35ff750b947f1c812e33f9af538a6fc1b781e18a5e912d45
post_install() {
vcompletion documentation/completions/cb.fish fish cb

View File

@ -1,6 +1,6 @@
# Template file for 'GraphicsMagick'
pkgname=GraphicsMagick
version=1.3.45
version=1.3.43
revision=1
build_style=gnu-configure
configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@ -19,7 +19,7 @@ license="MIT"
homepage="http://www.graphicsmagick.org/"
changelog="https://sourceforge.net/p/graphicsmagick/code/ci/default/tree/NEWS.txt?format=raw"
distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.xz"
checksum=dcea5167414f7c805557de2d7a47a9b3147bcbf617b91f5f0f4afe5e6543026b
checksum=2b88580732cd7e409d9e22c6116238bef4ae06fcda11451bf33d259f9cbf399f
keep_libtool_archives=yes
post_install() {

View File

@ -1,9 +1,9 @@
# Template file for 'LuaJIT'
pkgname=LuaJIT
# the minor version is the contents of the .relver file in the source tarball
version=2.1.1731601260
version=2.1.1725453128
revision=1
_commit_hash=fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059
_commit_hash=87ae18af97fd4de790bb6c476b212e047689cc93
build_style=gnu-makefile
hostmakedepends="lua52-BitOp"
short_desc="Just-In-Time Compiler for Lua"
@ -11,7 +11,7 @@ maintainer="Daniel Martinez <danielmartinez@cock.li>"
license="MIT"
homepage="https://www.luajit.org"
distfiles="https://repo.or.cz/luajit-2.0.git/snapshot/${_commit_hash}.tar.gz"
checksum=1f12f67944431d2b54646404fc41f159c2c66c3f69cd6938de1195f17aa702da
checksum=c4ab3972a6d00d138caadab27ee53e646342e5d2f52adbffab6a916287b3fe57
build_options="lua52compat"
desc_option_lua52compat="higher compatibility with lua 5.2"

View File

@ -1,6 +1,6 @@
# Template file for 'MoarVM'
pkgname=MoarVM
version=2024.10
version=2024.07
revision=1
build_style=configure
configure_script="perl Configure.pl"
@ -15,7 +15,7 @@ license="Artistic-2.0"
homepage="https://moarvm.org"
changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
checksum=055cfeefa3ea081039b75b2a89f6ea063cb3a489643e3dc8db8497a9a02372c9
checksum=625241fe1578341f6099784f0ea82a62b8a638855c3b8fa604d6ce9e5024fe29
nocross=yes
shlib_provides="libmoar.so"

View File

@ -1,6 +1,6 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
version=1.50.0
version=1.48.10
revision=1
build_style=meson
build_helper="gir qemu"
@ -33,9 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-50/NEWS"
changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-48/NEWS"
distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz"
checksum=fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3
checksum=5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613
# TODO: Some tests require network namespaces to run.
make_check=extended
lib32disabled=yes

View File

@ -1,6 +1,6 @@
# Template file for 'OpenCL-Headers'
pkgname=OpenCL-Headers
version=2024.10.24
version=2024.05.08
revision=1
build_style=cmake
short_desc="Khronos OpenCL (Open Computing Language) header files"
@ -8,7 +8,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Apache-2.0"
homepage="https://github.com/KhronosGroup/OpenCL-Headers"
distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/v${version}.tar.gz"
checksum=159f2a550592bae49859fee83d372acd152328fdf95c0dcd8b9409f8fad5db93
checksum=3c3dd236d35f4960028f4f58ce8d963fb63f3d50251d1e9854b76f1caab9a309
provides="opencl-headers-${version}_${revision}"
replaces="opencl-headers>=0"

View File

@ -1,6 +1,6 @@
# Template file for 'OpenLP'
pkgname=OpenLP
version=3.1.4
version=3.1.3
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools qt5-host-tools"
@ -16,7 +16,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-3.0-or-later"
homepage="https://openlp.org/"
distfiles="https://gitlab.com/openlp/openlp/-/archive/${version}/openlp-${version}.tar.gz"
checksum=4091b84307f4ea93d28215b5ef4d8442bf9346938c1e7ba6f377e47267a6094c
checksum=377989f3ffdd225bf285ddb60a88ef4af5903798da58e6c2ec74431246e083c3
make_check_pre="env -u QT_QPA_PLATFORM xvfb-run"
post_install() {

View File

@ -2,12 +2,12 @@
# 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.16
version=0.4.15
revision=1
# versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt
_objects_version=1.4.10
_objects_version=1.4.8
_titles_version=0.4.14
_replays_version=0.0.83
_replays_version=0.0.80
_opensfx_version=1.0.5
_openmsx_version=1.6
build_style=cmake
@ -40,11 +40,11 @@ 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="798b2f37577060d62497a0260dcabf446d06fb11deeb255d0478af37b9dc176e
186a05c91b9a6c328ad0994454033434fe864a8606c1d126485f7469a8e5539c
checksum="f25671e29316fdcd4065e5c029a87e4beb61a3672115c1762ed6b70b5f1ff5a4
ea78872f9f777fb6b27019e4b880e4cb9766658ee8ae95f76985af0b9658eb4d
a952148be164c128e4fd3aea96822e5f051edd9a0b1f2c84de7f7628ce3b2e18
f097d3a4ccd39f7546f97db3ecb1b8be73648f53b7a7595b86cccbdc1a7557e4
c0b3e33874e43d963b780bcae3eb19ce902364c861e47f1be025248251beb5ed
de47bc8b19f9b1921177c5e04ab90bd85a2460821020fb6375de3c1795a0af5d
140df714e806fed411cc49763e7f16b0fcf2a487a57001d1e50fce8f9148a9f3"
skip_extraction="objects-${_objects_version}.zip
opensound-${_opensfx_version}.zip

View File

@ -6,9 +6,5 @@
: ${PORT:=8001}
exec 2>&1
[ ! -d /var/cache/popcorn ] && mkdir -p /var/cache/popcorn
chown _popcorn:_popcorn /var/cache/popcorn
exec chpst -u _popcorn:_popcorn snooze -s 1d -t /var/cache/popcorn/snooze -- sh -c \
"popcorn --server $SERVER --port $PORT; touch /var/cache/popcorn/snooze"
chpst -u _popcorn:_popcorn popcorn --server $SERVER --port $PORT
exec chpst -u _popcorn:_popcorn snooze popcorn --server $SERVER --port $PORT

View File

@ -1,7 +1,7 @@
# Template file for 'PopCorn'
pkgname=PopCorn
version=0.4
revision=12
revision=11
build_style=go
go_import_path=github.com/the-maldridge/popcorn
go_package="${go_import_path}/cmd/popcorn

View File

@ -1,6 +1,6 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=9.1
version=9.0
revision=1
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
@ -12,7 +12,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="GPL-3.0-only"
homepage="https://prismlauncher.org/"
distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
checksum=0aac56ec6b039e28f0605e7d86ebf602ee28dd9e4c7a16915ca974104954e832
checksum=8c3dae2469c70d460cd8e2747dc4e61c2e31c15f0754d9e41e23563ac544e2be
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=0"
@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
esac
pre_configure() {
local _date
if [ "$SOURCE_DATE_EPOCH" ]; then
_date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")"
configure_args+=" -DLauncher_BUILD_TIMESTAMP=${_date}"
fi
. /etc/profile.d/jdk.sh
}

View File

@ -1,6 +1,6 @@
# Template file for 'SFML'
pkgname=SFML
version=2.6.2
version=2.6.1
revision=1
build_style=cmake
configure_args="-DSFML_BUILD_EXAMPLES=0 -DSFML_BUILD_DOC=1 -DSFML_INSTALL_PKGCONFIG_FILES=1"
@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Zlib"
homepage="http://www.sfml-dev.org/"
distfiles="https://github.com/SFML/SFML/archive/${version}.tar.gz"
checksum=15ff4d608a018f287c6a885db0a2da86ea389e516d2323629e4d4407a7ce047f
checksum=82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d
post_install() {
rm -f ${DESTDIR}/usr/sfml-*.pc

View File

@ -1 +0,0 @@
SPIRV-LLVM-Translator19

View File

@ -1,37 +0,0 @@
# Template file for 'SPIRV-LLVM-Translator19'
pkgname=SPIRV-LLVM-Translator19
version=19.1.1
revision=1
_llvm_ver=${version%%.*}
build_style=cmake
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
-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr/lib/llvm/${_llvm_ver}
"
hostmakedepends="clang${_llvm_ver} llvm${_llvm_ver} pkg-config"
makedepends="llvm${_llvm_ver}-devel SPIRV-Headers SPIRV-Tools-devel"
short_desc="API and commands for processing SPIR-V modules - LLVM ${_llvm_ver}"
maintainer="Daniel Martinez <danielmartinez@cock.li>"
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=7f6f7a1af0eb40910ddf3a7647d2186c8c5dc5a47945afa935aeec56bacf4336
alternatives="llvm-spirv:llvm-spirv:/usr/bin/llvm-spirv-${_llvm_ver}"
post_install() {
mv ${DESTDIR}/usr/bin/llvm-spirv ${DESTDIR}/usr/bin/llvm-spirv-${_llvm_ver}
vlicense LICENSE.TXT
}
SPIRV-LLVM-Translator19-devel_package() {
depends="SPIRV-LLVM-Translator${_llvm_ver}-${version}_${revision}"
conflicts="SPIRV-LLVM-Translator-devel>=0"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}

View File

@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
version=7.32.0
version=7.28.0
revision=1
# Signal officially only supports x86_64
# x86_64-musl could potentially work based on the Alpine port:
@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
checksum=e6d51ff1b90bd39090057cdee56476e074e8708e021294cd5ed6b865cb5e3c4a
checksum=2d0d1f6bac0a12555b17ff9f6b97d874774fbe8c5bd28d8da629b2a13c7f9d37
nostrip_files="signal-desktop"
post_extract() {

View File

@ -1,6 +1,6 @@
# Template file for 'SuiteSparse'
pkgname=SuiteSparse
version=7.8.3
version=7.8.1
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=ce39b28d4038a09c14f21e02c664401be73c0cb96a9198418d6a98a7db73a259
checksum=b645488ec0d9b02ebdbf27d9ae307f705de2b6133edb64617a72c7b4c6c3ff44
build_options="openblas"

View File

@ -1,6 +1,6 @@
# Template file for 'Swapspace'
pkgname=Swapspace
version=1.18.1
version=1.18
revision=1
build_style=gnu-configure
hostmakedepends="autoconf automake"
@ -10,7 +10,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/Tookmund/swapspace"
changelog="https://raw.githubusercontent.com/Tookmund/Swapspace/master/NEWS"
distfiles="https://github.com/Tookmund/Swapspace/archive/v${version}/${version}.tar.gz"
checksum=8684861e603b68e261605332ae26bfd54bec4f50bea109c0597ae2e25460e32c
checksum=4efbf0815c3e3f85e907a693ab5e74ae99f0041a3bb41358c68c2d4ac370fec2
conf_files="/etc/swapspace.conf"
make_dirs="/var/lib/swapspace 0700 root root"

View File

@ -1,17 +1,14 @@
# Template file for 'Thunar'
pkgname=Thunar
version=4.18.11
revision=2
revision=1
build_style=gnu-configure
build_helper="gir"
configure_args="--enable-gio-unix --enable-gudev
--enable-exif --disable-static --enable-notifications
--enable-exif --enable-pcre --disable-static --enable-notifications
--with-locales-dir=/usr/share/locale"
hostmakedepends="pkg-config intltool glib-devel"
makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel
xfce4-panel-devel libSM-devel libICE-devel libX11-devel cairo-devel
pcre2-devel pango-devel atk-devel gdk-pixbuf-devel libxfce4ui-devel
libglib-devel gtk+3-devel"
makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Thunar File Manager"
maintainer="Orphaned <orphan@voidlinux.org>"

View File

@ -1,7 +1,7 @@
# Template file for 'aerc'
pkgname=aerc
version=0.18.2
revision=1
version=0.17.0
revision=2
build_style=go
go_import_path="git.sr.ht/~rjarry/aerc"
go_build_tags=notmuch
@ -14,14 +14,10 @@ license="MIT"
homepage="https://aerc-mail.org"
changelog="https://git.sr.ht/~rjarry/aerc/blob/master/CHANGELOG.md"
distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
checksum=78408b3fe7a4991a6097c961c348fb7583af52dff80cbfcd99808415cf3d7586
checksum=a8a1af36b4d4989afd670601d83fc2088e14d804c66bd1e3bdd14561bd89c2cc
ignore_elf_dirs="/usr/share/aerc/filters"
post_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
vlicense LICENSE
}
do_check() {
make ${makejobs} tests
}

View File

@ -1,6 +1,6 @@
# Template file for 'alacritty'
pkgname=alacritty
version=0.14.0
version=0.13.2
revision=1
build_style=cargo
make_install_args="--path alacritty"
@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://github.com/alacritty/alacritty"
changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
distfiles="https://github.com/alacritty/alacritty/archive/refs/tags/v${version}.tar.gz"
checksum=2919767177c010339502085b4ac5d3f9f15ca27e6befc39aa9d20fefb93ebcdf
checksum=e9a54aabc92bbdc25ab1659c2e5a1e9b76f27d101342c8219cc98a730fd46d90
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;

View File

@ -1,6 +1,6 @@
# Template file for 'amberol'
pkgname=amberol
version=2024.2
version=2024.1
revision=1
build_style=meson
build_helper=rust
@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/amberol"
changelog="https://gitlab.gnome.org/World/amberol/-/raw/main/CHANGES.md"
distfiles="https://gitlab.gnome.org/World/amberol/-/archive/${version}/${pkgname}-${version}.tar.gz"
checksum=93b1ef0c2ec5711aa5e170a4a0c81d62f97f6a92c0a74a011955be7022e7e555
checksum=2be110f5a5781fc4d11abf8686335e055866ce6df40562ed5eabab16916faceb
post_patch() {
if [ "$CROSS_BUILD" ]; then

View File

@ -1,6 +1,6 @@
# Template file for 'ansible-core'
pkgname=ansible-core
version=2.17.5
version=2.17.4
revision=1
hostmakedepends="python3-setuptools python3-wheel python3-packaging
python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*}/changelogs/CHANGELOG-v${version%.*}.rst"
distfiles="${PYPI_SITE}/a/ansible-core/ansible_core-${version}.tar.gz"
checksum=ae7f51fd13dc9d57c9bcd43ef23f9c255ca8f18f4b5c0011a4f9b724d92c5a8e
checksum=44a1f30076796536ba2455cad18d36e62870f04e632e3ca2ebe970d7beacf24d
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"

View File

@ -1,6 +1,6 @@
# Template file for 'ansible'
pkgname=ansible
version=10.5.0
version=10.4.0
revision=1
build_style="python3-pep517"
hostmakedepends="python3-setuptools python3-wheel"
@ -10,6 +10,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
checksum=ba2045031a7d60c203b6e5fe1f8eaddd53ae076f7ada910e636494384135face
checksum=5c12048831a6690fc865dfe03dc8ab61c3ba08b5d01b249a16b247ad99a60bc0
# Relevant tests happen in ansible-core
make_check=no

View File

@ -1,6 +1,6 @@
# Template file for 'apk-tools'
pkgname=apk-tools
version=2.14.5
version=2.14.4
revision=1
build_style=gnu-makefile
# Link libapk statically
@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://git.alpinelinux.org/apk-tools"
distfiles="https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v${version}/apk-tools-v${version}.tar.gz"
checksum=f61b45fc514b7b1e15817bdbb982a08ea235407f87acbb426529265fc0d02b5c
checksum=c8ad16bddfae988392ad067a244cfdaf643eb7d6761b73450739585ca76f9a25
CFLAGS="-Wno-error"
post_build() {

View File

@ -1,7 +1,7 @@
# Template file for 'arduino-cli'
pkgname=arduino-cli
version=1.1.0
revision=1
version=1.0.4
revision=2
build_style=go
build_helper="qemu"
go_import_path=github.com/arduino/arduino-cli
@ -11,9 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
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=35681850bed6af2379d1cd40cfda6064ee24e4933eeb1cfc1df47d5b0f8ed70f
# Tests do not find executable in build environment
make_check=no
checksum=9eae425e2629fb8cea2591b87b0a0cb7a8e305bcf3f90c7c121be674d70eca0c
case "$XBPS_TARGET_MACHINE" in
# the downloaded toolchains use glibc, this allows them to work on musl

View File

@ -1,14 +1,14 @@
# Template file for 'ascii'
pkgname=ascii
version=3.30
version=3.20
revision=1
short_desc="List ASCII idiomatic names and octal/decimal code-point forms"
maintainer="Eloitor <eloitor@duck.com>"
maintainer="Eloitor <eloitor@disroot.org>"
license="BSD-2-Clause"
homepage="http://www.catb.org/~esr/ascii"
changelog="https://www.catb.org/~esr/ascii/NEWS.html"
distfiles="http://www.catb.org/~esr/ascii/ascii-${version}.tar.gz"
checksum=ed2fdc973e1b87da2af83050e560e731b0f3bf5f6b4fd9babc9f60bb2b992443
checksum=9e6e57ea60d419a803a024ce6366254efb716266b84eedd58cd980dabcc11674
do_build() {
make CC="${CC}" CFLAGS="${CFLAGS} ${LDFLAGS}"

View File

@ -1,18 +1,18 @@
# Template file for 'ast-grep'
pkgname=ast-grep
version=0.29.0
version=0.27.3
revision=1
build_style=cargo
make_check_args="-- --skip=test_unmatching_id skip=test_merge_with_globs"
make_install_args="--bin=ast-grep --path=."
short_desc="Fast and polyglot tool for code searching, linting, and rewriting"
maintainer="icp <pangolin@vivaldi.net>"
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=6e6d56b42a4eabf479104d7eee73aeee2743c3e9e1debd860e73127b6fcad09f
checksum=e93c52271342a235910539b9b821086599564cacb6aa6651b94806a8a65e5003
do_install() {
vbin target/${RUST_TARGET}/release/ast-grep
post_install() {
vlicense LICENSE
}

View File

@ -1,7 +1,7 @@
# Template file for 'audacious-base'
# Keep in sync with audacious and audacious-plugins
pkgname=audacious-base
version=4.4.2
version=4.4.1
revision=1
build_style=meson
configure_args="$(vopt_bool gtk) $(vopt_bool qt) -Dlibarchive=true -Dbuildstamp=xbps"
@ -14,7 +14,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="BSD-2-Clause"
homepage="https://audacious-media-player.org/"
distfiles="https://github.com/audacious-media-player/audacious/archive/refs/tags/audacious-${version}.tar.gz"
checksum=030acbf2b58e403d9737f0cda90aa4ce475a7beb0961404c69b6e03ce6a7b008
checksum=5198ae8f3a4ba34e63276683227fe831eee79fb926bbe6ff1f3bdd51494e66fc
build_options="gtk qt"
build_options_default="qt"

View File

@ -1,7 +1,7 @@
# Template file for 'audacious-plugins'
# Keep in sync with audacious and audacious-base
pkgname=audacious-plugins
version=4.4.2
version=4.4.1
revision=1
build_style=meson
configure_args="$(vopt_bool gtk) $(vopt_bool qt)"
@ -17,7 +17,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="BSD-2-Clause"
homepage="https://audacious-media-player.org/"
distfiles="https://github.com/audacious-media-player/audacious-plugins/archive/refs/tags/audacious-plugins-${version}.tar.gz"
checksum=0825b1e3ac1465c7a012bcb4c629a3390c8c22ebf3d207c6e8db056429e4ffa4
checksum=2d7fb3c7753a9224c66633de5c85bfe35fe292897ececfd67cc6d3cb8917b773
build_options="gtk qt"
build_options_default="qt"

View File

@ -1,7 +1,7 @@
# Template file for 'audacious'
# Keep in sync with audacious-base and audacious-plugins
pkgname=audacious
version=4.4.2
version=4.4.1
revision=1
build_style=meta
depends="audacious-base>=${version}_1 audacious-plugins>=${version}_1"

View File

@ -1,7 +1,7 @@
# Template file for 'axel'
pkgname=axel
version=2.17.14
revision=1
version=2.17.11
revision=2
build_style=gnu-configure
conf_files="/etc/axelrc"
hostmakedepends="gettext-devel pkg-config"
@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/axel-download-accelerator/axel"
changelog="https://raw.githubusercontent.com/axel-download-accelerator/axel/master/ChangeLog"
distfiles="https://github.com/axel-download-accelerator/axel/releases/download/v${version}/axel-${version}.tar.xz"
checksum=938ee7c8c478bf6fcc82359bbf9576f298033e8b13908e53e3ea9c45c1443693
checksum=580b2c18692482fd7f1e2b2819159484311ffc50f6d18924dceb80fd41d4ccf9
make_check=no # has no tests
post_install() {

View File

@ -1,6 +1,6 @@
# Template file for 'azote'
pkgname=azote
version=1.13.1
version=1.13.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@ -8,11 +8,11 @@ depends="gtk+3 libayatana-appindicator python3 python3-cairo python3-gobject
python3-Pillow python3-send2trash python3-yaml"
short_desc="Wallpaper & color manager for Sway, i3 and other WMs"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="BSD-3-Clause AND GPL-3.0-or-later"
license="BSD-3-Clause, GPL-3.0-or-later"
homepage="https://github.com/nwg-piotr/azote"
changelog="https://github.com/nwg-piotr/azote/releases"
distfiles="https://github.com/nwg-piotr/azote/archive/refs/tags/${version}.tar.gz"
checksum=5902e13463d3ef60e17c81346fee106dcc61e921fa83602d434eab7e67406e08
distfiles="https://github.com/nwg-piotr/azote/archive/refs/tags/v${version}.tar.gz"
checksum=f13fbf3d7051b39e1c6d27dc3a6a46b5ad1f2292e32f431ace1c5b3b3d619ec4
make_check=no # no tests provided
post_install() {

View File

@ -1,6 +1,6 @@
# Template file for 'backblaze-b2'
pkgname=backblaze-b2
version=4.2.0
version=4.1.0
revision=1
build_style=python3-pep517
hostmakedepends="python3 python3-build python3-packaging python3-pdm-backend python3-pip python3-setuptools_scm python3-wheel"
@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/Backblaze/B2_Command_Line_Tool"
distfiles="${PYPI_SITE}/b/b2/b2-${version}.tar.gz"
checksum=b9be2cb1c6e52c1cee948af265619d049bac62e4970de29a3cc01bff625c9539
checksum=d452506b8e2932fc348eec53166b7694b449e2bbc26750dacf74bad4f4ea980a
replaces="python-b2>=0"
make_check=no # tests require unpackaged dependencies

View File

@ -1,6 +1,6 @@
# Template file for 'backintime'
pkgname=backintime
version=1.5.3
version=1.4.3
revision=1
configure_args="--python3"
pycompile_dirs="/usr/share/backintime"
@ -11,7 +11,7 @@ maintainer="Alpicoid <alpicoid@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://github.com/bit-team/backintime"
distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
checksum=2adf4f2d3b2c95b43f1bc7184c034bc3fa2387b7b94099018770316d979b1534
checksum=68874587883f33b2a8fec5c00cb446034a3110e9198339fc9152543951790776
python_version=3
do_configure() {
@ -38,8 +38,7 @@ do_install() {
backintime-qt_package() {
short_desc+=" - Qt GUI"
depends="backintime-${version}_${revision}
python3-pyqt6 python3-pyqt6-dbus python3-packaging xdpyinfo
python3-pyqt6-gui python3-pyqt6-widgets"
python3-PyQt5 python3-PyQt5-dbus python3-packaging libnotify xdpyinfo"
pkg_install() {
vmove "usr/bin/backintime-qt*"
vmove usr/share/applications

View File

@ -1,6 +1,6 @@
# Template file for 'bc-java'
pkgname=bc-java
version=1.79
version=1.78
revision=1
hostmakedepends="apache-ant openjdk17"
depends="virtual?java-runtime"
@ -10,7 +10,7 @@ license="MIT"
homepage="https://www.bouncycastle.org/java.html"
changelog="https://www.bouncycastle.org/releasenotes.html"
distfiles="https://github.com/bcgit/bc-java/archive/refs/tags/r${version/./rv}.tar.gz"
checksum=d9da71f958e1779a396407a24e607036a19e5c482d385cadfe0455e21ac35055
checksum=6eb33f05248aa74a7927435d364c5fbeb3f3885e476f36e1ee36ff58f4db49e4
do_build() {
. /etc/profile.d/jdk.sh
@ -18,7 +18,7 @@ do_build() {
}
do_install() {
vinstall build/artifacts/jdk1.8/jars/bcprov-jdk18on-${version}.jar 644 /usr/lib/bc-java
ln -s bcprov-jdk18on-${version}.jar "${DESTDIR}"/usr/lib/bc-java/bcprov.jar
vinstall build/artifacts/jdk1.8/jars/bcprov-jdk18on-${version/./}.jar 644 /usr/lib/bc-java
ln -s bcprov-jdk18on-${version/./}.jar "${DESTDIR}"/usr/lib/bc-java/bcprov.jar
vlicense LICENSE.html
}

View File

@ -1,27 +1,10 @@
diff --git a/betterlockscreen b/betterlockscreen
index 0b92ad9..fdd7b60 100755
--- a/betterlockscreen
+++ b/betterlockscreen
@@ -20,7 +20,7 @@ init_config () {
description=""
quiet=false
i3lockcolor_bin="i3lock-color"
- suspend_command="systemctl suspend"
+ suspend_command="loginctl suspend"
convert_command="magick"
composite_command="magick composite"
diff --git a/examples/betterlockscreenrc b/examples/betterlockscreenrc
index 84e355c..ed69e66 100644
--- a/examples/betterlockscreenrc
+++ b/examples/betterlockscreenrc
@@ -43,7 +43,7 @@ bgcolor=000000ff
#
# i3lockcolor_bin="i3lock-color" # Manually set command for i3lock-color
-# suspend_command="systemctl suspend" # Manually change action e.g. hibernate/suspend-command
+# suspend_command="loginctl suspend" # Manually change action e.g. hibernate/suspend-command
# i3lock-color - custom arguments
# lockargs=() # overwriting default "(-n)"
@@ -968,6 +968,6 @@ echof header "Betterlockscreen"
# Activate lockscreen
[[ $runsuspend ]] || lockargs+=(-n)
[[ $runlock ]] && lockselect "$lockstyle" && \
- { [[ $runsuspend ]] && systemctl suspend; }
+ { [[ $runsuspend ]] && loginctl suspend; }
exit 0

View File

@ -1,6 +1,6 @@
# Template file for 'betterlockscreen'
pkgname=betterlockscreen
version=4.4.0
version=4.0.4
revision=1
depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb xset"
short_desc="Sweet looking lockscreen for linux system"
@ -8,7 +8,7 @@ maintainer="Aleksander Zien <Aleks@nderZien.com>"
license="MIT"
homepage="https://github.com/pavanjadhaw/betterlockscreen"
distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${version}.tar.gz"
checksum=fdcf58725f0ab56e98ce9b83bd1dad6e1f08c7f9f230c3abaf4191f10ebd5dfd
checksum=608b56989eea0b45c0f88bdc9e3c7742430f809a1bcd60d558eb6af99aeecc91
do_install() {
vbin betterlockscreen

View File

@ -1,6 +1,6 @@
# Template file for 'binwalk'
pkgname=binwalk
version=2.4.3
version=2.4.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://github.com/OSPG/binwalk"
distfiles="https://github.com/OSPG/binwalk/archive/v${version}.tar.gz"
checksum=1b48aa2167dda6b434d6c98bdfbf513358ed65ca10d5e5dd90893718cabcdfab
checksum=36b11a4d245bce9663c2c17085282eb1012716c9f0f6754497126b1ad25cd4e7
post_extract() {
vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py

View File

@ -1,6 +1,6 @@
# Template file for 'black'
pkgname=black
version=24.10.0
version=24.8.0
revision=1
build_style=python3-pep517
hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme"
@ -14,7 +14,7 @@ license="MIT"
homepage="https://black.readthedocs.io/en/stable/"
changelog="https://raw.githubusercontent.com/psf/black/main/CHANGES.md"
distfiles="${PYPI_SITE}/b/black/black-${version}.tar.gz"
checksum=846ea64c97afe3bc677b761787993be4991810ecc7a4a937816dd6bddedc4875
checksum=2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f
post_check() {
PYTHONPATH=src python3 -m black --check src tests

View File

@ -0,0 +1,13 @@
diff --git a/bleachbit/__init__.py b/bleachbit/__init__.py
index 3cf173bd..e9c9a27a 100644
--- a/bleachbit/__init__.py
+++ b/bleachbit/__init__.py
@@ -30,7 +30,7 @@ import sys
import platform
from bleachbit import Log
-from configparser import RawConfigParser, NoOptionError, SafeConfigParser
+from configparser import RawConfigParser, NoOptionError
APP_VERSION = "4.4.2"
APP_NAME = "BleachBit"

View File

@ -1,7 +1,7 @@
# Template file for 'bleachbit'
pkgname=bleachbit
version=4.6.2
revision=1
version=4.4.2
revision=2
build_style=gnu-makefile
hostmakedepends="python3 gettext desktop-file-utils"
depends="gtk+3 python3-gobject python3-scandir python3-chardet"
@ -10,5 +10,5 @@ maintainer="graysky <graysky@archlinux.us>"
license="GPL-3.0-or-later"
homepage="https://www.bleachbit.org/"
distfiles="https://github.com/bleachbit/bleachbit/archive/v${version}.tar.gz"
checksum=fbdf7c9f7e8aac5c8720a27c6fac934f4ea9e68f1047e772d94414a2a5e51952
checksum=6001c864688e36bd8f950c1341923c9347c2373149a9ce98dc26c39023b51997
python_version=3

View File

@ -1,7 +1,7 @@
# Template file for 'bluefish'
pkgname=bluefish
version=2.2.16
revision=1
version=2.2.12
revision=5
build_style=gnu-configure
configure_args="--enable-spell-check --disable-update-databases
--disable-xml-catalog-update $(vopt_enable python)"
@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://bluefish.openoffice.nl/"
distfiles="https://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
checksum=14e6476fcee8fa326f7f63f1f693d252195f9dcb16af0fe3c915c499baf5dd74
checksum=0df9905ba2c601cd767fa53e147969e9c90bc0cc4c005c4011c150b248979e6a
python_version=3
lib32disabled=yes
xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"

View File

@ -1,24 +0,0 @@
From 1d5a2ec8eb96e9186aeb2826927057ddc7a9d0a6 Mon Sep 17 00:00:00 2001
From: macmpi <16296055+macmpi@users.noreply.github.com>
Date: Wed, 17 Jan 2024 09:34:28 +0100
Subject: [PATCH] disable test_aics_unit_testcases
fails on x86-64
https://github.com/bluez/bluez/issues/726
---
unit/test-vcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unit/test-vcp.c b/unit/test-vcp.c
index 6a61ea2c44..3886177758 100644
--- a/unit/test-vcp.c
+++ b/unit/test-vcp.c
@@ -2754,7 +2754,7 @@ int main(int argc, char *argv[])
tester_init(&argc, &argv);
test_vocs_unit_testcases();
- test_aics_unit_testcases();
+// test_aics_unit_testcases(); test fails on x86-64
return tester_run();
}

View File

@ -1,6 +1,6 @@
# Template file for 'bluez'
pkgname=bluez
version=5.78
version=5.76
revision=1
build_style=gnu-configure
configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://www.bluez.org/"
changelog="https://git.kernel.org/pub/scm/bluetooth/bluez.git/plain/ChangeLog"
distfiles="${KERNEL_SITE}/bluetooth/bluez-${version}.tar.xz"
checksum=830fed1915c5d375b8de0f5e6f45fcdea0dcc5ff5ffb3d31db6ed0f00d73c5e3
checksum=55e2c645909ad82d833c42ce85ec20434e0ef0070941b1eab73facdd240bbd63
conf_files="/etc/bluetooth/main.conf"
system_groups="bluetooth"
@ -44,8 +44,6 @@ post_install() {
vsv bluetoothd
vdoc ${FILESDIR}/README.voidlinux
rm ${DESTDIR}/etc/bluetooth/mesh-main.conf
}
libbluetooth_package() {

View File

@ -1,6 +1,6 @@
# Template file for 'borgmatic'
pkgname=borgmatic
version=1.9.1
version=1.8.14
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
homepage="https://torsion.org/borgmatic/"
changelog="https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/NEWS"
distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz"
checksum=d2f0bae2c2050040e5e07a825e605f195cbe9974862b290238c48f72fc04e79a
checksum=598b3bc22c19d53bd375e5295afec56d111759f74671845aacfe055c539fa746

View File

@ -1,6 +1,6 @@
# Template file for 'bovo'
pkgname=bovo
version=24.08.3
version=24.08.2
revision=1
build_style=cmake
configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake"
@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://apps.kde.org/bovo"
changelog="https://invent.kde.org/games/bovo/-/raw/master/HISTORY"
distfiles="${KDE_SITE}/release-service/${version}/src/bovo-${version}.tar.xz"
checksum=e31ebe29cd4d4560a771ff2d6fa3687d72207b5050bf8020cdbb2bab46c6ece7
checksum=91b024ef4bfdb97c70637236870492d4ac425d48c81f5b886a765ec446c7c7ab

View File

@ -1,6 +1,6 @@
# Template file for 'bpfmon'
pkgname=bpfmon
version=2.53
version=2.52
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/bbonev/bpfmon"
changelog="https://github.com/bbonev/bpfmon/releases"
distfiles="https://github.com/bbonev/bpfmon/releases/download/v${version}/bpfmon-${version}.tar.xz"
checksum=f73508a40b093caea8ac20431c19b1e89627311bbd8ff49063ec987378a46a7c
checksum=e4e882c6d998b8adb04e1372d4f7a3342fede472770ab3aa9bf6ebd5b848c5e7
post_extract() {
vsed -e 's;$(PREFIX)/sbin;$(PREFIX)/bin;g' -i Makefile

View File

@ -1,6 +1,6 @@
# Template file for 'breeze-icons'
pkgname=breeze-icons
version=6.7.0
version=6.6.0
revision=1
build_style=cmake
build_helper=qemu
@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-3.0-or-later"
homepage="https://community.kde.org/Frameworks"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=39037e3fcbbb7a65011685c498cae31ff496a5f2493269c955bb29c94a688b74
checksum=2d8ccc427ec864b6417eabe3aafe9b1f6857bf2a4fdcd0dc5c006413148e66d9
nostrip=yes
if [ -z "$CROSS_BUILD" ]; then

View File

@ -1,6 +1,6 @@
# Template file for 'broot'
pkgname=broot
version=1.44.2
version=1.43.0
revision=1
build_style=cargo
hostmakedepends="pkg-config"
@ -11,7 +11,7 @@ license="MIT"
homepage="https://dystroy.org/broot/"
changelog="https://raw.githubusercontent.com/Canop/broot/main/CHANGELOG.md"
distfiles="https://github.com/Canop/broot/archive/refs/tags/v${version}.tar.gz"
checksum=e1b78354c21680914a07ed4b856257c83ef873b878ef281bd2d1aed7fcba3828
checksum=64e1b4e2c57373b85ef358241655739f5bb8dedd6600ce0347a6b40640614326
if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
broken="exr crate errors on big endian"

View File

@ -1,6 +1,6 @@
# Template file for 'bubblewrap'
pkgname=bubblewrap
version=0.11.0
version=0.10.0
revision=1
build_style=meson
hostmakedepends="libxslt docbook-xsl pkg-config"
@ -11,4 +11,4 @@ license="LGPL-2.0-or-later"
homepage="https://github.com/containers/bubblewrap"
changelog="https://github.com/containers/bubblewrap/releases"
distfiles="https://github.com/containers/bubblewrap/releases/download/v${version}/bubblewrap-${version}.tar.xz"
checksum=988fd6b232dafa04b8b8198723efeaccdb3c6aa9c1c7936219d5791a8b7a8646
checksum=65d92cf44a63a51e1b7771f70c05013dce5bd6b0b2841c4b4be54b0c45565471

View File

@ -1,18 +1,17 @@
# Template file for 'bup'
pkgname=bup
version=0.33.4
revision=1
version=0.33
revision=2
build_style=configure
hostmakedepends="pkg-config python3 perl git pandoc"
makedepends="python3-devel readline-devel acl-devel"
depends="python3-pyxattr python3-fuse par2cmdline"
checkdepends="python3-pytest tar rsync mdocml"
hostmakedepends="python3 perl git pandoc"
makedepends="python3-devel"
checkdepends="python3-pytest tar rsync"
short_desc="Backup system based on the git packfile format"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-only"
homepage="https://github.com/bup/bup"
distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
checksum=f51284f2cb24aa653288f05aad32d6ec6ebb9546143ed7c588d40ba82f24b79a
checksum=2c21b25ab0ab845e1490cf20781bdb46e93b9c06f0c6df4ace760afc07a63fe9
python_version=3
nocross=yes

View File

@ -1,6 +1,6 @@
# Template file for 'c-ares'
pkgname=c-ares
version=1.34.3
version=1.34.2
revision=1
build_style=gnu-configure
checkdepends="iana-etc"
@ -10,7 +10,7 @@ license="MIT"
homepage="https://c-ares.org/"
changelog="https://c-ares.org/changelog.html"
distfiles="https://github.com/c-ares/c-ares/releases/download/v${version}/c-ares-${version}.tar.gz"
checksum=26e1f7771da23e42a18fdf1e58912a396629e53a2ac71b130af93bbcfb90adbe
checksum=35410aa625cc9ee95b66475f54aea7c81c673fb63d75fad5eee267711503b72a
make_check=ci-skip # segfaults only on CI
post_install() {

View File

@ -1,18 +1,22 @@
# Template file for 'cage'
pkgname=cage
version=0.2.0
version=0.1.5
revision=1
build_style=meson
configure_args="$(vopt_bool xwayland xwayland)"
hostmakedepends="pkg-config wayland-devel scdoc"
makedepends="wlroots0.18-devel"
depends="xorg-server-xwayland"
makedepends="wlroots0.16-devel"
depends="$(vopt_if xwayland xorg-server-xwayland)"
short_desc="Kiosk compositor for Wayland"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.hjdskes.nl/projects/cage/"
changelog="https://github.com/cage-kiosk/cage/releases"
distfiles="https://github.com/cage-kiosk/cage/archive/refs/tags/v${version}.tar.gz"
checksum=9d3f659e0f19636a958f9e1bf4d22268d7e2705d7e2989888401ec443c1cb6c3
checksum=576b8b5a041712b8d8785243ac6db08c7bc9c32822f96ad6dec7ac2b2db9b2b5
build_options="xwayland"
build_options_default="xwayland"
desc_option_xwayland="Enable Xwayland support in cage"
post_install() {
vlicense LICENSE

View File

@ -1,6 +1,6 @@
# Template file for 'calibre'
pkgname=calibre
version=7.20.0
version=7.16.0
revision=1
build_helper=python3
pycompile_dirs="/usr/lib/calibre/"
@ -16,8 +16,7 @@ makedepends="libinput-devel libmagick-devel libmtp-devel libstemmer-devel
sqlite-devel tslib-devel hunspell-devel hyphen-devel libstemmer-devel
python3-pyqt6-gui python3-pyqt6-svg python3-pyqt6-widgets python3-pyqt6-network
python3-pyqt6-printsupport python3-pyqt6-webengine python3-pyqt6-webchannel
qt6-base-private-devel python3-pyqt6-bindings python3-pyqt6-webengine-devel
ffmpeg6-devel"
qt6-base-private-devel python3-pyqt6-bindings python3-pyqt6-webengine-devel"
depends="desktop-file-utils optipng poppler python3-BeautifulSoup4
qt6-imageformats python3-Pygments python3-pycryptodome python3-xxhash
python3-Markdown python3-Pillow python3-zeroconf python3-Pygments python3-apsw
@ -29,8 +28,7 @@ depends="desktop-file-utils optipng poppler python3-BeautifulSoup4
python3-pyqt6-network python3-pyqt6-dbus python3-pyqt6-opengl-widgets
python3-pyqt6-widgets python3-pyqt6-gui python3-pyqt6-declarative
python3-pyqt6-printsupport python3-pyqt6-webchannel python3-pyqt6-svg
python3-pyqt6-pdf python3-pyqt6-webengine python3-fonttools
python3-pyqt6-speech python3-pyqt6-multimedia"
python3-pyqt6-pdf python3-pyqt6-webengine python3-fonttools"
checkdepends="${depends} libjpeg-turbo-tools jxrlib"
short_desc="Ebook management application"
maintainer="skmpz <dem.procopiou@gmail.com>"
@ -38,7 +36,7 @@ license="GPL-3.0-only"
homepage="https://calibre-ebook.com"
changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
checksum=06124426c40a93f909c72726ff599bb65ad269e1503ef586181f4350c89d8082
checksum=11641f6a84f03bd05d65080942bc5f8fa6fcb66b6e92f956e61168fd44a33615
python_version=3
lib32disabled=yes
nocross="python3 setup.py gui"
@ -183,15 +181,11 @@ do_check() {
# unrar test fails because python3-unrardll isn't packaged
# searching test case fails (non-deterministic)
# test_dom_load case fails
# test_recipe_browser_webengine case fails on ci
# test_piper not packaged
python3 setup.py test \
--exclude-test-name unrar \
--exclude-test-name qt \
--exclude-test-name searching \
--exclude-test-name test_dom_load \
--exclude-test-name test_recipe_browser_webengine \
--exclude-test-name test_piper
--exclude-test-name test_dom_load
}
do_install() {

View File

@ -1,757 +0,0 @@
From 740089b05a6dcb95ee442a2e370c2b795a518d97 Mon Sep 17 00:00:00 2001
From: Citlali del Rey <nullobsi@unix.dog>
Date: Wed, 7 Aug 2024 13:58:11 -0700
Subject: [PATCH 1/4] feat: add checkbox to initial settings ui
---
gui/initialsettingswizard.ui | 158 +++++++++++++++++++++--------------
1 file changed, 93 insertions(+), 65 deletions(-)
diff --git a/gui/initialsettingswizard.ui b/gui/initialsettingswizard.ui
index 91fd30ea..661fafe4 100644
--- a/gui/initialsettingswizard.ui
+++ b/gui/initialsettingswizard.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>668</width>
- <height>607</height>
+ <width>1007</width>
+ <height>855</height>
</rect>
</property>
<property name="windowTitle">
@@ -38,7 +38,6 @@
<widget class="QLabel" name="label">
<property name="font">
<font>
- <weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -50,10 +49,10 @@
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -69,20 +68,20 @@
<string>&lt;p&gt;Cantata is a feature-rich and user friendly client for Music Player Daemon (MPD). MPD is a flexible, powerful, server-side application for playing music.&lt;/p&gt;&lt;p&gt;For more information on MPD itself, please refer to the MPD website &lt;a href=&quot;http://www.musicpd.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.musicpd.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;This 'wizard' will guide you through the basic settings required for Cantata to function correctly.&lt;/p&gt;</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
+ <set>Qt::TextInteractionFlag::NoTextInteraction</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -100,7 +99,6 @@
<widget class="QLabel" name="label_7">
<property name="font">
<font>
- <weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -108,17 +106,17 @@
<string>&lt;p&gt;Welcome to Cantata&lt;/p&gt;</string>
</property>
<property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
+ <set>Qt::TextInteractionFlag::NoTextInteraction</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_11">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -134,13 +132,13 @@
<string>&lt;p&gt;Cantata is a feature-rich and user friendly client for Music Player Daemon (MPD). MPD is a flexible, powerful, server-side application for playing music. MPD may be started either system-wide, or on a per-user basis.&lt;br/&gt;&lt;br/&gt;Please select how you would like to have Cantata initially connect to (or startup) MPD:&lt;/p&gt;</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
+ <set>Qt::TextInteractionFlag::NoTextInteraction</set>
</property>
</widget>
</item>
@@ -172,7 +170,7 @@
<string>&lt;i&gt;Select this option if your music collection is shared between users, your MPD instance is running on another machine, you already have a personal MPD setup, or you wish to enable access from other clients (e.g. MPDroid). If you select this option then Cantata itself cannot control the starting and stopping of the MPD server. You will therefore need to ensure that MPD is already configured and running.&lt;/i&gt;</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -185,10 +183,10 @@
<item row="2" column="2">
<spacer name="verticalSpacer_10">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -217,7 +215,7 @@
<string>&lt;i&gt;Select this option if your music collection is not shared with others, and you wish Cantata to configure and control the MPD instance. This setup will be exclusive to Cantata, and will &lt;b&gt;not&lt;/b&gt; be accessible to other MPD clients (e.g. MPDroid)&lt;/i&gt;</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -233,17 +231,17 @@
<item>
<widget class="NoteLabel" name="musicFolderNoteLabel_2">
<property name="text">
- <string>If you wish to have an advanced MPD setup (e.g. multiple audio outputs, full DSD support, etc) then you &lt;b&gt;must&lt;/b&gt; choose 'Standard'</string>
+ <string>If you wish to have an advanced MPD setup (e.g. multiple audio outputs, full DSD support, etc) then you &lt;b&gt;must&lt;/b&gt; choose 'Standard'</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_13">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -259,20 +257,20 @@
<string>For more information on MPD itself, please refer to the MPD website &lt;a href=&quot;http://www.musicpd.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.musicpd.org&lt;/span&gt;&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;This 'wizard' will guide you through the basic settings required for Cantata to function correctly.</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
+ <set>Qt::TextInteractionFlag::NoTextInteraction</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_12">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -286,6 +284,45 @@
</widget>
</widget>
</item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+ <item>
+ <widget class="QCheckBox" name="migrateDataBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Migrate data from older versions of Cantata</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="BuddyLabel" name="migrateDataBoxLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="mouseTracking">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>&lt;i&gt;Data from Cantata v2 has been detected on your computer. Leave this box checked to copy the old data and preserve your preferences.&lt;/i&gt;</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
<widget class="WizardPage" name="connectionPage">
@@ -313,7 +350,6 @@
<widget class="QLabel" name="label_3">
<property name="font">
<font>
- <weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -325,10 +361,10 @@
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -344,7 +380,7 @@
<string>The settings below are the basic settings required by Cantata. Please enter the relevant details, and use the 'Connect' button to test the connection.</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -354,10 +390,10 @@
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -370,7 +406,7 @@
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ <enum>QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="BuddyLabel" name="hostLabel">
@@ -384,9 +420,6 @@
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="hostLayout">
- <property name="margin">
- <number>0</number>
- </property>
<item>
<widget class="LineEdit" name="host"/>
</item>
@@ -418,7 +451,7 @@
<item row="1" column="1">
<widget class="LineEdit" name="password">
<property name="echoMode">
- <enum>QLineEdit::Password</enum>
+ <enum>QLineEdit::EchoMode::Password</enum>
</property>
</widget>
</item>
@@ -441,7 +474,6 @@
<widget class="QLabel" name="statusLabel">
<property name="font">
<font>
- <weight>75</weight>
<italic>true</italic>
<bold>true</bold>
</font>
@@ -450,7 +482,7 @@
<string/>
</property>
<property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
@@ -459,7 +491,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -488,7 +520,7 @@
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -506,7 +538,6 @@
<widget class="QLabel" name="label_13">
<property name="font">
<font>
- <weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -518,10 +549,10 @@
<item row="1" column="1">
<spacer name="verticalSpacer_16">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -537,7 +568,7 @@
<string>Please choose the folder containing your music collection.</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -547,10 +578,10 @@
<item row="3" column="1">
<spacer name="verticalSpacer_18">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -580,7 +611,6 @@
<widget class="QLabel" name="statusLabel_2">
<property name="font">
<font>
- <weight>75</weight>
<italic>true</italic>
<bold>true</bold>
</font>
@@ -593,7 +623,7 @@
<item row="6" column="1">
<spacer name="verticalSpacer_14">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -615,7 +645,6 @@
<widget class="QLabel" name="label_6f">
<property name="font">
<font>
- <weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -627,10 +656,10 @@
<item>
<spacer name="verticalSpacer_9f">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -646,23 +675,23 @@
<string>&lt;p&gt;Cantata can download missing covers, and store these either in the music folder or within your personal cache folder.&lt;/p&gt;</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
+ <set>Qt::TextInteractionFlag::NoTextInteraction</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_7x">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -696,7 +725,7 @@
<item>
<spacer name="verticalSpacer_8f">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -714,7 +743,6 @@
<widget class="QLabel" name="label_6">
<property name="font">
<font>
- <weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -726,10 +754,10 @@
<item row="1" column="1">
<spacer name="verticalSpacer_9">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -745,23 +773,23 @@
<string>Cantata is now configured!&lt;br/&gt;&lt;br/&gt;Cantata's configuration dialog maybe used to customise Cantata's appearance, as well as to add extra MPD hosts, etc.</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
- <set>Qt::NoTextInteraction</set>
+ <set>Qt::TextInteractionFlag::NoTextInteraction</set>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer_6x">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -781,10 +809,10 @@
<item row="5" column="1">
<spacer name="verticalSpacer_6y">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -797,7 +825,7 @@
<item row="6" column="0" colspan="2">
<spacer name="verticalSpacer_8">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
From fcba26faceb401f63cabe5469276f3f8e067f211 Mon Sep 17 00:00:00 2001
From: Citlali del Rey <nullobsi@unix.dog>
Date: Wed, 7 Aug 2024 14:10:42 -0700
Subject: [PATCH 2/4] feat: make initial wizard skip to end when migrating
---
gui/initialsettingswizard.cpp | 16 ++++++++++++++++
gui/initialsettingswizard.h | 1 +
2 files changed, 17 insertions(+)
diff --git a/gui/initialsettingswizard.cpp b/gui/initialsettingswizard.cpp
index 18cb09db..7ef1fcb9 100644
--- a/gui/initialsettingswizard.cpp
+++ b/gui/initialsettingswizard.cpp
@@ -255,4 +255,20 @@ void InitialSettingsWizard::reject()
QDialog::reject();
}
+int InitialSettingsWizard::nextId() const {
+ switch(currentId()) {
+ case PAGE_INTRO:
+ if (migrateDataBox->isChecked()) {
+ return PAGE_END;
+ }
+ return PAGE_CONNECTION;
+ case PAGE_CONNECTION:
+ return PAGE_COVERS;
+ case PAGE_COVERS:
+ return PAGE_END;
+ default:
+ return -1;
+ }
+}
+
#include "moc_initialsettingswizard.cpp"
diff --git a/gui/initialsettingswizard.h b/gui/initialsettingswizard.h
index 4c27a73f..90e80984 100644
--- a/gui/initialsettingswizard.h
+++ b/gui/initialsettingswizard.h
@@ -56,6 +56,7 @@ private Q_SLOTS:
#endif
private:
+ int nextId() const override;
#ifdef Avahi_FOUND
QPushButton* discoveryButton;
#endif
From 61bad5e01b184f4b83a6211979fa201c1a6b55ea Mon Sep 17 00:00:00 2001
From: Citlali del Rey <nullobsi@unix.dog>
Date: Wed, 7 Aug 2024 15:43:05 -0700
Subject: [PATCH 3/4] feat: #30 migrate data from older cantata versions
---
gui/initialsettingswizard.cpp | 96 ++++++++++++++++++++++++++++++-----
gui/main.cpp | 1 +
2 files changed, 85 insertions(+), 12 deletions(-)
diff --git a/gui/initialsettingswizard.cpp b/gui/initialsettingswizard.cpp
index 7ef1fcb9..07150cc0 100644
--- a/gui/initialsettingswizard.cpp
+++ b/gui/initialsettingswizard.cpp
@@ -35,9 +35,11 @@
#include "findmpddialog.h"
#endif
#include <QDir>
+#include <QProcess>
#include <QScreen>
#include <QStandardPaths>
#include <QTimer>
+#include <filesystem>
enum Pages {
PAGE_INTRO,
@@ -113,6 +115,26 @@ InitialSettingsWizard::InitialSettingsWizard(QWidget* p)
hostLayout->insertWidget(hostLayout->count(), discoveryButton);
connect(discoveryButton, &QPushButton::clicked, this, &InitialSettingsWizard::detectMPDs);
#endif
+
+ // Note that this type of migration is only relevant on Linux/other
+ // Unix systems.
+#if !Q_OS_WIN && !Q_OS_MACOS
+ auto oldConfig = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/cantata");
+
+ if (oldConfig.exists()) {
+ migrateDataBox->setChecked(true);
+ }
+ else {
+ migrateDataBox->setChecked(false);
+ migrateDataBox->setDisabled(true);
+ migrateDataBoxLabel->setDisabled(true);
+ migrateDataBoxLabel->setText(tr("Data from an older version of Cantata is missing or cannot be located."));
+ }
+#else
+ migrateDataBox->hide();
+ migrateDataBoxLabel->hide();
+ migrateDataBox->setChecked(false);
+#endif
}
InitialSettingsWizard::~InitialSettingsWizard()
@@ -200,6 +222,55 @@ void InitialSettingsWizard::pageChanged(int p)
fetchCovers->setChecked(Settings::self()->fetchCovers());
}
}
+ if (PAGE_END == p) {
+ // Perform data migration.
+ if (migrateDataBox->isChecked()) {
+ auto oldConfig = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/cantata");
+ auto oldCache = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/cantata");
+ auto oldData = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/cantata");
+
+ auto newConfig = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/Cantata");
+ auto newCache = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/Cantata");
+ auto newData = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/Cantata");
+
+ newConfig.removeRecursively();
+ newCache.removeRecursively();
+ newData.removeRecursively();
+
+ auto copyOpts = std::filesystem::copy_options::overwrite_existing | std::filesystem::copy_options::recursive;
+
+ try {
+ std::filesystem::copy(oldConfig.absolutePath().toStdString(), newConfig.absolutePath().toStdString(), copyOpts);
+ std::filesystem::rename(newConfig.absolutePath().toStdString() + "/cantata.conf", newConfig.absolutePath().toStdString() + "/Cantata.conf");
+ }
+ catch (std::filesystem::filesystem_error& e) {
+ qWarning() << "Failed to migrate config.";
+ qWarning() << e.what();
+ }
+
+ try {
+ std::filesystem::copy(oldCache.absolutePath().toStdString(), newCache.absolutePath().toStdString(), copyOpts);
+ }
+ catch (std::filesystem::filesystem_error& e) {
+ qWarning() << "Failed to migrate cache.";
+ qWarning() << e.what();
+ }
+
+ try {
+ std::filesystem::copy(oldData.absolutePath().toStdString(), newData.absolutePath().toStdString(), copyOpts);
+ }
+ catch (std::filesystem::filesystem_error& e) {
+ qWarning() << "Failed to migrate data.";
+ qWarning() << e.what();
+ }
+
+ auto app = QCoreApplication::applicationFilePath();
+ auto args = QCoreApplication::arguments();
+ auto pwd = QDir::currentPath();
+ QProcess::startDetached(app, args, pwd);
+ QCoreApplication::exit();
+ }
+ }
button(NextButton)->setEnabled(PAGE_END != p);
}
@@ -255,19 +326,20 @@ void InitialSettingsWizard::reject()
QDialog::reject();
}
-int InitialSettingsWizard::nextId() const {
- switch(currentId()) {
- case PAGE_INTRO:
- if (migrateDataBox->isChecked()) {
- return PAGE_END;
- }
- return PAGE_CONNECTION;
- case PAGE_CONNECTION:
- return PAGE_COVERS;
- case PAGE_COVERS:
+int InitialSettingsWizard::nextId() const
+{
+ switch (currentId()) {
+ case PAGE_INTRO:
+ if (migrateDataBox->isChecked()) {
return PAGE_END;
- default:
- return -1;
+ }
+ return PAGE_CONNECTION;
+ case PAGE_CONNECTION:
+ return PAGE_COVERS;
+ case PAGE_COVERS:
+ return PAGE_END;
+ default:
+ return -1;
}
}
diff --git a/gui/main.cpp b/gui/main.cpp
index 7994920d..9e688fb9 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -437,6 +437,7 @@ int main(int argc, char* argv[])
if (QDialog::Rejected == wz.exec()) {
return 0;
}
+ Settings::self()->save();
}
else if (cmdLineParser.isSet(collectionOption)) {
QString col = cmdLineParser.value(collectionOption);
From a9741e33aa022df6fc44312694d79bd859676242 Mon Sep 17 00:00:00 2001
From: Citlali del Rey <nullobsi@unix.dog>
Date: Wed, 7 Aug 2024 15:49:29 -0700
Subject: [PATCH 4/4] fix: malformed preprocessor directive
---
gui/initialsettingswizard.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gui/initialsettingswizard.cpp b/gui/initialsettingswizard.cpp
index 07150cc0..d54f9264 100644
--- a/gui/initialsettingswizard.cpp
+++ b/gui/initialsettingswizard.cpp
@@ -118,7 +118,7 @@ InitialSettingsWizard::InitialSettingsWizard(QWidget* p)
// Note that this type of migration is only relevant on Linux/other
// Unix systems.
-#if !Q_OS_WIN && !Q_OS_MACOS
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
auto oldConfig = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/cantata");
if (oldConfig.exists()) {

View File

@ -1,23 +1,20 @@
# Template file for 'cantata'
pkgname=cantata
version=3.2.1
revision=1
version=2.5.0
revision=2
build_style=cmake
configure_args="-DENABLE_HTTP_STREAM_PLAYBACK=ON -DENABLE_LIBVLC=OFF
-DENABLE_SIMPLE_MPD_SUPPORT=ON"
hostmakedepends="pkg-config qt6-tools qt6-base"
makedepends="qt6-multimedia-devel qt6-svg-devel"
depends="media-player-info avahi qt6-multimedia qt6-svg libmtp libcddb libmusicbrainz5 mpg123 udisks2"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools"
makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel
qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-odbc
qt5-plugin-tds vlc-devel zlib-devel ffmpeg6-devel taglib-devel
taglib-extras-devel libmtp-devel mpg123-devel libcdparanoia-devel libcddb-devel
speex-devel eudev-libudev-devel udisks2-devel libmusicbrainz5-devel
qt5-multimedia-devel libcdio-paranoia-devel"
depends="media-player-info qt5-plugin-sqlite"
short_desc="Qt client for the music player daemon (MPD)"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/nullobsi/cantata"
distfiles="https://github.com/nullobsi/cantata/archive/refs/tags/v${version}.tar.gz"
checksum=ca38417f355a1eea475efcb73a383b433836caa74f542482d6b9e51a2fb70b0f
CXXFLAGS="-Wno-error=sign-compare"
case "$XBPS_TARGET_MACHINE" in
aarch64*)
CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt6" ;;
esac
homepage="https://github.com/cdrummond/cantata"
changelog="https://raw.githubusercontent.com/CDrummond/cantata/master/ChangeLog"
distfiles="https://github.com/CDrummond/cantata/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
checksum=eb7e00ab3f567afaa02ea2c86e2fe811a475afab93182b95922c6eb126821724

View File

@ -1,7 +1,7 @@
# Template file for 'cargo-auditable-bootstrap'
# Keep synced with cargo-auditable
pkgname=cargo-auditable-bootstrap
version=0.6.5
version=0.6.4
revision=1
build_wrksrc=cargo-auditable
build_style=cargo
@ -14,7 +14,7 @@ license="Apache-2.0 OR MIT"
homepage="https://github.com/rust-secure-code/cargo-auditable"
changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-auditable/master/cargo-auditable/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
checksum=5e7dad2d00cba7f09f92f457999d15b7fb786a5ddd1adf87ddbc634878ab5589
checksum=3e3f4134d81b47277d34c44bc1169c9b0356612977651f8e98e2ba1a470b69a2
repository=bootstrap
post_install() {

View File

@ -1,7 +1,7 @@
# Template file for 'cargo-auditable'
# Keep synced with cargo-auditable-bootstrap
pkgname=cargo-auditable
version=0.6.5
version=0.6.4
revision=1
build_wrksrc=cargo-auditable
build_style=cargo
@ -13,7 +13,7 @@ license="Apache-2.0 OR MIT"
homepage="https://github.com/rust-secure-code/cargo-auditable"
changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-auditable/master/cargo-auditable/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
checksum=5e7dad2d00cba7f09f92f457999d15b7fb786a5ddd1adf87ddbc634878ab5589
checksum=3e3f4134d81b47277d34c44bc1169c9b0356612977651f8e98e2ba1a470b69a2
conflicts=cargo-auditable-bootstrap
post_install() {

View File

@ -1,879 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "array_tool"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi 0.1.19",
"libc",
"winapi",
]
[[package]]
name = "autocfg"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "cargo-update"
version = "16.0.0"
dependencies = [
"array_tool",
"clap",
"curl",
"embed-resource",
"git2",
"hex",
"home",
"json-deserializer",
"semver",
"serde",
"serde_derive",
"tabwriter",
"toml",
"url",
]
[[package]]
name = "cc"
version = "1.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
dependencies = [
"jobserver",
"libc",
"shlex",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "3.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
dependencies = [
"atty",
"bitflags 1.3.2",
"clap_lex",
"indexmap 1.9.3",
"once_cell",
"strsim",
"termcolor",
"terminal_size",
"textwrap",
]
[[package]]
name = "clap_lex"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
dependencies = [
"os_str_bytes",
]
[[package]]
name = "curl"
version = "0.4.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
dependencies = [
"curl-sys",
"libc",
"openssl-probe",
"openssl-sys",
"schannel",
"socket2",
"windows-sys 0.52.0",
]
[[package]]
name = "curl-sys"
version = "0.4.77+curl-8.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f469e8a5991f277a208224f6c7ad72ecb5f986e36d09ae1f2c1bb9259478a480"
dependencies = [
"cc",
"libc",
"libnghttp2-sys",
"libz-sys",
"openssl-sys",
"pkg-config",
"vcpkg",
"windows-sys 0.52.0",
]
[[package]]
name = "embed-resource"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa"
dependencies = [
"cc",
"memchr",
"rustc_version",
"toml",
"vswhom",
"winreg",
]
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
"libc",
"windows-sys 0.52.0",
]
[[package]]
name = "form_urlencoded"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
dependencies = [
"percent-encoding",
]
[[package]]
name = "git2"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
dependencies = [
"bitflags 2.6.0",
"libc",
"libgit2-sys",
"log",
"openssl-probe",
"openssl-sys",
"url",
]
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hashbrown"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
[[package]]
name = "hermit-abi"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
[[package]]
name = "hermit-abi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
[[package]]
name = "hex"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "home"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "idna"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
dependencies = [
"unicode-bidi",
"unicode-normalization",
]
[[package]]
name = "indexmap"
version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
]
[[package]]
name = "indexmap"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
"hashbrown 0.15.0",
]
[[package]]
name = "io-lifetimes"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi 0.3.9",
"libc",
"windows-sys 0.48.0",
]
[[package]]
name = "jobserver"
version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
dependencies = [
"libc",
]
[[package]]
name = "json-deserializer"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f63b421e16eb4100beb677af56f0b4f3a4f08bab74ef2af079ce5bb92c2683f"
[[package]]
name = "libc"
version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "libgit2-sys"
version = "0.17.0+1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
dependencies = [
"cc",
"libc",
"libssh2-sys",
"libz-sys",
"openssl-sys",
"pkg-config",
]
[[package]]
name = "libnghttp2-sys"
version = "0.1.10+1.61.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "libssh2-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
dependencies = [
"cc",
"libc",
"libz-sys",
"openssl-sys",
"pkg-config",
"vcpkg",
]
[[package]]
name = "libz-sys"
version = "1.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
dependencies = [
"cc",
"libc",
"pkg-config",
"vcpkg",
]
[[package]]
name = "linux-raw-sys"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "log"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "memchr"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "once_cell"
version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "openssl-probe"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-src"
version = "300.4.0+3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
version = "0.9.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
dependencies = [
"cc",
"libc",
"openssl-src",
"pkg-config",
"vcpkg",
]
[[package]]
name = "os_str_bytes"
version = "6.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
[[package]]
name = "percent-encoding"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pkg-config"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "proc-macro2"
version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rustc_version"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
"semver",
]
[[package]]
name = "rustix"
version = "0.37.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
dependencies = [
"bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
"windows-sys 0.48.0",
]
[[package]]
name = "schannel"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "semver"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
dependencies = [
"serde",
]
[[package]]
name = "serde"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_spanned"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
[[package]]
name = "shlex"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "socket2"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
"windows-sys 0.52.0",
]
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "tabwriter"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a327282c4f64f6dc37e3bba4c2b6842cc3a992f204fa58d917696a89f691e5f6"
dependencies = [
"unicode-width",
]
[[package]]
name = "termcolor"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
dependencies = [
"winapi-util",
]
[[package]]
name = "terminal_size"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
dependencies = [
"rustix",
"windows-sys 0.48.0",
]
[[package]]
name = "textwrap"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
dependencies = [
"terminal_size",
]
[[package]]
name = "tinyvec"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [
"tinyvec_macros",
]
[[package]]
name = "tinyvec_macros"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "toml"
version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap 2.6.0",
"serde",
"serde_spanned",
"toml_datetime",
"winnow",
]
[[package]]
name = "unicode-bidi"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-width"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "url"
version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
"idna",
"percent-encoding",
]
[[package]]
name = "vcpkg"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "vswhom"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
dependencies = [
"libc",
"vswhom-sys",
]
[[package]]
name = "vswhom-sys"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.5",
]
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-targets"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
"windows_aarch64_gnullvm 0.48.5",
"windows_aarch64_msvc 0.48.5",
"windows_i686_gnu 0.48.5",
"windows_i686_msvc 0.48.5",
"windows_x86_64_gnu 0.48.5",
"windows_x86_64_gnullvm 0.48.5",
"windows_x86_64_msvc 0.48.5",
]
[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
"windows_i686_msvc 0.52.6",
"windows_x86_64_gnu 0.52.6",
"windows_x86_64_gnullvm 0.52.6",
"windows_x86_64_msvc 0.52.6",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
[[package]]
name = "winreg"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
dependencies = [
"cfg-if",
"windows-sys 0.48.0",
]

View File

@ -1,6 +1,6 @@
# Template file for 'cargo-update'
pkgname=cargo-update
version=16.0.0
version=15.0.0
revision=1
build_style=cargo
hostmakedepends="pkg-config go-md2man"
@ -11,13 +11,13 @@ license="MIT"
homepage="https://github.com/nabijaczleweli/cargo-update"
changelog="https://github.com/nabijaczleweli/cargo-update/releases"
distfiles="https://github.com/nabijaczleweli/cargo-update/archive/refs/tags/v${version}.tar.gz"
checksum=50ab6c2f4c66057cdb337fe1bbb5df5b018acca88b059db0db58aa1664b44285
checksum=b932b71e056a091e5fe9459f907f6c7177c9c11ce57fb06b51215a620e710dd2
post_extract() {
post_patch() {
# Upstream does not ship a lockfile and is very vocal about that being
# the right way:
# https://github.com/nabijaczleweli/cargo-update/issues/50
cp ${FILESDIR}/Cargo.lock .
cargo generate-lockfile
}
post_install() {

View File

@ -1,6 +1,6 @@
# Template file for 'chez-scheme'
pkgname=chez-scheme
version=10.1.0
version=10.0.0
revision=1
build_style=gnu-makefile
make_build_target="kernel"
@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://scheme.com/"
distfiles="https://github.com/cisco/ChezScheme/releases/download/v${version}/csv${version}.tar.gz"
checksum=9181a6c8c4ab5e5d32d879ff159d335a50d4f8b388611ae22a263e932c35398b
checksum=d37199012b5ed1985c4069d6a87ff18e5e1f5a2df27e402991faf45dc4f2232c
alternatives="
scheme:scheme:/usr/bin/chez-scheme
scheme:scheme.1:/usr/share/man/man1/chez-scheme.1

View File

@ -1,6 +1,6 @@
# Template file for 'chezmoi'
pkgname=chezmoi
version=2.54.0
version=2.52.3
revision=1
build_style=go
go_import_path="github.com/twpayne/chezmoi/v2"
@ -13,7 +13,7 @@ license="MIT"
homepage="https://chezmoi.io/"
changelog="https://github.com/twpayne/chezmoi/releases"
distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
checksum=74281a5b1d9b4e8b5d6f4775204d5b56500649b5d906944a29f6c284aa54423e
checksum=a3986d25ad831de00d5a0937062a413af72aaa2c15d515abd02cf82d79d813c9
pre_build() {
local _date

View File

@ -1,6 +1,6 @@
# Template file for 'chirp'
pkgname=chirp
version=20241025
version=20240807
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
@ -11,4 +11,4 @@ maintainer="Emil Miler <em@0x45.cz>"
license="GPL-3.0-or-later"
homepage="https://chirpmyradio.com/projects/chirp/wiki/Home"
distfiles="https://archive.chirpmyradio.com/chirp_next/next-${version}/chirp-${version}.tar.gz"
checksum=3e1812264a06a95833ed32a8c0ac83a7f93b8d94e58484390b8892fcdeae6024
checksum=19d8f0a7583ee7517cf46d2b40836037d6c1be77a25a71425e47ca4366cec58c

View File

@ -2,4 +2,7 @@
export CHROME_WRAPPER=/usr/lib/chromium/chromium
export CHROME_DESKTOP=chromium.desktop
CHROME_FLAGS="--enable-gpu-rasterization $CHROME_FLAGS"
exec /usr/lib/chromium/chromium $CHROME_FLAGS "$@"
case $(xbps-uhelper arch) in
*-musl) exec /usr/lib/chromium/chromium $CHROME_FLAGS --js-flags="--jitless --wasm_jitless" "$@";;
*) exec /usr/lib/chromium/chromium $CHROME_FLAGS "$@";;
esac

View File

@ -63,9 +63,9 @@ index d9d1882..0567557 100644
#if !defined(__mips__) && !defined(__aarch64__)
case __NR_vfork:
@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
case __NR_mlock:
case __NR_munlock:
case __NR_munmap:
case __NR_mseal:
+ case __NR_mremap:
+ case __NR_membarrier:
return true;

View File

@ -13,23 +13,66 @@
shlib_extension = ".dylib"
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -196,7 +196,18 @@
# a cargo project that dumps the `CARGO_CFG_TARGET_ABI` from its build.rs. See
# https://issues.chromium.org/u/1/issues/372512092#comment5 for an example.
@@ -185,11 +185,23 @@
rust_abi_target = ""
-if (is_linux || is_chromeos) {
+if (is_musl) {
+ if (current_cpu == "arm64") {
+ rust_abi_target = "aarch64-unknown-linux-musl"
+ cargo_target_abi = ""
+ } else if (current_cpu == "x86") {
+ rust_abi_target = "i686-unknown-linux-musl"
+ cargo_target_abi = ""
+ } else if (current_cpu == "x64") {
+ rust_abi_target = "x86_64-unknown-linux-musl"
+ cargo_target_abi = ""
+ }
+} else if (is_linux || is_chromeos) {
if (is_linux || is_chromeos) {
if (current_cpu == "arm64") {
rust_abi_target = "aarch64-unknown-linux-gnu"
cargo_target_abi = ""
- rust_abi_target = "aarch64-unknown-linux-gnu"
+ if (is_musl) {
+ rust_abi_target = "aarch64-unknown-linux-musl"
+ } else {
+ rust_abi_target = "aarch64-unknown-linux-gnu"
+ }
} else if (current_cpu == "x86") {
- rust_abi_target = "i686-unknown-linux-gnu"
+ if (is_musl) {
+ rust_abi_target = "i686-unknown-linux-musl"
+ } else {
+ rust_abi_target = "i686-unknown-linux-gnu"
+ }
} else if (current_cpu == "x64") {
- rust_abi_target = "x86_64-unknown-linux-gnu"
+ if (is_musl) {
+ rust_abi_target = "x86_64-unknown-linux-musl"
+ } else {
+ rust_abi_target = "x86_64-unknown-linux-gnu"
+ }
} else if (current_cpu == "arm") {
if (arm_float_abi == "hard") {
float_suffix = "hf"
@@ -198,15 +210,31 @@
}
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
# No way to inform Rust about the -a suffix.
- rust_abi_target = "armv7-unknown-linux-gnueabi" + float_suffix
+ if (is_musl) {
+ rust_abi_target = "armv7-unknown-linux-musleabi" + float_suffix
+ } else {
+ rust_abi_target = "armv7-unknown-linux-gnueabi" + float_suffix
+ }
} else {
- rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix
+ if (is_musl) {
+ rust_abi_target = "arm-unknown-linux-musleabi" + float_suffix
+ } else {
+ rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix
+ }
}
} else if (current_cpu == "riscv64") {
- rust_abi_target = "riscv64gc-unknown-linux-gnu"
+ if (is_musl) {
+ rust_abi_target = "riscv64gc-unknown-linux-musl"
+ } else {
+ rust_abi_target = "riscv64gc-unknown-linux-gnu"
+ }
} else {
# Best guess for other future platforms.
- rust_abi_target = current_cpu + "-unknown-linux-gnu"
+ if (is_musl) {
+ rust_abi_target = current_cpu + "-unknown-linux-musl"
+ } else {
+ rust_abi_target = current_cpu + "-unknown-linux-gnu"
+ }
}
} else if (is_android) {
import("//build/config/android/abi.gni")

View File

@ -0,0 +1,10 @@
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.h
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
@@ -9,6 +9,7 @@
#include <optional>
#include <string>
#include <string_view>
+#include <variant>
#include <vector>
#include "base/containers/span.h"

View File

@ -0,0 +1,21 @@
From 3c48d6b9fc82dccbb0bfb905cf808f73a7a02e71 Mon Sep 17 00:00:00 2001
From: "lauren n. liberda" <lauren@selfisekai.rocks>
Date: Wed, 31 Jul 2024 05:14:42 +0200
Subject: [PATCH] musl: remove conflicting prctl.h include
---
src/base/utils.cc | 1 -
1 file changed, 1 deletion(-)
diff --git a/third_party/perfetto/src/base/utils.cc b/third_party/perfetto/src/base/utils.cc
index 0d9318c136..419c7dbc1a 100644
--- a/third_party/perfetto/src/base/utils.cc
+++ b/third_party/perfetto/src/base/utils.cc
@@ -40,7 +40,6 @@
#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
-#include <linux/prctl.h>
#include <sys/prctl.h>
#ifndef PR_GET_TAGGED_ADDR_CTRL

View File

@ -1,21 +0,0 @@
diff -up chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h.me chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h
--- chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h.me 2024-10-15 09:58:39.571798463 +0200
+++ chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h 2024-10-15 09:59:46.209147226 +0200
@@ -12,7 +12,6 @@
#include <cstdint>
#include <cstring>
-#include <new>
#include <optional>
#include <ostream>
#include <string_view>
@@ -368,7 +367,8 @@ class EnumTable {
private:
#ifdef ARCH_CPU_64_BITS
- alignas(std::hardware_destructive_interference_size)
+ // Align the data on a cache line boundary.
+ alignas(64)
#endif
std::initializer_list<Entry> data_;
bool is_sorted_;

View File

@ -1,14 +1,13 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
version=131.0.6778.69
version=129.0.6668.58
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang18 lld18 llvm18 compiler-rt")
bison git gperf hwids ninja nodejs perl pkg-config python3
libepoxy-devel libevent-devel libglib-devel rust rust-bindgen
gn"
libepoxy-devel libevent-devel libglib-devel rust rust-bindgen"
makedepends="
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel
fontconfig-devel freetype-devel gtk+3-devel libXScrnSaver-devel
@ -28,10 +27,8 @@ short_desc="Google's attempt at creating a safer, faster, and more stable browse
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
# distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"
distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz"
checksum=56d332bd53b26ad4f9a8f36c4cba37e9f05126a353d57666d12690944769bfaa
broken="temp configure failure"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
checksum=eaf850183d32627ce0cde9f3d3f853bc11c217ef7f41540303214ed47803d96d
lib32disabled=yes
@ -52,6 +49,10 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-legacy-compat"
fi
case "$XBPS_TARGET_MACHINE" in
x86_64-musl|aarch64-musl) build_options_default+=" drumbrake";;
esac
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libX11-devel libxcb-devel pciutils-devel libXext-devel libglvnd-devel
libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
@ -142,12 +143,10 @@ _setup_toolchain() {
do_configure() {
local system=() conf=()
if false; then
# compile gn early, so it can be used to generate gni stuff
AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \
CFLAGS=$CFLAGS_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD LDFLAGS=$LDFLAGS_FOR_BUILD \
tools/gn/bootstrap/bootstrap.py ${makejobs} --skip-generate-buildfiles
fi
# compile gn early, so it can be used to generate gni stuff
AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \
CFLAGS=$CFLAGS_FOR_BUILD CXXFLAGS=$CXXFLAGS_FOR_BUILD LDFLAGS=$LDFLAGS_FOR_BUILD \
tools/gn/bootstrap/bootstrap.py ${makejobs} --skip-generate-buildfiles
# Use system-provided libraries.
# TODO: use_system_hunspell (upstream changes needed).
@ -304,11 +303,7 @@ do_configure() {
esac
fi
_setup_toolchain
if false; then
out/Release/gn gen out/Release --args="${conf[*]}"
else
gn gen out/Release --args="${conf[*]}"
fi
out/Release/gn gen out/Release --args="${conf[*]}"
}
do_build() {

View File

@ -1,11 +1,9 @@
# Template file for 'chrony_exporter'
pkgname=chrony_exporter
version=0.11.0
revision=1
version=0.10.1
revision=2
build_style=go
go_import_path="github.com/superq/chrony_exporter"
go_ldflags="-X github.com/prometheus/common/version.Version=${version}
-X github.com/prometheus/common/version.Branch=main"
depends="chrony"
short_desc="Prometheus exporter for Chrony NTP"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@ -13,7 +11,7 @@ license="Apache-2.0"
homepage="https://github.com/SuperQ/chrony_exporter"
changelog="https://raw.githubusercontent.com/SuperQ/chrony_exporter/main/CHANGELOG.md"
distfiles="https://github.com/SuperQ/chrony_exporter/archive/refs/tags/v${version}.tar.gz"
checksum=3323bde89a4e8cb356956e8fdcb02d2854614ebb87e67a5563427c577090b5d2
checksum=93aa56b0fa2b2616b7b3723aa80a3e9e1acf684fe71e55931ef7ce6ca6c28490
post_install() {
vsv chrony_exporter

View File

@ -1,6 +1,6 @@
# Template file for 'chroot-util-linux'
pkgname=chroot-util-linux
version=2.40.2
version=2.40.1
revision=1
bootstrap=yes
build_style=gnu-configure
@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.tar.xz"
checksum=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3
checksum=59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f
conflicts="util-linux>=0"
provides="util-linux-${version}_${revision}"
repository=bootstrap

View File

@ -1,6 +1,6 @@
# Template file for 'citations'
pkgname=citations
version=0.7.0
version=0.6.4
revision=1
build_style=meson
build_helper=rust
@ -13,7 +13,7 @@ maintainer="Alex Childs <misuchiru03+github@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/citations"
distfiles="https://gitlab.gnome.org/World/citations/-/archive/${version}/citations-${version}.tar.gz"
checksum=5959b6cfe39e69f987a53c694950d5fa794ca6d5725ad9838f8ed04a2bab1b89
checksum=89626bdb78aa466926ba9be6b57bd24514bb6e0d2b9492f3c9f0705464371cb5
post_patch() {
if [ "$CROSS_BUILD" ]; then

View File

@ -1 +0,0 @@
llvm19

View File

@ -1 +0,0 @@
llvm19

View File

@ -1 +0,0 @@
llvm19

View File

@ -1 +0,0 @@
llvm19

View File

@ -1 +0,0 @@
llvm19

View File

@ -1,9 +1,8 @@
# Template file for 'cliphist'
pkgname=cliphist
version=0.6.1
revision=1
version=0.5.0
revision=2
build_style=go
make_check_args="-skip=TestScripts/no-permission"
go_import_path=go.senan.xyz/cliphist
depends="wl-clipboard xdg-utils"
short_desc="Wayland clipboard manager"
@ -12,4 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/sentriz/cliphist"
changelog="https://raw.githubusercontent.com/sentriz/cliphist/master/CHANGELOG.md"
distfiles="https://github.com/sentriz/cliphist/archive/v${version}.tar.gz"
checksum=db0f25ba3e9173dcb257d66cb1293e277a8bdfed11cc8d6b38b7473b0947781d
checksum=02285cf3358a1851e34f95c0c369b27284d8d0996759d759fa2bbcb5b30fb13d

View File

@ -1,63 +0,0 @@
# Template file for 'clj-kondo'
pkgname=clj-kondo
version=2024.11.14
revision=1
hostmakedepends="clojure leiningen mandrel"
makedepends="zlib-devel"
checkdepends="git"
short_desc="Static analyzer and linter for Clojure code that sparks joy"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
license="EPL-1.0"
homepage="https://github.com/clj-kondo/clj-kondo"
changelog="https://github.com/clj-kondo/clj-kondo/raw/master/CHANGELOG.md"
distfiles="https://github.com/clj-kondo/clj-kondo/archive/v${version}.tar.gz"
checksum=07745d19b29d2bcd895b1bdb073eee6848cda9ec09037fea583748fab814c9a4
nocross="mandrel"
export JAVA_HOME=/usr/lib/jvm/mandrel21
export GRAALVM_HOME=/usr/lib/jvm/mandrel21
export PATH="${PATH}:${GRAALVM_HOME}/bin"
do_build() {
local _args
export CLJ_KONDO_NATIVE=true
export CLJ_KONDO_STATIC=true
lein with-profiles +clojure-1.10.2 "do" clean, uberjar
_args+=" --static"
# necessary for compatibility with older machines, e.g. see:
# https://github.com/borkdude/deps.clj/actions/runs/6337277754/job/17212028399
_args+=" -march=compatibility"
_args+=" -O1"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
export CLJ_KONDO_MUSL=true
_args+=" --libc=musl"
# see: https://github.com/oracle/graal/issues/3398
_args+=" -H:CCompilerOption=-Wl,-z,stack-size=2097152"
else
# see: https://github.com/oracle/graal/issues/3737
_args+=" -H:+StaticExecutableWithDynamicLibC"
fi
LC_ALL=C.UTF-8 \
${GRAALVM_HOME}/bin/native-image \
-J-Xss$(ulimit -s)K \
-J-Xmx3G \
-J-Xms2G \
-jar target/clj-kondo-$version-standalone.jar \
$_args \
-H:+ReportExceptionStackTraces \
--verbose \
--no-fallback
}
do_check() {
CLJ_KONDO_TEST_ENV=native script/test
}
do_install() {
vbin clj-kondo
vlicense LICENSE
}

View File

@ -1,6 +1,6 @@
# Template file for 'cloud-hypervisor'
pkgname=cloud-hypervisor
version=42.0
version=41.0
revision=1
archs="aarch64* x86_64*"
build_style=cargo
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0, BSD-3-Clause"
homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
checksum=7cac4819630d953b3d10a867e1ea5e42f2236aed7a803faef16d8cd67554455c
checksum=6b25fea566f8deba48000292423bb6fab32c0bed7f6a37e6456e9a1fab0c0c00
post_install() {
vbin scripts/ch-trace-visualiser.py ch-trace-visualiser

View File

@ -1,6 +1,6 @@
# Template file for 'cmus'
pkgname=cmus
version=2.12.0
version=2.11.0
revision=1
build_style=configure
configure_args="prefix=/usr LD=$CC"
@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://cmus.github.io"
distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
checksum=44b96cd5f84b0d84c33097c48454232d5e6a19cd33b9b6503ba9c13b6686bfc7
checksum=2bbdcd6bbbae301d734214eab791e3755baf4d16db24a44626961a489aa5e0f7
build_options="elogind"
build_options_default="elogind"
desc_option_elogind="Support MPRIS interface via elogind"

View File

@ -1,7 +1,7 @@
# Template file for 'codeberg-cli'
pkgname=codeberg-cli
version=0.4.6
revision=1
version=0.4.3
revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@ -12,7 +12,7 @@ license="AGPL-3.0-or-later"
homepage="https://codeberg.org/Aviac/codeberg-cli"
changelog="https://codeberg.org/Aviac/codeberg-cli/raw/branch/main/CHANGELOG.md"
distfiles="https://codeberg.org/Aviac/codeberg-cli/archive/v${version}.tar.gz"
checksum=62cbeed20fbe58b3829b0ad67e43c6821f3046cf8d98037d454698aee1c98b11
checksum=cf439a53846c93adf51bc0911da7489e59828b5be6ad0e50cecd4312e36c52b4
post_install() {
vlicense LICENSE

View File

@ -1 +0,0 @@
llvm19

View File

@ -1,6 +1,6 @@
# Template file for 'comrak'
pkgname=comrak
version=0.29.0
version=0.28.0
revision=1
build_style=cargo
hostmakedepends="pkg-config"
@ -11,7 +11,7 @@ license="BSD-2-Clause"
homepage="https://github.com/kivikakk/comrak"
changelog="https://raw.githubusercontent.com/kivikakk/comrak/main/changelog.txt"
distfiles="https://github.com/kivikakk/comrak/archive/refs/tags/v${version}.tar.gz"
checksum=3929895c2c3e42d0d1a6efddd66a3c62282b81b62dd74229f6c8f31ac1dcb333
checksum=7e1ef40ebf2a27faaad7c2068e32d2109726f6daf42ba64705e7a250a9b0a162
post_install() {
vlicense COPYING

View File

@ -1,6 +1,6 @@
# Template file for 'console-setup'
pkgname=console-setup
version=1.232
version=1.230
revision=1
hostmakedepends="perl"
depends="kbd ckbcomp"
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://packages.debian.org/sid/console-setup"
distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
checksum=5eed5aef9ae3aee0bb0d3e6815d788c6ac003c5beee39536ab2c1e53d0cd8f7c
checksum=cef9885ce5a1b5a1d32fc6e95e1890ac717f156646de275a6fac0307dcbbd5ed
conf_files="/etc/console-setup/console-setup
/etc/console-setup/keyboard"

View File

@ -1,6 +1,6 @@
# Template file for 'cpanminus'
pkgname=cpanminus
version=1.7048
version=1.7047
revision=1
build_style=perl-module
hostmakedepends="perl"
@ -11,4 +11,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/App-cpanminus"
distfiles="${CPAN_SITE}/App/App-${pkgname}-${version}.tar.gz"
checksum=59b60907ab9fa4f72ca2004fbe6054911439ae9a906890b4d842a87b25f20f3c
checksum=963e63c6e1a8725ff2f624e9086396ae150db51dd0a337c3781d09a994af05a5

View File

@ -1,6 +1,6 @@
# Template file for 'cpuid'
pkgname=cpuid
version=20241023
version=20240916
revision=1
archs="i686* x86_64*"
build_style=gnu-makefile
@ -10,6 +10,6 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://www.etallen.com/cpuid.html"
distfiles="https://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
checksum=fc77435a8d5d2b3551713301e8cdb83e62a3cfedc84132b0ec9b1bb5e5244fdc
checksum=4fa933b9d571349d8cfff29942769b793d4ce808eb97b594bbbf86d4d017293d
conflicts="msr-tools"

View File

@ -1,6 +1,6 @@
# Template file for 'crash'
pkgname=crash
version=8.0.6
version=8.0.5
revision=1
archs="i686 x86_64" # broken on musl
build_style=gnu-makefile
@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://crash-utility.github.io/"
changelog="https://crash-utility.github.io/crash.changelog.html"
distfiles="https://github.com/crash-utility/crash/archive/${version}.tar.gz"
checksum=fb918ade7faf9b1f76c7bd371a2aebf639bf10197134d3ba776e13a1867104fb
checksum=b3ec57a844706ef044b607ba67bc5ef62d9deef8aec3fb2d7ea4f77dff24f1ef
nocross=yes
disable_parallel_build=yes
LDFLAGS="-llzo2"

View File

@ -1,7 +1,7 @@
# Template file for 'cronie'
pkgname=cronie
version=1.7.2
revision=2
revision=1
build_style=gnu-configure
configure_args="--with-inotify --without-selinux --with-pam
--enable-anacron --enable-pie --enable-relro"
@ -22,7 +22,7 @@ make_dirs="
/etc/cron.monthly 0755 root root
/var/spool/cron 0755 root root
/var/spool/anacron 0755 root root"
conf_files="/etc/anacrontab /etc/pam.d/crond /etc/cron.deny /etc/default/anacron"
conf_files="/etc/anacrontab /etc/pam.d/crond /etc/cron.deny"
provides="cron-daemon-0_1"
alternatives="

Some files were not shown because too many files have changed in this diff Show More